rest for new hosting; test -> staging

Author: pushcx

group_vars/staging.yml

@@ -0,0 +1,4 @@
+db_host: stage01
+mx_host: stage01
+smtp_host: stage01
+www_host: stage01

inventories/stage.ini

@@ -0,0 +1,21 @@
+[all:vars]
+env=staging
+ps1_fg=red
+
+[db]
+stage01
+
+[mx]
+stage01
+
+[smtp]
+stage01
+
+[www]
+stage01
+
+[www_worker]
+stage01
+
+#[mockturtle]
+#mockturtle.xen.prgmr.com

roles/lobsters/tasks/main.yml

@@ -104,7 +104,7 @@
 - name: restart puma
   when: (clone.changed or bundler.changed)
   systemd: >
-    name="puma"
+    name="lobsters-puma"
     state=restarted
 
 - name: cp 5m maintenance job

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

@@ -3,9 +3,9 @@ upstream lobsters_puma_server {
 }
 
 server {
-  listen 71.19.144.172:80 default_server;
-  listen [2605:2700:0:2:a800:ff:fec3:aba2]:80 default_server;
-  server_name test.lobste.rs;
+  listen :: default_server;
+  listen [::]:80 default_server;
+  server_name stage01.lobste.rs;
   access_log /var/log/nginx/lobste.rs.access.log main;
   error_log /var/log/nginx/lobste.rs.error.log;
 

roles/sysadm/files/ssh/production/peter-20171001.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDHD511dnoNmsDtaz60C7nT04A+f4BZbU42V4g7BZ8Pvd80erEbmm2WVIiFEFUw38Zwg+NnR5uS0rHPQpLSGW3b+a3H+7rGFidnmiCHOHtixQ6eNYmlX9UrdJyQBWGmYJpsXDobDjIkkfobVKtvzTx/SPHIS7w87ZJvKLPhQ/DEKHaU0YrZXwgg6FiYzENayQQz9rGmDuySQ0V2TBUB4ARPztcSgxJCUDItr9aBhTidP+LXLbqDUtkqgFo72WPnzcunYpSzk2d3UsdM7OJt8V2vjYj6l6+LmXvcH4S9Gxja/Rze9a6JWzERZ9b6MSXBscICVfLJaYkyWJNEOzRedMcVG2TlR52/NUHx1DgdPlQW6OkoPFNuFkINn9dG++9emy6XoLke+DXOxe1oBCJ7a1FXuTB4XJbT/fthvilhgvuduXN8K/NFIEjxwNeBhA0O8OHWkv22/JzrhX9Knl3VG9ojJaZBzkqJLsHTNNVDsnII3DVaPKBFWkPKWOJzEy+ZPO0= pushcx@gingham

roles/sysadm/files/ssh/production/pushcx-20171001.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDHD511dnoNmsDtaz60C7nT04A+f4BZbU42V4g7BZ8Pvd80erEbmm2WVIiFEFUw38Zwg+NnR5uS0rHPQpLSGW3b+a3H+7rGFidnmiCHOHtixQ6eNYmlX9UrdJyQBWGmYJpsXDobDjIkkfobVKtvzTx/SPHIS7w87ZJvKLPhQ/DEKHaU0YrZXwgg6FiYzENayQQz9rGmDuySQ0V2TBUB4ARPztcSgxJCUDItr9aBhTidP+LXLbqDUtkqgFo72WPnzcunYpSzk2d3UsdM7OJt8V2vjYj6l6+LmXvcH4S9Gxja/Rze9a6JWzERZ9b6MSXBscICVfLJaYkyWJNEOzRedMcVG2TlR52/NUHx1DgdPlQW6OkoPFNuFkINn9dG++9emy6XoLke+DXOxe1oBCJ7a1FXuTB4XJbT/fthvilhgvuduXN8K/NFIEjxwNeBhA0O8OHWkv22/JzrhX9Knl3VG9ojJaZBzkqJLsHTNNVDsnII3DVaPKBFWkPKWOJzEy+ZPO0= pushcx@gingham

roles/sysadm/files/ssh/production/pushcx.pub

@@ -1,6 +1,6 @@
 - include_tasks: apt.yml
 - include_tasks: aleph.yml
-  when: "env == 'test' or 'mockturtle' in group_names"
+  when: "env == 'staging' or 'mockturtle' in group_names"
 - include_tasks: hmadison.yml
-  when: "env == 'test' or 'mockturtle' in group_names"
+  when: "env == 'staging' or 'mockturtle' in group_names"
 - include_tasks: pushcx.yml

roles/sysadm/files/ssh/test/aleph-20190301.pub roles/sysadm/files/ssh/staging/aleph-20190301.pub

@@ -18,7 +18,7 @@
     key="{{ lookup('file', 'ssh/{{ env }}/{{ item.file }}') }}"
     state=present
   with_items:
-    - { file: 'pushcx-20171001.pub' }
+    - { file: 'pushcx.pub' }
 
 #- name: revoke pushcx's ssh keys
 #  tags: user