added ngnix conf

diff --git a/files/etc/nginx/sites-available/mediagoblin/DEFAULT b/files/etc/nginx/sites-available/mediagoblin/DEFAULT
index f297971e6bb8254ac5f63b4dad5c4f0e303fa467..7adb40ab8eed97853e4cbebb81ff54f0e332c5e3 100644 (file)
--- 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 fd7bbfab47a28192c6de4da0be879b4a1fd80d8a..d3f563d4231379670ae54ecac0a9260a50f495af 100755 (executable)
--- 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
+