X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=blobdiff_plain;f=scripts%2FGMG%2F15_install_gmg.sh;h=796601d2f731df81822c1e7d62adf4e7565bcf33;hp=fd7bbfab47a28192c6de4da0be879b4a1fd80d8a;hb=e6a9ff791176b7478a74fe9bde90b05712081af6;hpb=d5ce9fc01eaf247433dc5835ad775164c735ce6d

diff --git a/scripts/GMG/15_install_gmg.sh b/scripts/GMG/15_install_gmg.sh
index fd7bbfa..796601d 100755
--- a/scripts/GMG/15_install_gmg.sh
+++ b/scripts/GMG/15_install_gmg.sh
@@ -5,18 +5,30 @@ 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/mediagoblin.ini
+fcopy -Bv /etc/mediagoblin-templates/paste.ini
 fcopy -Bv /etc/nginx/sites-available/mediagoblin
 fcopy -Bv /etc/nginx/mediagoblin-common.conf
 
 # Add installer to boot
 $ROOTCMD update-rc.d install-mediagoblin defaults
-fqdn=$HOSTNAME.$DOMAIN
+fqdn=$HOSTNAME
 
 # Replace Tokens
 sed 's^GMG_PATH_TOKEN^'$GMG_PATH'^g' -i $target/etc/init.d/install-mediagoblin
 sed 's^GMG_PATH_TOKEN^'$GMG_PATH'^g' -i $target/etc/init.d/mediagoblin-celery-worker
 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/mediagoblin-templates/mediagoblin.ini
+sed 's^GMG_SENDER_TOKEN^'$GMG_SENDER'^g' -i $target/etc/mediagoblin-templates/mediagoblin.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
+sed 's^SERVERNAME_TOKEN^'$fqdn'^g' -i $target/etc/nginx/sites-available/mediagoblin
+
+# enable nginx config
+$ROOTCMD ln -s /etc/nginx/sites-available/mediagoblin /etc/nginx/sites-enabled/mediagoblin
+
+if [ ! -f $target//etc/nginx/sites-enabled/default ]; then
+	$ROOTCMD rm /etc/nginx/sites-enabled/default
+fi