added ngnix conf
authorLisa Marie Maginnis <lisam@fsf.org>
Sun, 28 Feb 2016 19:02:33 +0000 (14:02 -0500)
committerLisa Marie Maginnis <lisam@fsf.org>
Sun, 28 Feb 2016 19:02:33 +0000 (14:02 -0500)
files/etc/nginx/sites-available/mediagoblin/DEFAULT
scripts/GMG/15_install_gmg.sh

index f297971..7adb40a 100644 (file)
@@ -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;
 
index fd7bbfa..d3f563d 100755 (executable)
@@ -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
+