X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=blobdiff_plain;f=files%2Fetc%2Fnginx%2Fsites-available%2Fmediagoblin%2FDEFAULT;h=15022cae5283004bc8ee7a88ec4b28a7b9a193c2;hp=5b02cd91fdbb69d70540d7f8bfc8c38b579b01ba;hb=e6a9ff791176b7478a74fe9bde90b05712081af6;hpb=bcca123c5c1363c3dee0b66d23c577871300c32d

diff --git a/files/etc/nginx/sites-available/mediagoblin/DEFAULT b/files/etc/nginx/sites-available/mediagoblin/DEFAULT
index 5b02cd9..15022ca 100644
--- a/files/etc/nginx/sites-available/mediagoblin/DEFAULT
+++ b/files/etc/nginx/sites-available/mediagoblin/DEFAULT
@@ -1,14 +1,14 @@
 server {
     listen   80;
-    server_name GMG_FQDN_TOKEN;
+    server_name SERVERNAME_TOKEN;
 
     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/GMG_FQDN_TOKEN-ssl.access.log;
-     error_log  /var/log/nginx/GMG_FQDN_TOKEN-ssl.error.log; 
+    access_log  /var/log/nginx/SERVERNAME_TOKEN-ssl.access.log;
+    error_log  /var/log/nginx/SERVERNAME_TOKEN-ssl.error.log;
 }
 
 server {
@@ -16,8 +16,8 @@ server {
 
   include    /etc/nginx/mediagoblin-common.conf;
 
-  access_log  /var/log/nginx/GMG_FQDN_TOKEN-ssl.access.log;
-  error_log  /var/log/nginx/GMG_FQDN_TOKEN-ssl.error.log;
+  access_log  /var/log/nginx/SERVERNAME_TOKEN-ssl.access.log;
+  error_log  /var/log/nginx/SERVERNAME_TOKEN-ssl.error.log;
 
   ssl on;
 
@@ -25,8 +25,8 @@ server {
   ssl_session_cache shared:SSL:10m;
   ssl_session_timeout 10m;
 
-  ssl_certificate /etc/letsencrypt/live/GMG_FQDN_TOKEN/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/GMG_FQDN_TOKEN/privkey.pem;
+  ssl_certificate /etc/letsencrypt/live/SERVERNAME_TOKEN/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/SERVERNAME_TOKEN/privkey.pem;
 
   ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
   ssl_prefer_server_ciphers on;