Ignoring backups. Working on staging and discovery.

.gitignore

@@ -39,6 +39,7 @@ templates/maintenance_on.html
 vendor/mms-agent/settings.py
 apps/social/spam.py
 venv*
+backups
 
 # Docker
 docker/haproxy/haproxy.consul.cfg

Makefile

@@ -97,16 +97,10 @@ deploy_work:
 	- ansible-playbook ansible/deploy_work.yml
 deploy_monitor:
 	- ansible-playbook ansible/deploy_monitor.yml
+deploy_staging:
+	- ansible-playbook ansible/deploy_staging.yml
 
 # Provision
-setup_app:
-	- ansible-playbook ansible/provision.yml -l app --tags web
-setup_node:
-	- ansible-playbook ansible/provision.yml -l node --tags node
-setup_www:
-	- ansible-playbook ansible/provision.yml -l haproxy --tags haproxy
-setup_celery:
-	- ansible-playbook ansible/provision.yml -l task --tags celery
 firewall:
 	- ansible-playbook ansible/provision.yml --tags firewall -l db
 

ansible/deploy_staging.yml

@@ -0,0 +1,19 @@
+---
+- hosts: app
+  gather_facts: false
+  vars_files:
+    - env_vars/base.yml
+    - env_vars/dev.yml
+
+  tasks:
+    - name: Pull newsblur_web github
+      git:
+        repo: https://github.com/samuelclay/NewsBlur.git
+        dest: /srv/newsblur/
+        version: dashboard3
+      register: pulled
+    
+    - name: Reload gunicorn
+      become: yes
+      command: "docker kill --signal=HUP newsblur_web"
+      # when: pulled.changed

ansible/setup_discovery.yml

@@ -15,3 +15,4 @@
     - {role: 'consul', tags: 'consul'}
     - {role: 'consul-client', tags: 'consul'}
     - {role: 'docker-compose', tags: 'docker-compose'}
+    - {role: 'backups', tags: 'backups'}