From d5ce9fc01eaf247433dc5835ad775164c735ce6d Mon Sep 17 00:00:00 2001 From: Lisa Marie Maginnis Date: Sun, 28 Feb 2016 13:55:06 -0500 Subject: [PATCH] fixed typo --- files/etc/nginx/mediagoblin-common.conf/DEFAULT | 10 +++++----- files/etc/nginx/sites-available/mediagoblin/DEFAULT | 10 +++++----- scripts/GMG/15_install_gmg.sh | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/files/etc/nginx/mediagoblin-common.conf/DEFAULT b/files/etc/nginx/mediagoblin-common.conf/DEFAULT index 7296b0e..dac13a4 100644 --- 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 6a8af0c..f297971 100644 --- 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 8cc9d34..fd7bbfa 100755 --- 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 -- 2.25.1