Fix systemd daemons for mediagoblin

src/freedombone

@@ -9572,7 +9572,7 @@ function install_mediagoblin {
     fi
 
     apt-get -y install git-core python python3-dev python3-lxml python3-pil
-	apt-get -y install python3-virtualenv npm nodejs-legacy automake
+    apt-get -y install python3-virtualenv npm nodejs-legacy automake
 
     #apt-get -y install postgresql postgresql-client python-psycopg2
     #apt-get -y install python-gst-1.0 libjpeg62-turbo-dev gstreamer1.0-plugins-base python-gobject
@@ -9593,8 +9593,8 @@ function install_mediagoblin {
     git_clone $MEDIAGOBLIN_REPO $MEDIAGOBLIN_WORKING_DIRECTORY
     cd $MEDIAGOBLIN_WORKING_DIRECTORY
     git checkout $MEDIAGOBLIN_COMMIT -b $MEDIAGOBLIN_COMMIT
-	git submodule init
-	git submodule update
+    git submodule init
+    git submodule update
 
     if ! grep -q "Mediagoblin commit" $COMPLETION_FILE; then
         echo "Mediagoblin commit:$MEDIAGOBLIN_COMMIT" >> $COMPLETION_FILE
@@ -9622,10 +9622,32 @@ function install_mediagoblin {
         mkdir $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev
     fi
     chmod 750 $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev
-    easy_install flup
-    if [ ! "$?" = "0" ]; then
-        exit 83527
-    fi
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade flup" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade billiard" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade Paste" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade amqp" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade anyjson" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade py-bcrypt" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade wtforms" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade python-dateutil" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade alembic" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade waitress" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade imagesize" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade alabaster" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade snowballstemmer" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade docutils" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade Pygments" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade beautifulsoup4" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade WebOb" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade py" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bin/easy_install --upgrade execnet" - mediagoblin
+
+    # create some directories
+    mkdir /var/log/mediagoblin
+    chown -hR mediagoblin:www-data /var/log/mediagoblin
+    mkdir /var/run/mediagoblin
+    chown -hR mediagoblin:www-data /var/run/mediagoblin
+    
     if [ ! -f $MEDIAGOBLIN_WORKING_DIRECTORY/mediagoblin.ini ]; then
         echo $'mediagoblin.ini not found'
         exit 737529
@@ -9638,31 +9660,59 @@ function install_mediagoblin {
     cp -av mediagoblin.ini mediagoblin_local.ini
     cp -av paste.ini paste_local.ini
 
-    # TODO configure ini files
-
     chown -hR mediagoblin:www-data $MEDIAGOBLIN_WORKING_DIRECTORY
 
     # init with systemd
-    echo '[Unit]' > /etc/systemd/system/mediagoblin.service
-    echo 'Description=Mediagoblin (Media Server)' >> /etc/systemd/system/mediagoblin.service
-    echo 'After=syslog.target' >> /etc/systemd/system/mediagoblin.service
-    echo 'After=network.target' >> /etc/systemd/system/mediagoblin.service
-    #echo 'After=postgresql.service' >> /etc/systemd/system/mediagoblin.service
-    echo '' >> /etc/systemd/system/mediagoblin.service
-    echo '[Service]' >> /etc/systemd/system/mediagoblin.service
-    echo 'Type=simple' >> /etc/systemd/system/mediagoblin.service
-    echo 'User=mediagoblin' >> /etc/systemd/system/mediagoblin.service
-    echo 'Group=mediagoblin' >> /etc/systemd/system/mediagoblin.service
-    echo "WorkingDirectory=$MEDIAGOBLIN_WORKING_DIRECTORY" >> /etc/systemd/system/mediagoblin.service
-    echo "ExecStart=$MEDIAGOBLIN_WORKING_DIRECTORY/lazyserver.sh --server-name=fcgi fcgi_host=127.0.0.1 fcgi_port=26543" >> /etc/systemd/system/mediagoblin.service
-    echo 'Restart=always' >> /etc/systemd/system/mediagoblin.service
-    echo 'Environment="USER=mediagoblin","HOME=/var/lib/mediagoblin"' >> /etc/systemd/system/mediagoblin.service
-    echo '' >> /etc/systemd/system/mediagoblin.service
-    echo '[Install]' >> /etc/systemd/system/mediagoblin.service
-    echo 'WantedBy=multi-user.target' >> /etc/systemd/system/mediagoblin.service
-    systemctl daemon-reload
-    systemctl enable mediagoblin
-    systemctl start mediagoblin
+    echo '[Unit]' > /etc/systemd/system/mediagoblin-celeryd.service
+    echo 'Description=Mediagoblin Celeryd' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo 'After=syslog.target' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo 'After=network.target' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo '' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo '[Service]' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo 'User=mediagoblin' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo 'Group=mediagoblin' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo 'Type=simple' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo "WorkingDirectory=$MEDIAGOBLIN_WORKING_DIRECTORY" >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo "Environment=MEDIAGOBLIN_CONFIG=$MEDIAGOBLIN_WORKING_DIRECTORY/mediagoblin_local.ini \\" >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo '    CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo "ExecStart=$MEDIAGOBLIN_WORKING_DIRECTORY/bin/celery worker \\" >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo '    --logfile=/var/log/mediagoblin/celery.log \' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo '    --loglevel=INFO' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo 'PIDFile=/var/run/mediagoblin/mediagoblin-celeryd.pid' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo '' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo '[Install]' >> /etc/systemd/system/mediagoblin-celeryd.service
+    echo 'WantedBy=multi-user.target' >> /etc/systemd/system/mediagoblin-celeryd.service
+
+    echo '[Unit]' > /etc/systemd/system/mediagoblin-paster.service
+    echo 'Description=Mediagoblin' >> /etc/systemd/system/mediagoblin-paster.service
+    echo 'After=syslog.target' >> /etc/systemd/system/mediagoblin-paster.service
+    echo 'After=network.target' >> /etc/systemd/system/mediagoblin-paster.service
+    echo '' >> /etc/systemd/system/mediagoblin-paster.service
+    echo '[Service]' >> /etc/systemd/system/mediagoblin-paster.service
+    echo 'Type=forking' >> /etc/systemd/system/mediagoblin-paster.service
+    echo 'User=mediagoblin' >> /etc/systemd/system/mediagoblin-paster.service
+    echo 'Group=mediagoblin' >> /etc/systemd/system/mediagoblin-paster.service
+    echo 'Environment=CELERY_ALWAYS_EAGER=false' >> /etc/systemd/system/mediagoblin-paster.service
+    echo "WorkingDirectory=$MEDIAGOBLIN_WORKING_DIRECTORY" >> /etc/systemd/system/mediagoblin-paster.service
+    echo "ExecStart=$MEDIAGOBLIN_WORKING_DIRECTORY/bin/paster serve \\" >> /etc/systemd/system/mediagoblin-paster.service
+    echo "    $MEDIAGOBLIN_WORKING_DIRECTORY/paste_local.ini \\" >> /etc/systemd/system/mediagoblin-paster.service
+    echo '    --pid-file=/var/run/mediagoblin/mediagoblin.pid \' >> /etc/systemd/system/mediagoblin-paster.service
+    echo '    --log-file=/var/log/mediagoblin/mediagoblin.log \' >> /etc/systemd/system/mediagoblin-paster.service
+    echo '    --daemon \' >> /etc/systemd/system/mediagoblin-paster.service
+    echo '    --server-name=fcgi fcgi_host=127.0.0.1 fcgi_port=26543' >> /etc/systemd/system/mediagoblin-paster.service
+    echo "ExecStop=$MEDIAGOBLIN_WORKING_DIRECTORY/bin/paster serve \\" >> /etc/systemd/system/mediagoblin-paster.service
+    echo '    --pid-file=/var/run/mediagoblin/mediagoblin.pid \' >> /etc/systemd/system/mediagoblin-paster.service
+    echo "    $MEDIAGOBLIN_WORKING_DIRECTORY/paste_local.ini stop" >> /etc/systemd/system/mediagoblin-paster.service
+    echo 'PIDFile=/var/run/mediagoblin/mediagoblin.pid' >> /etc/systemd/system/mediagoblin-paster.service
+    echo '' >> /etc/systemd/system/mediagoblin-paster.service
+    echo '[Install]' >> /etc/systemd/system/mediagoblin-paster.service
+    echo 'WantedBy=multi-user.target' >> /etc/systemd/system/mediagoblin-paster.service
+    esystemctl daemon-reload
+    systemctl enable mediagoblin-celeryd
+    systemctl enable mediagoblin-paster
+    esystemctl daemon-reload
+    systemctl start mediagoblin-celeryd
+    systemctl start mediagoblin-paster
 
     MEDIAGOBLIN_ONION_HOSTNAME=$(add_onion_service mediagoblin 80 ${MEDIAGOBLIN_ONION_PORT})
     if ! grep -q "Mediagoblin onion domain" $COMPLETION_FILE; then
@@ -9674,7 +9724,7 @@ function install_mediagoblin {
         echo $'Problem creating onion address for mediagoblin'
         exit 672652
     fi
-    
+
     # web config
     MEDIAGOBLIN_VIRTUAL_HOST=/etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
     nginx_http_redirect $MEDIAGOBLIN_DOMAIN_NAME
@@ -9682,92 +9732,92 @@ function install_mediagoblin {
         echo 'server {' >> $MEDIAGOBLIN_VIRTUAL_HOST
         echo '  listen 443 ssl;' >> $MEDIAGOBLIN_VIRTUAL_HOST
         echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  # Stock useful config options, but ignore them :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  include /etc/nginx/mime.types;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  autoindex off;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
-		nginx_ssl $MEDIAGOBLIN_DOMAIN_NAME
-		nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  # Gzip' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  gzip on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  gzip_min_length 1024;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  gzip_buffers 4 32k;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  gzip_types text/plain application/x-javascript text/javascript text/xml text/css;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  # Mounting MediaGoblin stuff' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  # This is the section you should read' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo "  server_name $MEDIAGOBLIN_DOMAIN_NAME;" >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  access_log /var/log/nginx/mediagoblin.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  error_log /var/log/nginx/mediagoblin.error.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  # MediaGoblins stock static files: CSS, JS, etc.' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  location /mgoblin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/mediagoblin/static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  # Instance specific media:' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  location /mgoblin_media/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/media/public/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  # Theme static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  location /theme_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/theme_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  # Plugin static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  location /plugin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/plugin_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  # Mounting MediaGoblin itself via FastCGI.' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  location / {' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '    fastcgi_pass 127.0.0.1:26543;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '    include /etc/nginx/fastcgi_params;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '    # our understanding vs nginxs handling of script_name vs' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '      # path_info dont match :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '    fastcgi_param PATH_INFO $fastcgi_script_name;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '    fastcgi_param SCRIPT_NAME "";' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '}' >> $MEDIAGOBLIN_VIRTUAL_HOST
-		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	else
-		echo -n '' > $MEDIAGOBLIN_VIRTUAL_HOST
-	fi
-
-	echo 'server {' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo "  listen 127.0.0.1:${MEDIAGOBLIN_ONION_PORT} default_server;" >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  # Stock useful config options, but ignore them :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  include /etc/nginx/mime.types;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  autoindex off;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
-	nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
-	echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  # Gzip' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  gzip on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  gzip_min_length 1024;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  gzip_buffers 4 32k;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  gzip_types text/plain application/x-javascript text/javascript text/xml text/css;' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  # Mounting MediaGoblin stuff' >> $MEDIAGOBLIN_VIRTUAL_HOST
-	echo '  # This is the section you should read' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Stock useful config options, but ignore them :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  include /etc/nginx/mime.types;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  autoindex off;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
+        nginx_ssl $MEDIAGOBLIN_DOMAIN_NAME
+        nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Gzip' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  gzip on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  gzip_min_length 1024;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  gzip_buffers 4 32k;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  gzip_types text/plain application/x-javascript text/javascript text/xml text/css;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Mounting MediaGoblin stuff' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # This is the section you should read' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo "  server_name $MEDIAGOBLIN_DOMAIN_NAME;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  access_log /var/log/nginx/mediagoblin.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  error_log /var/log/nginx/mediagoblin.error.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # MediaGoblins stock static files: CSS, JS, etc.' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  location /mgoblin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/mediagoblin/static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Instance specific media:' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  location /mgoblin_media/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/media/public/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Theme static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  location /theme_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/theme_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Plugin static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  location /plugin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/plugin_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Mounting MediaGoblin itself via FastCGI.' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  location / {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '    fastcgi_pass 127.0.0.1:26543;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '    include /etc/nginx/fastcgi_params;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '    # our understanding vs nginxs handling of script_name vs' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '      # path_info dont match :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '    fastcgi_param PATH_INFO $fastcgi_script_name;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '    fastcgi_param SCRIPT_NAME "";' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '}' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    else
+        echo -n '' > $MEDIAGOBLIN_VIRTUAL_HOST
+    fi
+
+    echo 'server {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo "  listen 127.0.0.1:${MEDIAGOBLIN_ONION_PORT} default_server;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  # Stock useful config options, but ignore them :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  include /etc/nginx/mime.types;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  autoindex off;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
+    nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
+    echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  # Gzip' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  gzip on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  gzip_min_length 1024;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  gzip_buffers 4 32k;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  gzip_types text/plain application/x-javascript text/javascript text/xml text/css;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  # Mounting MediaGoblin stuff' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo '  # This is the section you should read' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo "  server_name $MEDIAGOBLIN_ONION_HOSTNAME;" >> $MEDIAGOBLIN_VIRTUAL_HOST
@@ -9819,7 +9869,7 @@ function install_mediagoblin {
     else
         sed -i "s/Mediagoblin domain.*/Mediagoblin domain:$MEDIAGOBLIN_DOMAIN_NAME/g" $COMPLETION_FILE
     fi
-    
+
     echo 'install_mediagoblin' >> $COMPLETION_FILE
 }