diff --git a/scripts/backup b/scripts/backup index 9b05af7..08c25ed 100644 --- a/scripts/backup +++ b/scripts/backup @@ -63,12 +63,6 @@ ynh_backup "/etc/php5/fpm/conf.d/20-$app.ini" "${YNH_APP_BACKUP_DIR}/etc/php5/fp #================================================= # SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - -ynh_backup "/etc/logrotate.d/$app" "${YNH_APP_BACKUP_DIR}/etc/logrotate.d/$app" - #================================================= # BACKUP OF THE CRON FILE #================================================= diff --git a/scripts/install b/scripts/install index 522582e..838f2fb 100644 --- a/scripts/install +++ b/scripts/install @@ -151,7 +151,7 @@ chmod 0440 /etc/sudoers.d/pihole #================================================= 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 @@ -258,13 +258,6 @@ systemctl start pihole-FTL #================================================= # GENERIC FINALISATION -#================================================= -# SETUP LOGROTATE -#================================================= - -ynh_use_logrotate /var/log/pihole.log -ynh_use_logrotate /var/log/pihole-FTL.log - #================================================= # ENABLE SERVICE IN ADMIN PANEL #================================================= diff --git a/scripts/remove b/scripts/remove index a2cb9f1..73ca6da 100755 --- a/scripts/remove +++ b/scripts/remove @@ -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 -#================================================= -# REMOVE THE LOGROTATE CONFIG -#================================================= - -ynh_remove_logrotate # Suppression de la configuration de logrotate - #================================================= # CLOSE A PORT #================================================= diff --git a/scripts/restore b/scripts/restore index 070a28d..46633f6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -109,12 +109,6 @@ chmod 644 /var/log/pihole.log dnsmasq_user=$(grep DNSMASQ_USER= /etc/init.d/dnsmasq | cut -d'"' -f2) chown $dnsmasq_user:root /var/log/pihole.log -#================================================= -# RESTORE OF THE LOGROTATE CONFIGURATION -#================================================= - -ynh_restore_file "/etc/logrotate.d/$app" - #================================================= # RESTORE OF SPECIFIC FILES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5923d34..7f2ffc9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,7 +102,7 @@ chmod 0440 /etc/sudoers.d/pihole pihole_storage="/etc/pihole" cp "$pihole_local_repo/advanced/logrotate" "$pihole_storage/logrotate" 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 @@ -158,13 +158,6 @@ cp $pihole_local_repo/advanced/pihole.cron /etc/cron.d/pihole 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 #=================================================