diff --git a/colab.spec b/colab.spec
index e5fdeb3..3bfcf5a 100644
--- a/colab.spec
+++ b/colab.spec
@@ -1,7 +1,7 @@
 %define name colab
-%define version 2.0a2
-%define unmangled_version 2.0a2
-%define release 2
+%define version 2.0a3
+%define unmangled_version 2.0a3
+%define release 3
 %define buildvenv /var/tmp/%{name}-%{version}
 
 Summary: Collaboration platform for communities
@@ -91,41 +91,23 @@ fi
 
 usermod --append --groups mailman colab
 
-# only applies if there is a local PostgreSQL server
-if [ -x /usr/bin/postgres ]; then
-
-  # start/enable the service
-  postgresql-setup initdb || true
-  systemctl start postgresql
-  systemctl enable postgresql
-
-  if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(*) from pg_user where usename = 'colab';")" -eq 0 ]; then
-    # create user
-    sudo -u postgres -i createuser colab
-  fi
-
-  if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(1) from pg_database where datname = 'colab';")" -eq 0 ]; then
-    # create database
-    sudo -u postgres -i createdb --owner=colab colab
-  fi
-
-  mkdir -p /etc/colab
+mkdir -p /etc/colab
 
-  if [ ! -f /etc/colab/settings.yaml ]; then
-    SECRET_KEY=$(openssl rand -hex 32)
-    cat > /etc/colab/settings.yaml <<EOF
+if [ ! -f /etc/colab/settings.yaml ]; then
+  SECRET_KEY=$(openssl rand -hex 32)
+  cat > /etc/colab/settings.yaml <<EOF
 ## Set to false in production
 DEBUG: true
 TEMPLATE_DEBUG: true
 
 ## System admins
 ADMINS: &admin
-  -
-    - John Foo
-    - john@example.com
-  -
-    - Mary Bar
-    - mary@example.com
+-
+  - John Foo
+  - john@example.com
+-
+  - Mary Bar
+  - mary@example.com
 
 MANAGERS: *admin
 
@@ -140,13 +122,13 @@ SECRET_KEY: '$SECRET_KEY'
 
 SITE_URL: 'http://localhost:8000'
 BROWSERID_AUDIENCES:
-  - http://localhost:8000
+- http://localhost:8000
 #  - http://example.com
 #  - https://example.org
 #  - http://example.net
 
 ALLOWED_HOSTS:
-  - localhost
+- localhost
 #  - example.com
 #  - example.org
 #  - example.net
@@ -161,27 +143,45 @@ ROBOTS_NOINDEX: false
 ## Enabled BROWSER_ID protocol
 #  BROWSERID_ENABLED: True
 EOF
-    chown root:colab /etc/colab/settings.yaml
-    chmod 0640 /etc/colab/settings.yaml
-  fi
+  chown root:colab /etc/colab/settings.yaml
+  chmod 0640 /etc/colab/settings.yaml
+fi
 
-  mkdir -p /etc/colab/settings.d
+mkdir -p /etc/colab/settings.d
 
-  if [ ! -f /etc/colab/settings.d/00-database.yaml ]; then
-    cat > /etc/colab/settings.d/00-database.yaml <<EOF
+if [ ! -f /etc/colab/settings.d/00-database.yaml ]; then
+  cat > /etc/colab/settings.d/00-database.yaml <<EOF
 DATABASES:
-  default:
-    ENGINE: django.db.backends.postgresql_psycopg2
-    NAME: colab
-    USER: colab
+default:
+  ENGINE: django.db.backends.postgresql_psycopg2
+  NAME: colab
+  USER: colab
+  HOST: localhost
+  PORT: 5432
 EOF
-    chown root:colab /etc/colab/settings.d/00-database.yaml
-    chmod 0640 /etc/colab/settings.d/00-database.yaml
+  chown root:colab /etc/colab/settings.d/00-database.yaml
+  chmod 0640 /etc/colab/settings.d/00-database.yaml
+fi
+
+
+# only applies if there is a local PostgreSQL server
+if [ -x /usr/bin/postgres ]; then
+
+  # start/enable the service
+  postgresql-setup initdb || true
+  systemctl start postgresql
+  systemctl enable postgresql
+
+  if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(*) from pg_user where usename = 'colab';")" -eq 0 ]; then
+    # create user
+    sudo -u postgres -i createuser colab
   fi
 
-fi
+  if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(1) from pg_database where datname = 'colab';")" -eq 0 ]; then
+    # create database
+    sudo -u postgres -i createdb --owner=colab colab
+  fi
 
-if [ -f /etc/colab/settings.yaml ]; then
   colab-admin migrate
 fi
 
--
libgit2 0.21.2