From 9165010608049581d1d12b0460ca06720c2d1160 Mon Sep 17 00:00:00 2001
From: Kevin <kevin@stealsyour.pw>
Date: Thu, 7 Apr 2016 15:51:37 -0400
Subject: [PATCH 1/3] Converting to ansible Added travis fpm build and deploy
 to bintray

Signed-off-by: Kevin <kevin@stealsyour.pw>
---
 .bintray_descriptor.json                      | 24 ++++++++
 .gitignore                                    |  4 ++
 .travis.yml                                   | 24 ++++++--
 Vagrantfile                                   | 39 ++++++++++++-
 build_release.sh                              |  3 +
 ops/ansible/group_vars/all/vars_file.yml      |  3 +
 ops/ansible/inventory                         |  0
 .../files/apache2/postmaster.conf}            |  0
 .../roles/postmaster_deploy/handlers/main.yml | 29 ++++++++++
 .../roles/postmaster_deploy/tasks/main.yml    | 55 +++++++++++++++++++
 .../roles/postmaster_deploy/tasks/mysql.yml   | 26 +++++++++
 ops/ansible/run_ansible.sh                    |  2 +
 ops/ansible/site.yml                          |  6 ++
 13 files changed, 209 insertions(+), 6 deletions(-)
 create mode 100644 .bintray_descriptor.json
 create mode 100644 build_release.sh
 create mode 100644 ops/ansible/group_vars/all/vars_file.yml
 create mode 100644 ops/ansible/inventory
 rename ops/{apache.conf => ansible/roles/postmaster_deploy/files/apache2/postmaster.conf} (100%)
 create mode 100644 ops/ansible/roles/postmaster_deploy/handlers/main.yml
 create mode 100644 ops/ansible/roles/postmaster_deploy/tasks/main.yml
 create mode 100644 ops/ansible/roles/postmaster_deploy/tasks/mysql.yml
 create mode 100644 ops/ansible/run_ansible.sh
 create mode 100644 ops/ansible/site.yml

diff --git a/.bintray_descriptor.json b/.bintray_descriptor.json
new file mode 100644
index 0000000..e7e2ee0
--- /dev/null
+++ b/.bintray_descriptor.json
@@ -0,0 +1,24 @@
+{
+    "package": {
+        "name": "PostMaster",
+        "repo": "PostMaster",
+        "subject": "stackfocus",
+        "desc": "PostMaster is a beautiful web application to manage domains, users, and aliases on a Linux mail server ",
+        "website_url": "https://github.com/StackFocus/PostMaster",
+        "issue_tracker_url": "https://github.com/StackFocus/PostMaster/issues",
+        "vcs_url": "https://github.com/StackFocus/PostMaster.git",
+        "licenses": ["AGPL"],
+        "labels": ["Postmaster", "Stackfocus", "Flask"],
+        "public_download_numbers": true,
+        "public_stats": true
+    },
+    "version": {
+        "name": "1.0.0",
+        "desc": "Abbey Road"
+    },
+    "files":
+        [
+        {"includePattern": "*.deb" }
+        ],
+    "publish": true
+}
diff --git a/.gitignore b/.gitignore
index b2b338e..4152b0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 # Created by https://www.gitignore.io
+site.retry
 
 .vagrant
 .idea
@@ -64,3 +65,6 @@ docs/_build/
 target/
 
 env/
+*.deb
+
+
diff --git a/.travis.yml b/.travis.yml
index 5ea2455..0fe4017 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,25 @@
-language: python  
-python:  
+language: python
+python:
   - "2.7"
-install:  
+install:
   - pip install -r requirements.txt
 before_script:
   - ./pylint-check.py
-script:  
+script:
   - py.test -v --cov postmaster --cov-report term-missing tests/
-after_success:  
+after_success:
   - coveralls
+
+before_deploy:
+  - gem install fpm
+  - ./build_release.sh
+
+deploy:
+  provider: bintray
+  file: .bintray_descriptor.json
+  user: thatarchguy
+  key:
+    secure: qoGnfUwsoajFoclGpmhTFj8rP6botEqdXHBOP8xG3EvdNMvF1FNhH6DjhKBF3bwQf7/VEczz/TqVaTsOgrdHJvVLTxYSckM569wbdFLn6/b1MohdBaxu1/mcXXw+RVTjep45cwlzaMQoe3aZn8KPtjfal5Bitc2U2cNepkoaj+nftNGpCZVh1pWI/uQXlKQK/CfzS8mQSKrdsRuBvko88R7Th8otqdSwx+dM+IwtimJsupAhlbpU5XlK01zNn++QVvZ3kkPGWVxRFLlPhDhWWxK/RmTBLZ/HqoE6oyHBsd+e8ydLvVovMjAdagBq4ABXPstSr9/vYfaS9o6RTaqWbt0MFdkUpQdpfUnFARay8rPYJkzkRdqRll5byRh9IHxZc34z+j3lVjbzKRyb0kfeCTDdidULJytWa3SWN4xdCMhyyjjpULsMI1X4RYYtO89Uc85BlD0AQrWCkmJ7rqpUPxkaSfBEuhotTi0PUyUIaU1xLpgtNQFf70Pf3bSEG6W3XDR3vy2k6yiZWWSRAQWSbxTA64DmW0wk/q9ePxso3uqzALYU1M5WflEEnCBkXGFQh8MqAmugHjP7BMjoe+vlJFt5ddoa7yNV14EkvbHY/rb1JVA2Oa4FgVVyt0JOYEnPIvD+NY0VjFHWrOAro3uKHNlOg5nUaMEddwIuKZpoZgo=
+  dry-run: true
+  on:
+    tags: true
diff --git a/Vagrantfile b/Vagrantfile
index f92a2f1..576e771 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,9 +1,46 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+# do this to patch ansible because
+#https://github.com/mitchellh/vagrant/issues/6793
+$script = <<SCRIPT
+GALAXY=/usr/local/bin/ansible-galaxy
+echo '#!/usr/bin/env python2
+import sys
+import os
+
+args = sys.argv
+if args[1:] == ["--help"]:
+  args.insert(1, "info")
+
+os.execv("/usr/bin/ansible-galaxy", args)
+' | sudo tee $GALAXY
+sudo chmod 0755 $GALAXY
+sudo apt-key update
+sudo apt-key update
+SCRIPT
+
 Vagrant.configure(2) do |config|
   config.vm.box = "puphpet/ubuntu1404-x64"
   config.vm.network "forwarded_port", guest: 80, host: 8080
   config.vm.synced_folder "./", "/opt/postmaster/git"
-  config.vm.provision "shell", path: "ops/Vagrant.sh"
+
+
+ config.vm.provision "shell", inline: $script
+
+ config.vm.provision :ansible_local do |ansible|
+    ansible.verbose = "v"
+    ansible.install = true
+    ansible.raw_arguments = [
+      '--extra-vars="remote_user=vagrant"',
+      '--extra-vars="provision_type=dev"'
+    ]
+    # I don't know why, but extra_vars doesn't work with ansible_local
+    # or it could be something with my host. raw_arguments for local though
+    ansible.extra_vars = {
+      remote_user: "vagrant",
+      provision_type: "dev"
+    }
+    ansible.playbook = "ops/ansible/site.yml"
+  end
 end
diff --git a/build_release.sh b/build_release.sh
new file mode 100644
index 0000000..7bf3e05
--- /dev/null
+++ b/build_release.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+REVISION=`git describe --abbrev=0 --tags | cut -c 2-`
+fpm -s dir -t deb -n "postmaster" -v $REVISION --prefix /opt/postmaster/git --description 'PostMaster is a beautiful web application to manage domains, users, and aliases on a Linux mail server' --url 'https://github.com/StackFocus/PostMaster' --after-install ops/ansible/run_ansible.sh -d git -d python -d python-pip -d python-dev -d python-virtualenv -d libldap2-dev -d libssl-dev -d libsasl2-dev -d libffi-dev -d apache2 -d libapache2-mod-wsgi -d libmysqlclient-dev ./
diff --git a/ops/ansible/group_vars/all/vars_file.yml b/ops/ansible/group_vars/all/vars_file.yml
new file mode 100644
index 0000000..cc77c0f
--- /dev/null
+++ b/ops/ansible/group_vars/all/vars_file.yml
@@ -0,0 +1,3 @@
+---
+remote_user: "ubuntu"
+provision_type: ""
diff --git a/ops/ansible/inventory b/ops/ansible/inventory
new file mode 100644
index 0000000..e69de29
diff --git a/ops/apache.conf b/ops/ansible/roles/postmaster_deploy/files/apache2/postmaster.conf
similarity index 100%
rename from ops/apache.conf
rename to ops/ansible/roles/postmaster_deploy/files/apache2/postmaster.conf
diff --git a/ops/ansible/roles/postmaster_deploy/handlers/main.yml b/ops/ansible/roles/postmaster_deploy/handlers/main.yml
new file mode 100644
index 0000000..f9b2c03
--- /dev/null
+++ b/ops/ansible/roles/postmaster_deploy/handlers/main.yml
@@ -0,0 +1,29 @@
+---
+- name: restart nginx
+  sudo: yes
+  service: name=nginx state=restarted
+
+- name: validate nginx configuration
+  sudo: yes
+  command: nginx -t -c /etc/nginx/nginx.conf
+  changed_when: False
+
+- name: reload nginx
+  sudo: yes
+  service: name=nginx state=reloaded
+
+- name: reload uwsgi
+  sudo: yes
+  service: name=uwsgi state=reloaded
+
+- name: reload apache
+  sudo: yes
+  service: name=apache2 state=reloaded
+
+- name: restart apache
+  sudo: yes
+  service: name=nginx state=restarted
+
+- name: restart uwsgi
+  sudo: yes
+  service: name=apache2 state=restarted
diff --git a/ops/ansible/roles/postmaster_deploy/tasks/main.yml b/ops/ansible/roles/postmaster_deploy/tasks/main.yml
new file mode 100644
index 0000000..4c4fca1
--- /dev/null
+++ b/ops/ansible/roles/postmaster_deploy/tasks/main.yml
@@ -0,0 +1,55 @@
+---
+
+- name: Install main list of packages
+  apt: pkg={{item}} state=installed update_cache=true
+  sudo: yes
+  with_items:
+    - git
+    - python
+    - python-pip
+    - python-dev
+    - python-virtualenv
+    - libldap2-dev
+    - libssl-dev
+    - libsasl2-dev
+    - libffi-dev
+    - apache2
+    - libapache2-mod-wsgi
+    - libmysqlclient-dev
+  when: provision_type == "dev"
+
+- name: Create virtualenv directory
+  file: path=/opt/postmaster/env state=directory owner={{remote_user}} group={{remote_user}} mode=0775 recurse=yes
+  sudo: yes
+
+- name: Create logs directory
+  file: path=/opt/postmaster/logs state=directory owner={{remote_user}} group=www-data mode=0775 recurse=yes
+  sudo: yes
+
+- pip: requirements=/opt/postmaster/git/requirements.txt virtualenv=/opt/postmaster/env
+
+- include: mysql.yml
+  when: provision_type == "dev"
+
+- name: Enable wsgi module for apache2
+  apache2_module: state=present name=wsgi
+
+- name: Copy apache2 vhost config over
+  sudo: yes
+  copy: src=apache2/postmaster.conf dest=/etc/apache2/sites-available/postmaster.conf mode=0644
+
+- name: Disable default vhost
+  command: a2dissite 000-default.conf
+  sudo: yes
+
+- name: Enable new vhost
+  command: a2ensite postmaster.conf
+  sudo: yes
+
+- name: Ensure apache is started and enabled to start at boot.
+  sudo: yes
+  service: name=apache2 state=restarted enabled=yes
+
+- name: Ensure apache is reloaded
+  sudo: yes
+  service: name=apache2 state=reloaded
diff --git a/ops/ansible/roles/postmaster_deploy/tasks/mysql.yml b/ops/ansible/roles/postmaster_deploy/tasks/mysql.yml
new file mode 100644
index 0000000..a854164
--- /dev/null
+++ b/ops/ansible/roles/postmaster_deploy/tasks/mysql.yml
@@ -0,0 +1,26 @@
+---
+# mysql setup
+
+- name: Set MySQL root password before installing
+  sudo: yes
+  debconf: name='mysql-server' question='mysql-server/root_password' value='vagrant' vtype='password'
+
+- name: Confirm MySQL root password before installing
+  sudo: yes
+  debconf: name='mysql-server' question='mysql-server/root_password_again' value='vagrant' vtype='password'
+
+- name: Installing MySQL
+  sudo: yes
+  apt: pkg=mysql-server state=latest
+
+- name: Install mysql-python globally for this next command :(
+  pip: name=MySQL-python
+  sudo: yes
+
+- name: Create default database for mysql
+  mysql_db: name=servermail state=present login_user=root login_password=vagrant
+
+- name: Migrate tables
+  command: /opt/postmaster/env/bin/python /opt/postmaster/git/manage.py createdb
+  args:
+    creates: /opt/postmaster/git/db/migrations
diff --git a/ops/ansible/run_ansible.sh b/ops/ansible/run_ansible.sh
new file mode 100644
index 0000000..aa3dcb3
--- /dev/null
+++ b/ops/ansible/run_ansible.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+ansible-playbook -i "localhost," -c local /opt/postmaster/git/ops/ansible/site.yml
diff --git a/ops/ansible/site.yml b/ops/ansible/site.yml
new file mode 100644
index 0000000..25b0e35
--- /dev/null
+++ b/ops/ansible/site.yml
@@ -0,0 +1,6 @@
+# This playbook deploys the whole application stack in this site.
+- name: install postmaster
+  hosts: all
+
+  roles:
+    - postmaster_deploy

From d67702ad345dc1240cc7816db7ecb7da02c87d89 Mon Sep 17 00:00:00 2001
From: PrahlM93 <matt_prahl@live.com>
Date: Sat, 14 May 2016 12:39:17 -0400
Subject: [PATCH 2/3] Run ansible entirely in Vagrant guest

* Stops using ansible provisioner and runs ansible entirely on the guest
using Vagrant
* Fixes issue where migration scripts were still present causing the
database to not be created
* Replaces sudo with becomes to avoid deprecation warnings
---
 Vagrantfile                                   | 50 +++---------
 ops/Vagrant.sh                                | 80 -------------------
 .../roles/postmaster_deploy/handlers/main.yml | 14 ++--
 .../roles/postmaster_deploy/tasks/main.yml    | 16 ++--
 .../roles/postmaster_deploy/tasks/mysql.yml   | 15 +++-
 5 files changed, 39 insertions(+), 136 deletions(-)
 delete mode 100644 ops/Vagrant.sh

diff --git a/Vagrantfile b/Vagrantfile
index 576e771..33ba275 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,46 +1,22 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# do this to patch ansible because
-#https://github.com/mitchellh/vagrant/issues/6793
 $script = <<SCRIPT
-GALAXY=/usr/local/bin/ansible-galaxy
-echo '#!/usr/bin/env python2
-import sys
-import os
+#!/bin/bash
+if [ ! -f /usr/bin/ansible-playbook ]; then
+    apt-get update
+    apt-get install -y software-properties-common
+    apt-add-repository ppa:ansible/ansible
+    apt-get update
+    apt-get install -y ansible
+fi
 
-args = sys.argv
-if args[1:] == ["--help"]:
-  args.insert(1, "info")
-
-os.execv("/usr/bin/ansible-galaxy", args)
-' | sudo tee $GALAXY
-sudo chmod 0755 $GALAXY
-sudo apt-key update
-sudo apt-key update
+ansible-playbook -i "localhost," -c local /opt/postmaster/git/ops/ansible/site.yml --extra-vars="remote_user=vagrant" --extra-vars="provision_type=dev"
 SCRIPT
 
 Vagrant.configure(2) do |config|
-  config.vm.box = "puphpet/ubuntu1404-x64"
-  config.vm.network "forwarded_port", guest: 80, host: 8080
-  config.vm.synced_folder "./", "/opt/postmaster/git"
-
-
- config.vm.provision "shell", inline: $script
-
- config.vm.provision :ansible_local do |ansible|
-    ansible.verbose = "v"
-    ansible.install = true
-    ansible.raw_arguments = [
-      '--extra-vars="remote_user=vagrant"',
-      '--extra-vars="provision_type=dev"'
-    ]
-    # I don't know why, but extra_vars doesn't work with ansible_local
-    # or it could be something with my host. raw_arguments for local though
-    ansible.extra_vars = {
-      remote_user: "vagrant",
-      provision_type: "dev"
-    }
-    ansible.playbook = "ops/ansible/site.yml"
-  end
+    config.vm.box = "puphpet/ubuntu1404-x64"
+    config.vm.network "forwarded_port", guest: 80, host: 8080
+    config.vm.synced_folder "./", "/opt/postmaster/git"
+    config.vm.provision "shell", inline: $script
 end
diff --git a/ops/Vagrant.sh b/ops/Vagrant.sh
deleted file mode 100644
index 586113d..0000000
--- a/ops/Vagrant.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-export DEBIAN_FRONTEND=noninteractive
-debconf-set-selections <<< 'mysql-server mysql-server/root_password password vagrant'
-debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password vagrant'
-
-echo 'Updating the aptitude repository...'
-apt-get -y update > /dev/null
-
-packages=('python' 'python-pip' 'python-dev' 'libldap2-dev' 'libssl-dev' 'libsasl2-dev' 'libffi-dev' 'apache2' 'libapache2-mod-wsgi' 'mysql-server' 'libmysqlclient-dev')
-
-for package in "${packages[@]}"
-do
-    if dpkg --get-selections | grep -q "^$package[[:space:]]*install$" >/dev/null
-    then
-        echo "Skipping the installation of $package"
-    else
-        echo "Installing $package..."
-        apt-get install -y $package > /dev/null
-    fi
-done
-
-echo 'Checking the python version...'
-if [ $(python -V 2>&1 | grep -c "2.7") -eq 0 ]
-then
-    >&2 echo 'Please ensure that python 2.7 is installed and is the default python version'
-    exit 1
-fi
-
-echo 'Creating the /opt/postmaster/logs directory'
-mkdir /opt/postmaster/logs
-chown www-data:www-data /opt/postmaster/logs
-
-if ! [ -d '/opt/postmaster/env' ]
-then
-    echo 'Installing the virtual environment...'
-    pip install virtualenv > /dev/null
-    virtualenv /opt/postmaster/env > /dev/null
-    source /opt/postmaster/env/bin/activate
-else
-    >&2 echo '/opt/postmaster/env already exists. Please make sure it is removed before rerunning the script'
-    exit 1
-fi
-
-cd /opt/postmaster/git
-echo 'Installing the Python packages required in the virtualenv...'
-pip install -r requirements.txt > /dev/null
-
-echo 'Creating the database...'
-python manage.py clean
-mysql -u root -pvagrant -e "CREATE DATABASE servermail"
-python manage.py setdburi 'mysql://root:vagrant@localhost:3306/servermail'
-python manage.py createdb
-python manage.py generatekey
-
-deactivate
-
-if [ $(apachectl -M | grep -c 'wsgi_module') == 0 ]
-then
-    echo 'Enabling the wsgi module for Apache...'
-    a2enmod -q wsgi > /dev/null
-fi
-
-if [ $(apachectl -S | grep -c "000-default.conf") != 0 ]
-then
-    echo 'Disabling 000-default.conf...'
-    a2dissite 000-default.conf > /dev/null
-fi
-
-echo 'Copying and enabling the standard PostMaster Apache configuration...'
-cp -f /opt/postmaster/git/ops/apache.conf /etc/apache2/sites-available/postmaster.conf
-chmod 644 /etc/apache2/sites-available/postmaster.conf
-a2ensite -q postmaster.conf > /dev/null
-echo 'export POSTMASTER_DEV=TRUE' >> /etc/apache2/envvars
-
-echo 'Restarting Apache...'
-service apache2 restart > /dev/null
-
-unset DEBIAN_FRONTEND
-
-echo 'The installation has completed!'
diff --git a/ops/ansible/roles/postmaster_deploy/handlers/main.yml b/ops/ansible/roles/postmaster_deploy/handlers/main.yml
index f9b2c03..4061ba6 100644
--- a/ops/ansible/roles/postmaster_deploy/handlers/main.yml
+++ b/ops/ansible/roles/postmaster_deploy/handlers/main.yml
@@ -1,29 +1,29 @@
 ---
 - name: restart nginx
-  sudo: yes
+  become: yes
   service: name=nginx state=restarted
 
 - name: validate nginx configuration
-  sudo: yes
+  become: yes
   command: nginx -t -c /etc/nginx/nginx.conf
   changed_when: False
 
 - name: reload nginx
-  sudo: yes
+  become: yes
   service: name=nginx state=reloaded
 
 - name: reload uwsgi
-  sudo: yes
+  become: yes
   service: name=uwsgi state=reloaded
 
 - name: reload apache
-  sudo: yes
+  become: yes
   service: name=apache2 state=reloaded
 
 - name: restart apache
-  sudo: yes
+  become: yes
   service: name=nginx state=restarted
 
 - name: restart uwsgi
-  sudo: yes
+  become: yes
   service: name=apache2 state=restarted
diff --git a/ops/ansible/roles/postmaster_deploy/tasks/main.yml b/ops/ansible/roles/postmaster_deploy/tasks/main.yml
index 4c4fca1..4e477c9 100644
--- a/ops/ansible/roles/postmaster_deploy/tasks/main.yml
+++ b/ops/ansible/roles/postmaster_deploy/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - name: Install main list of packages
   apt: pkg={{item}} state=installed update_cache=true
-  sudo: yes
+  become: yes
   with_items:
     - git
     - python
@@ -20,11 +20,11 @@
 
 - name: Create virtualenv directory
   file: path=/opt/postmaster/env state=directory owner={{remote_user}} group={{remote_user}} mode=0775 recurse=yes
-  sudo: yes
+  become: yes
 
 - name: Create logs directory
   file: path=/opt/postmaster/logs state=directory owner={{remote_user}} group=www-data mode=0775 recurse=yes
-  sudo: yes
+  become: yes
 
 - pip: requirements=/opt/postmaster/git/requirements.txt virtualenv=/opt/postmaster/env
 
@@ -35,21 +35,21 @@
   apache2_module: state=present name=wsgi
 
 - name: Copy apache2 vhost config over
-  sudo: yes
+  become: yes
   copy: src=apache2/postmaster.conf dest=/etc/apache2/sites-available/postmaster.conf mode=0644
 
 - name: Disable default vhost
   command: a2dissite 000-default.conf
-  sudo: yes
+  become: yes
 
 - name: Enable new vhost
   command: a2ensite postmaster.conf
-  sudo: yes
+  become: yes
 
 - name: Ensure apache is started and enabled to start at boot.
-  sudo: yes
+  become: yes
   service: name=apache2 state=restarted enabled=yes
 
 - name: Ensure apache is reloaded
-  sudo: yes
+  become: yes
   service: name=apache2 state=reloaded
diff --git a/ops/ansible/roles/postmaster_deploy/tasks/mysql.yml b/ops/ansible/roles/postmaster_deploy/tasks/mysql.yml
index a854164..6dbf9e2 100644
--- a/ops/ansible/roles/postmaster_deploy/tasks/mysql.yml
+++ b/ops/ansible/roles/postmaster_deploy/tasks/mysql.yml
@@ -2,25 +2,32 @@
 # mysql setup
 
 - name: Set MySQL root password before installing
-  sudo: yes
+  become: yes
   debconf: name='mysql-server' question='mysql-server/root_password' value='vagrant' vtype='password'
 
 - name: Confirm MySQL root password before installing
-  sudo: yes
+  become: yes
   debconf: name='mysql-server' question='mysql-server/root_password_again' value='vagrant' vtype='password'
 
 - name: Installing MySQL
-  sudo: yes
+  become: yes
   apt: pkg=mysql-server state=latest
 
 - name: Install mysql-python globally for this next command :(
   pip: name=MySQL-python
-  sudo: yes
+  become: yes
 
 - name: Create default database for mysql
   mysql_db: name=servermail state=present login_user=root login_password=vagrant
 
+- name: Cleans the migration scripts
+  command: /opt/postmaster/env/bin/python /opt/postmaster/git/manage.py clean
+  args:
+    chdir: /opt/postmaster/git
+    removes: /opt/postmaster/git/db
+
 - name: Migrate tables
   command: /opt/postmaster/env/bin/python /opt/postmaster/git/manage.py createdb
   args:
+    chdir: /opt/postmaster/git
     creates: /opt/postmaster/git/db/migrations

From a62063730a9d8a664f850f58d80208d148b73799 Mon Sep 17 00:00:00 2001
From: Kevin <kevin@stealsyour.pw>
Date: Thu, 26 May 2016 18:57:43 -0400
Subject: [PATCH 3/3] Changed apache2 default port for PostMaster to 8082
 Creates PostMaster service account user for file ownership

Signed-off-by: Kevin <kevin@stealsyour.pw>
---
 Vagrantfile                                          |  2 +-
 ops/ansible/group_vars/all/vars_file.yml             |  2 +-
 .../postmaster_deploy/files/apache2/postmaster.conf  |  3 ++-
 .../roles/postmaster_deploy/handlers/main.yml        |  8 --------
 ops/ansible/roles/postmaster_deploy/tasks/main.yml   | 12 ++++++++----
 postmaster/utils.py                                  |  1 +
 tests/conftest.py                                    |  3 ++-
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 33ba275..f30a9ba 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -16,7 +16,7 @@ SCRIPT
 
 Vagrant.configure(2) do |config|
     config.vm.box = "puphpet/ubuntu1404-x64"
-    config.vm.network "forwarded_port", guest: 80, host: 8080
+    config.vm.network "forwarded_port", guest: 8082, host: 8080
     config.vm.synced_folder "./", "/opt/postmaster/git"
     config.vm.provision "shell", inline: $script
 end
diff --git a/ops/ansible/group_vars/all/vars_file.yml b/ops/ansible/group_vars/all/vars_file.yml
index cc77c0f..dbf34c4 100644
--- a/ops/ansible/group_vars/all/vars_file.yml
+++ b/ops/ansible/group_vars/all/vars_file.yml
@@ -1,3 +1,3 @@
 ---
-remote_user: "ubuntu"
+remote_user: "postmaster"
 provision_type: ""
diff --git a/ops/ansible/roles/postmaster_deploy/files/apache2/postmaster.conf b/ops/ansible/roles/postmaster_deploy/files/apache2/postmaster.conf
index d4d4b79..684564d 100644
--- a/ops/ansible/roles/postmaster_deploy/files/apache2/postmaster.conf
+++ b/ops/ansible/roles/postmaster_deploy/files/apache2/postmaster.conf
@@ -1,4 +1,5 @@
-<VirtualHost *:80>
+Listen 8082
+<VirtualHost *:8082>
     WSGIDaemonProcess postmaster user=www-data group=www-data threads=5
     WSGIScriptAlias / /opt/postmaster/git/postmaster.wsgi
 
diff --git a/ops/ansible/roles/postmaster_deploy/handlers/main.yml b/ops/ansible/roles/postmaster_deploy/handlers/main.yml
index 4061ba6..ef0fcbc 100644
--- a/ops/ansible/roles/postmaster_deploy/handlers/main.yml
+++ b/ops/ansible/roles/postmaster_deploy/handlers/main.yml
@@ -12,10 +12,6 @@
   become: yes
   service: name=nginx state=reloaded
 
-- name: reload uwsgi
-  become: yes
-  service: name=uwsgi state=reloaded
-
 - name: reload apache
   become: yes
   service: name=apache2 state=reloaded
@@ -23,7 +19,3 @@
 - name: restart apache
   become: yes
   service: name=nginx state=restarted
-
-- name: restart uwsgi
-  become: yes
-  service: name=apache2 state=restarted
diff --git a/ops/ansible/roles/postmaster_deploy/tasks/main.yml b/ops/ansible/roles/postmaster_deploy/tasks/main.yml
index 4e477c9..c756824 100644
--- a/ops/ansible/roles/postmaster_deploy/tasks/main.yml
+++ b/ops/ansible/roles/postmaster_deploy/tasks/main.yml
@@ -1,5 +1,8 @@
 ---
 
+- name: Create PostMaster User
+  user: name={{remote_user}} comment="PostMaster Service Account"
+
 - name: Install main list of packages
   apt: pkg={{item}} state=installed update_cache=true
   become: yes
@@ -34,13 +37,14 @@
 - name: Enable wsgi module for apache2
   apache2_module: state=present name=wsgi
 
+- name: Check whether to copy the apache2 vhost file
+  stat: path=/etc/apache2/sites-available/postmaster.conf
+  register: apache2_config
+
 - name: Copy apache2 vhost config over
   become: yes
   copy: src=apache2/postmaster.conf dest=/etc/apache2/sites-available/postmaster.conf mode=0644
-
-- name: Disable default vhost
-  command: a2dissite 000-default.conf
-  become: yes
+  when: apache2_config.stat.exists == False
 
 - name: Enable new vhost
   command: a2ensite postmaster.conf
diff --git a/postmaster/utils.py b/postmaster/utils.py
index f927cfa..d3fcdd6 100644
--- a/postmaster/utils.py
+++ b/postmaster/utils.py
@@ -130,6 +130,7 @@ def add_default_configuration_settings():
     except Exception:
         db.session.rollback()
 
+
 def add_ldap_user_to_db(username, display_name):
     """ Adds an LDAP user stub in the Admins table of the database for flask_login
     """
diff --git a/tests/conftest.py b/tests/conftest.py
index 2a5b6c5..c7c804b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -71,7 +71,7 @@ def initialize():
         return True
 
     except Exception as e:
-        print "Unexpected error: {0}".format(e.message)
+        print("Unexpected error: {0}".format(e.message))
         return False
 
     return False
@@ -79,6 +79,7 @@ def initialize():
 # Create a fresh database
 initialize()
 
+
 @pytest.fixture(scope='module')
 def loggedin_client():
     client = app.test_client()