From 61897ee72262ca80b90d38fd1a07ec308d71e92e Mon Sep 17 00:00:00 2001 From: Jules Bertholet Date: Mon, 3 May 2021 12:55:44 -0400 Subject: [PATCH] Fix logrotate --- scripts/_common.sh | 7 +++++++ scripts/install | 5 +---- scripts/upgrade | 5 +---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index d7b1583..7bf5164 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -114,6 +114,13 @@ function set_permissions { setfacl -n -R -m user:www-data:rx -m default:user:www-data:rx $data_path/protected_media $data_path/data $data_path/data/nextcloud_media } +function set_up_logrotate { + ynh_use_logrotate --logfile="/var/log/$app/command_build_similarity_index.log" --specific_user="$app/$app" --non_append + ynh_use_logrotate --logfile="/var/log/$app/gunicorn_django.log" --specific_user="$app/$app" + ynh_use_logrotate --logfile="/var/log/$app/image_similarity.log" --specific_user="$app/$app" + ynh_use_logrotate --logfile="/var/log/$app/ownphotos.log" --specific_user="$app/$app" +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 1f2824d..4ba6ebb 100755 --- a/scripts/install +++ b/scripts/install @@ -198,10 +198,7 @@ set_permissions ynh_script_progression --message="Configuring log rotation..." --weight=1 # Use logrotate to manage application logfiles -ynh_use_logrotate --logfile="/var/log/$app/command_build_similarity_index.log" --specific_user="$app/$app" -ynh_use_logrotate --logfile="/var/log/$app/gunicorn_django.log" --specific_user="$app/$app" -ynh_use_logrotate --logfile="/var/log/$app/image_similarity.log" --specific_user="$app/$app" -ynh_use_logrotate --logfile="/var/log/$app/ownphotos.log" --specific_user="$app/$app" +set_up_logrotate #================================================= # INTEGRATE SERVICES IN YUNOHOST diff --git a/scripts/upgrade b/scripts/upgrade index 9e57bde..f31f815 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -167,10 +167,7 @@ set_permissions ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1 # Use logrotate to manage application logfiles -ynh_use_logrotate --logfile="/var/log/$app/command_build_similarity_index.log" --specific_user="$app/$app" --non-append -ynh_use_logrotate --logfile="/var/log/$app/gunicorn_django.log" --specific_user="$app/$app" --non-append -ynh_use_logrotate --logfile="/var/log/$app/image_similarity.log" --specific_user="$app/$app" --non-append -ynh_use_logrotate --logfile="/var/log/$app/ownphotos.log" --specific_user="$app/$app" --non-append +set_up_logrotate #================================================= # INTEGRATE SERVICES IN YUNOHOST