From 451a15942b676b2660393a11d0e91055c3179622 Mon Sep 17 00:00:00 2001 From: Lisa Marie Maginnis Date: Sun, 28 Feb 2016 14:02:33 -0500 Subject: [PATCH] added ngnix conf --- files/etc/nginx/sites-available/mediagoblin/DEFAULT | 8 ++++---- scripts/GMG/15_install_gmg.sh | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/files/etc/nginx/sites-available/mediagoblin/DEFAULT b/files/etc/nginx/sites-available/mediagoblin/DEFAULT index f297971..7adb40a 100644 --- a/files/etc/nginx/sites-available/mediagoblin/DEFAULT +++ b/files/etc/nginx/sites-available/mediagoblin/DEFAULT @@ -7,8 +7,8 @@ server { ## redirect http to https ## #rewrite ^ https://$server_name$request_uri? permanent; - access_log /var/log/nginx/$HOSTNAME.$DOMAIN-access.log; - error_log /var/log/nginx/$HOSTNAME.$DOMAIN-error.log; + access_log /var/log/nginx/GMG_FQDN_TOKEN-ssl.access.log; + error_log /var/log/nginx/GMG_FQDN_TOKEN-ssl.error.log; } server { @@ -16,8 +16,8 @@ server { include /etc/nginx/mediagoblin-common.conf; - access_log /var/log/nginx/$HOSTNAME.$DOMAIN-ssl.access.log; - error_log /var/log/nginx/$HOSTNAME.$DOMAIN-ssl.error.log; + access_log /var/log/nginx/GMG_FQDN_TOKEN-ssl.access.log; + error_log /var/log/nginx/GMG_FQDN_TOKEN-ssl.error.log; ssl on; diff --git a/scripts/GMG/15_install_gmg.sh b/scripts/GMG/15_install_gmg.sh index fd7bbfa..d3f563d 100755 --- a/scripts/GMG/15_install_gmg.sh +++ b/scripts/GMG/15_install_gmg.sh @@ -18,5 +18,9 @@ sed 's^GMG_PATH_TOKEN^'$GMG_PATH'^g' -i $target/etc/init.d/mediagoblin-celery-wo sed 's^GMG_PATH_TOKEN^'$GMG_PATH'^g' -i $target/etc/init.d/mediagoblin-paster sed 's^GMG_PATH_TOKEN^'$GMG_PATH'^g' -i $target/etc/mediagoblin-templates/mediagolbin.ini -sed 's^GMG_PATH_TOKEN^'$GMG_PATH'^g' -i $target/etc/ngnix/mediagoblin-common.conf sed 's^GMG_SENDER_TOKEN^'$GMG_SENDER'^g' -i $target/etc/mediagoblin-templates/mediagolbin.ini + +sed 's^GMG_PATH_TOKEN^'$GMG_PATH'^g' -i $target/etc/nginx/mediagoblin-common.conf + +sed 's^GMG_FQDN_TOKEN^'$fqdn'^g' -i $target/etc/nginx/sites-available/mediagoblin-common.conf + -- 2.25.1