From 9085da20f0a56b7d1c5e0dd22e5ee29d38988df2 Mon Sep 17 00:00:00 2001 From: nemsia Date: Thu, 25 May 2017 14:52:17 +0200 Subject: [PATCH] [enh] Final_path on nginx --- conf/nginx.conf | 2 +- scripts/backup | 3 +++ scripts/install | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 85f883c..585109e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ client_max_body_size 100M; # add to v1.4 assets -root /opt/mastodon/live/public; +root __FINALPATH__/live/public; location / { diff --git a/scripts/backup b/scripts/backup index cc94aa4..73372e3 100644 --- a/scripts/backup +++ b/scripts/backup @@ -23,6 +23,9 @@ domain=$(ynh_app_setting_get "$app" domain) final_path="/opt/${app}" ynh_backup "$final_path" "sources" 1 +# final_path on nginx +sudo sed -i "s@$final_path@__FINALPATH__@g" ../conf/nginx.conf + # Copy the nginx conf files ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf" ynh_backup "/etc/cron.d/${app}" "cron.conf" diff --git a/scripts/install b/scripts/install index 1634c52..0daf6a7 100644 --- a/scripts/install +++ b/scripts/install @@ -208,7 +208,9 @@ RAILS_ENV=production bin/bundle exec rails mastodon:make_admin USERNAME=$admin_m RAILS_ENV=production bin/bundle exec rails mastodon:confirm_email USER_EMAIL=$admin_mastodon_mail ACOMMANDS -# Copy nginx config +# Modify Nginx configuration file and copy it to Nginx conf directory +sudo sed -i "s@__PATH__@$app@g" ../conf/nginx.conf* +sudo sed -i "s@__FINALPATH__@$final_path/@g" ../conf/nginx.conf* sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf # Install crontab