fixed typo

diff --git a/files/etc/nginx/mediagoblin-common.conf/DEFAULT b/files/etc/nginx/mediagoblin-common.conf/DEFAULT
index 7296b0e5b80907375fce6766e9e80bfbc9e1e4be..dac13a40e035afa85c52e0db038960877c63c607 100644 (file)
--- a/files/etc/nginx/mediagoblin-common.conf/DEFAULT
+++ b/files/etc/nginx/mediagoblin-common.conf/DEFAULT
@@ -28,22 +28,22 @@ server {
 
  # MediaGoblin's stock static files: CSS, JS, etc.
  location /mgoblin_static/ {
-    alias /srv/mediagoblin.example.org/mediagoblin/mediagoblin/static/;
+    alias GMG_PATH_TOKEN/mediagoblin/mediagoblin/static/;
  }
 
  # Instance specific media:
  location /mgoblin_media/ {
-    alias /srv/mediagoblin.example.org/mediagoblin/user_dev/media/public/;
+    alias GMG_PATH_TOKEN/mediagoblin/user_dev/media/public/;
  }
 
  # Theme static files (usually symlinked in)
  location /theme_static/ {
-    alias /srv/mediagoblin.example.org/mediagoblin/user_dev/theme_static/;
+    alias GMG_PATH_TOKEN/mediagoblin/user_dev/theme_static/;
  }
 
  # Plugin static files (usually symlinked in)
  location /plugin_static/ {
-    alias /srv/mediagoblin.example.org/mediagoblin/user_dev/plugin_static/;
+    alias GMG_PATH_TOKEN/mediagoblin/user_dev/plugin_static/;
  }
 
  # Mounting MediaGoblin itself via FastCGI.
@@ -56,4 +56,4 @@ server {
     fastcgi_param PATH_INFO $fastcgi_script_name;
     fastcgi_param SCRIPT_NAME "";
  }
-}
\ No newline at end of file
+}

diff --git a/files/etc/nginx/sites-available/mediagoblin/DEFAULT b/files/etc/nginx/sites-available/mediagoblin/DEFAULT
index 6a8af0cab97052a76a3cc2c39d42d1c5345f4bb6..f297971e6bb8254ac5f63b4dad5c4f0e303fa467 100644 (file)
--- a/files/etc/nginx/sites-available/mediagoblin/DEFAULT
+++ b/files/etc/nginx/sites-available/mediagoblin/DEFAULT
@@ -5,10 +5,10 @@ server {
     include    /etc/nginx/mediagoblin-common.conf;
 
     ## redirect http to https ##
-    rewrite        ^ https://$server_name$request_uri? permanent;
+    #rewrite        ^ https://$server_name$request_uri? permanent;
 
-    access_log /var/log/nginx/media.libreplanet.org-access.log;
-    error_log /var/log/nginx/media.libreplanet.org-error.log; 
+    access_log /var/log/nginx/$HOSTNAME.$DOMAIN-access.log;
+    error_log /var/log/nginx/$HOSTNAME.$DOMAIN-error.log; 
 }
 
 server {
@@ -16,8 +16,8 @@ server {
 
   include    /etc/nginx/mediagoblin-common.conf;
 
-  access_log  /var/log/nginx/media.libreplanet.org-ssl.access.log;
-  error_log  /var/log/nginx/media.libreplanet.org-ssl.error.log;
+  access_log  /var/log/nginx/$HOSTNAME.$DOMAIN-ssl.access.log;
+  error_log  /var/log/nginx/$HOSTNAME.$DOMAIN-ssl.error.log;
 
   ssl on;
 

diff --git a/scripts/GMG/15_install_gmg.sh b/scripts/GMG/15_install_gmg.sh
index 8cc9d342b4df8537a5ec32faf5a9b16554063358..fd7bbfab47a28192c6de4da0be879b4a1fd80d8a 100755 (executable)
--- a/scripts/GMG/15_install_gmg.sh
+++ b/scripts/GMG/15_install_gmg.sh
@@ -4,7 +4,7 @@
 fcopy -Bv /etc/init.d/install-mediagoblin
 fcopy -Bv /etc/init.d/mediagoblin-paster
 fcopy -Bv /etc/init.d/mediagoblin-celery-worker
-fcopy -Bv /etc/mediagoblin-templates/mediagolbin.ini
+fcopy -Bv /etc/mediagoblin-templates/mediagoblin.ini
 fcopy -Bv /etc/nginx/sites-available/mediagoblin
 fcopy -Bv /etc/nginx/mediagoblin-common.conf