staging tweaks

Author: pushcx

ansible.cfg

@@ -1,9 +1,11 @@
 [defaults]
+callback_whitelist = profile_tasks
+internal_poll_interval=0.001
 inventory = ./inventories/prod.ini
 log_path = ./lobsters-ansible.log
-callback_whitelist = profile_tasks
-remote_tmp = /tmp/ansible
+timeout = 10
 
 [ssh_connection]
-ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s -o PreferredAuthentications=publickey
+control_path = /tmp/ansible-ssh-%%h-%%p-%%r
 pipelining = True
+ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s -o PreferredAuthentications=publickey

group_vars/staging.yml

@@ -1,4 +1,4 @@
-db_host: stage01
-mx_host: stage01
-smtp_host: stage01
-www_host: stage01
+db_host: stage01.lobste.rs
+mx_host: stage01.lobste.rs
+smtp_host: stage01.lobste.rs
+www_host: stage01.lobste.rs

inventories/stage.ini inventories/staging.ini

@@ -3,19 +3,19 @@ env=staging
 ps1_fg=red
 
 [db]
-stage01
+stage01.lobste.rs
 
 [mx]
-stage01
+stage01.lobste.rs
 
 [smtp]
-stage01
+stage01.lobste.rs
 
 [www]
-stage01
+stage01.lobste.rs
 
 [www_worker]
-stage01
+stage01.lobste.rs
 
 #[mockturtle]
 #mockturtle.xen.prgmr.com

roles/nginx/files/staging/nginx/sites-available/lobste.rs

@@ -1,9 +1,9 @@
 upstream lobsters_puma_server {
-  server unix:/srv/lobste.rs/tmp/puma.sock fail_timeout=0;
+  server unix:/srv/lobste.rs/http/tmp/puma.sock fail_timeout=0;
 }
 
 server {
-  listen :: default_server;
+  listen 80 default_server;
   listen [::]:80 default_server;
   server_name stage01.lobste.rs;
   access_log /var/log/nginx/lobste.rs.access.log main;

roles/puma/templates/lobsters-puma.service.j2

@@ -18,7 +18,7 @@ RestartSec=60
 StartLimitBurst=5
 StartLimitInterval=3600
 
-Environment=RAILS_ENV={{ env }} RUBYOPT='-W:no-deprecated'
+Environment=RAILS_ENV=production RUBYOPT='-W:no-deprecated'
 # Environment=PUMA_DEBUG=1
 
 # SystemD will not run puma even if it is in your path. You must specify

staging.yml

@@ -0,0 +1,37 @@
+---
+- name: lobsters
+  tags: lobsters
+  become: yes
+  hosts: www_worker
+  roles:
+    - { role: lobsters }
+
+- name: puma
+  tags: puma
+  become: yes
+  hosts: www_worker
+  roles:
+    - { role: puma }
+
+- name: mariadb
+  tags: mariadb
+  become: yes
+  hosts: www_worker
+  roles:
+    - { role: puma }
+
+- name: nginx
+  tags: nginx
+  become: yes
+  hosts: www
+  roles:
+    - { role: nginx }
+
+# deliberately no postfix config - don't want staging hassling people
+
+- name: sysadm
+  tags: sysadm
+  become: yes
+  hosts: all
+  roles:
+    - { role: sysadm }