extract nginx role in line with #39

.gitignore

@@ -3,3 +3,5 @@
 .pass
 .env
 env
+
+roles/nginx/

README.md

@@ -7,17 +7,24 @@ Interested in becoming a member? Get your invite here: http://pythondevelopers.h
 
 ## Get Started
 
-Ensure you have a `.pass` file in the root of your project, populated with the ansible password.
+1. Ensure you have a `.pass` file in the root of the repository, populated with the ansible password for the any variables your playbook depends on
+2. Download/install ansible-galaxy provided roles before you run any playbooks
+
+```bash
+$ ansible-galaxy install -r requirements.yml
+```
 
 ### Configure/Deploy PySlackers website
 
-    $ ansible-playbook website.yml
+```bash
+$ ansible-playbook website.yml
+```
 
 ### Configure/Deploy SirBot
 
-TODO!
-
-    $ ansible-playbook sirbot.yml
+```bash
+$ ansible-playbook sirbot.yml
+```
 
 ### Run the deployment for the specific app you want to deploy
 
@@ -28,13 +35,17 @@ TODO!
 
 Run the deployment.
 
-    $ ansible-playbook -i <inventory> deploy.yml --tags <app>
+```bash
+$ ansible-playbook -i <inventory> deploy.yml --tags <app>
+```
 
 ## Testing
 
 Tests are run via Travis CI's `.travis.yml`. Unit tests can be manually via docker with:
 
-    $ docker run -t -i -v ${PWD}:/data geerlingguy/docker-ubuntu1604-ansible /data/run_tests.sh
+```bash
+$ docker run -t -i -v ${PWD}:/data geerlingguy/docker-ubuntu1604-ansible /data/run_tests.sh
+```
 
 Ensure that you have placed the Ansible vault password into `.pass` beforehand.
 

ansible.cfg

@@ -1,6 +1,7 @@
 [defaults]
 ansible_managed = This file is managed by Ansible, manual edits will be lost
 inventory = environments/inventory
+pipelining = True
 retry_files_enabled = False
+roles_path = ./roles/
 vault_password_file = .pass
-pipelining = True

requirements.yml

@@ -0,0 +1,3 @@
+- src: https://github.com/pyslackers/ansible-role-nginx.git
+  version: master
+  name: nginx

sirbot.yml

@@ -5,10 +5,7 @@
     repo: https://github.com/pyslackers/sirbot-pythondev.git
     version: prod
     username: "{{ sirbot_user }}"
-    domains:
-      - "{{ sirbot_domain }}"
     service_name: sirbot
-    site_port: "{{ sirbot_port }}"
     exec_start: "/home/{{ username }}/.pyvenv/bin/sirbot -c {{ sirbot_config }}"
     work_dir: "/home/{{ username }}/"
     post_install: "/home/{{ username }}/.pyvenv/bin/sirbot -c {{ sirbot_config }} --update"
@@ -19,7 +16,13 @@
       - "SIRBOT_GITHUB_SECRET={{ SIRBOT_GITHUB_SECRET }}"
   roles:
     - user
-    - nginx
+    - role: nginx
+      sites:
+        sirbot:
+          domains:
+            - "{{ sirbot_domain }}"
+          port: "{{ sirbot_port }}"
+          ssl: true
     - sirbot
     - role: system_service
       when: systemd_enabled == true

website.yml

@@ -2,9 +2,6 @@
 - name: deploy pyslackers website
   hosts: website
   vars:
-    domains:
-      - "{{ website_domain }}"
-      - "www.{{ website_domain }}"
     repo: https://github.com/pyslackers/website-old.git
     service_name: pyslackers-website
     site_port: "{{ website_port }}"
@@ -19,7 +16,14 @@
       - "SECRET_KEY={{ SECRET_KEY }}"
   roles:
     - user
-    - nginx
+    - role: nginx
+      sites:
+        website:
+          domains:
+            - www.pyslackers.com
+            - pyslackers.com
+          port: "{{ website_port }}"
+          ssl: true
     - pythonapp
     - role: system_service
       when: systemd_enabled