YunoHost-Apps/pihole_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pihole_ynh.git synced 2024-09-03 20:05:58 +02:00
Code Issues Activity Actions

Fix logrotate

Browse source
This commit is contained in:
Maniack Crudelis 2017-08-07 00:51:28 +02:00
parent 50387429fe
commit 1ef78e092b
5 changed files with 2 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/backup
View file

@ -63,12 +63,6 @@ ynh_backup "/etc/php5/fpm/conf.d/20-$app.ini" "${YNH_APP_BACKUP_DIR}/etc/php5/fp
#================================================= #=================================================
# SPECIFIC BACKUP # SPECIFIC BACKUP
#=================================================
# BACKUP LOGROTATE
#=================================================
ynh_backup "/etc/logrotate.d/$app" "${YNH_APP_BACKUP_DIR}/etc/logrotate.d/$app"
#================================================= #=================================================
# BACKUP OF THE CRON FILE # BACKUP OF THE CRON FILE
#================================================= #=================================================

9
scripts/install
View file

@ -151,7 +151,7 @@ chmod 0440 /etc/sudoers.d/pihole
#================================================= #=================================================
cp "$pihole_local_repo/advanced/logrotate" "$pihole_storage/logrotate" cp "$pihole_local_repo/advanced/logrotate" "$pihole_storage/logrotate"
sed -i "s/# su #/su $dnsmasq_user/g;" "$pihole_storage/logrotate" sed -i "/# su #/d;" "$pihole_storage/logrotate"
#================================================= #=================================================
# INSTALLATION OF PIHOLE-FTL # INSTALLATION OF PIHOLE-FTL
@ -258,13 +258,6 @@ systemctl start pihole-FTL
#================================================= #=================================================
# GENERIC FINALISATION # GENERIC FINALISATION
#=================================================
# SETUP LOGROTATE
#=================================================
ynh_use_logrotate /var/log/pihole.log
ynh_use_logrotate /var/log/pihole-FTL.log
#================================================= #=================================================
# ENABLE SERVICE IN ADMIN PANEL # ENABLE SERVICE IN ADMIN PANEL
#================================================= #=================================================

6
scripts/remove
View file

@ -65,12 +65,6 @@ ynh_remove_nginx_config # Suppression de la configuration nginx
ynh_remove_fpm_config # Suppression de la configuration du pool php-fpm ynh_remove_fpm_config # Suppression de la configuration du pool php-fpm
#=================================================
# REMOVE THE LOGROTATE CONFIG
#=================================================
ynh_remove_logrotate # Suppression de la configuration de logrotate
#================================================= #=================================================
# CLOSE A PORT # CLOSE A PORT
#================================================= #=================================================

6
scripts/restore
View file

@ -109,12 +109,6 @@ chmod 644 /var/log/pihole.log
dnsmasq_user=$(grep DNSMASQ_USER= /etc/init.d/dnsmasq | cut -d'"' -f2) dnsmasq_user=$(grep DNSMASQ_USER= /etc/init.d/dnsmasq | cut -d'"' -f2)
chown $dnsmasq_user:root /var/log/pihole.log chown $dnsmasq_user:root /var/log/pihole.log
#=================================================
# RESTORE OF THE LOGROTATE CONFIGURATION
#=================================================
ynh_restore_file "/etc/logrotate.d/$app"
#================================================= #=================================================
# RESTORE OF SPECIFIC FILES # RESTORE OF SPECIFIC FILES
#================================================= #=================================================

9
scripts/upgrade
View file

@ -102,7 +102,7 @@ chmod 0440 /etc/sudoers.d/pihole
pihole_storage="/etc/pihole" pihole_storage="/etc/pihole"
cp "$pihole_local_repo/advanced/logrotate" "$pihole_storage/logrotate" cp "$pihole_local_repo/advanced/logrotate" "$pihole_storage/logrotate"
dnsmasq_user=$(grep DNSMASQ_USER= /etc/init.d/dnsmasq | cut -d'"' -f2) dnsmasq_user=$(grep DNSMASQ_USER= /etc/init.d/dnsmasq | cut -d'"' -f2)
sed -i "s/# su #/su $dnsmasq_user/g;" "$pihole_storage/logrotate" sed -i "/# su #/d;" "$pihole_storage/logrotate"
#================================================= #=================================================
# UPDATE OF PIHOLE-FTL # UPDATE OF PIHOLE-FTL
@ -158,13 +158,6 @@ cp $pihole_local_repo/advanced/pihole.cron /etc/cron.d/pihole
systemctl start pihole-FTL systemctl start pihole-FTL
#=================================================
# SETUP LOGROTATE
#=================================================
ynh_use_logrotate /var/log/pihole.log --non-append
ynh_use_logrotate /var/log/pihole-FTL.log
#================================================= #=================================================
# START PIHOLE-FTL # START PIHOLE-FTL
#================================================= #=================================================