From: Lisa Marie Maginnis <lisam@fsf.org>
Date: Sun, 28 Feb 2016 23:59:41 +0000 (-0500)
Subject: ssl
X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=commitdiff_plain;h=bcca123c5c1363c3dee0b66d23c577871300c32d

ssl
---

diff --git a/files/etc/init.d/install-mediagoblin/DEFAULT b/files/etc/init.d/install-mediagoblin/DEFAULT
index 1e1b751..5cc75d0 100755
--- a/files/etc/init.d/install-mediagoblin/DEFAULT
+++ b/files/etc/init.d/install-mediagoblin/DEFAULT
@@ -24,7 +24,7 @@ if [ ! -d mediagoblin ]; then
 
     if [ ! -d mediagoblin-libreplanet ]; then
 	sudo -u mediagoblin git clone https://vcs.fsf.org/git/mediagoblin-libreplanet.git
-	cp -r mediagoblin-libreplanet/mediagoblin-libreplanet mediagoblin/mediagoblin/plugins/libreplanet
+	cp -r mediagoblin-libreplanet/mediagoblin_libreplanet mediagoblin/mediagoblin/plugins/libreplanet
     fi
 
     cd mediagoblin
diff --git a/files/etc/nginx/sites-available/mediagoblin/DEFAULT b/files/etc/nginx/sites-available/mediagoblin/DEFAULT
index 7adb40a..5b02cd9 100644
--- a/files/etc/nginx/sites-available/mediagoblin/DEFAULT
+++ b/files/etc/nginx/sites-available/mediagoblin/DEFAULT
@@ -1,6 +1,6 @@
 server {
     listen   80;
-    server_name media.libreplanet.org;
+    server_name GMG_FQDN_TOKEN;
 
     include    /etc/nginx/mediagoblin-common.conf;
 
@@ -25,8 +25,8 @@ server {
   ssl_session_cache shared:SSL:10m;
   ssl_session_timeout 10m;
 
-  ssl_certificate /etc/ssl/certs/wildcard.libreplanet.org-full-chain.crt;
-  ssl_certificate_key /etc/ssl/private/wildcard.libreplanet.org.key;
+  ssl_certificate /etc/letsencrypt/live/GMG_FQDN_TOKEN/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/GMG_FQDN_TOKEN/privkey.pem;
 
   ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
   ssl_prefer_server_ciphers on;