Erethon · tsironis · Jan 22, 2019 · Jan 22, 2019 · Jan 22, 2019 · Jan 22, 2019
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 *.local
 ansible/secret
 secret

diff --git a/ansible/inventory/group_vars/all/bootstrap.yml b/ansible/inventory/group_vars/all/bootstrap.yml
@@ -1,5 +1,5 @@
 ---
 
-netbase__domain: 'erethon.com'
+netbase__domain: 'dtsironis.net'
 bootstrap__admin_default_users: []
 bootstrap__admin_sshkeys: []
diff --git a/ansible/inventory/group_vars/all/monit.yml b/ansible/inventory/group_vars/all/monit.yml
@@ -1,7 +1,3 @@
 ---
 
-monit_mail_servers:
-  - host: 'mail.erethon.com'
-    port: 587
-
 monit_fs_percentage: 75
diff --git a/ansible/inventory/group_vars/all/users.yml b/ansible/inventory/group_vars/all/users.yml
@@ -3,21 +3,20 @@
 users__enabled: True
 
 users__dotfiles_enabled: True
-users__dotfiles_name: 'erethon'
+users__dotfiles_name: 'tsironis'
 
 users__dotfiles_default_map:
-  'erethon':
-    repo: 'https://github.com/erethon/dotfiles.git'
+  'tsironis':
+    repo: 'https://github.com/tsironis/dotfiles.git'
 
 users__accounts:
-  - name: 'dgrig'
+  - name: 'tsironis'
     state: present
-    group: 'dgrig'
+    group: 'tsironis'
     groups: ['admins']
     append: True
     gid: 1005
     uid: 1005
     shell: '/usr/bin/zsh'
     openbsdshell: '/usr/local/bin/zsh'
-    sshkeys: [ 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDb/e7O6zcnEhaGz2JyzWCP7rWCCO0ZWwZvHeSYtQ6D384ZssDFupvoEIhVvPnuYbl3/jzXN69D/gm2w95hv82swUOvSbOhxhqga5HEZh5doC2RjAIchOaAqSOKPKQfaSZroZ+l+eUtcm8I4L6+xdUtSMaNndHQwWa2mllhZ21jrF6msublVuvy/ATjwHLdLd1MAORoYXKja84cejj0cQdVbyv36vqQmBeuU87//4mw45/IIpef3t6UjGjTAyUVGih2LQdX0Y4rghFwt1pc1x4oQxp4hThCQFYikTUtAw1CLFRjfnaU1KyCTc9akV6rf0NowChsENj1TvczTQg9tjlHA28rhpP6W2gN9buHzU/tG13pkBC/0PLmUtN7U95nAPNEYbjxQAbGKU9/lWICU0EEYoHFb+qhRiCdM0fek/9jj0F84ur4yWDQ9xtJKAg/mtNF3VyFbV86pmXnlTVdCzeW8eIU6BHOtc29i5BIXPUp9A2jELSY3FraTF2a7c2WCO6L43sJRwKl6U78QGpSHXSUN+fJIgK1MrvjEtoKRKHMeVdTtkqhabQqySaDl92PH6cVFHrLMhCB0YG5HFdsWoS+KxrRpCA4y9709+tNq5ulqgw/eD7RPbDP1SmHOEHSowF3A8DhfL3Sw1xoHQsr+/ghUFWvoylr+knDf+/PM0UCbw==' ]
-    forward: [ '[email protected]' ]
+    sshkeys: [ 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIuwVLDASGrbHpw49LWj4hIwG2SCiaYaUVxqyzIk5LU0pmzfLSPfbwhs88IKqtz3V2TopqdlveLhLSeSlwIsyd+XddsvFmcwOojxzdD508DahVnrb/twCQQ2eU/Y9achNqUjjz2aqG/xfxPzCUn5NeZSb84gXxe3jRqN0dZc+TS5i6hsGGYwrZER9tjeXYuRD9867+rvUDJ8XybwQ9UG6yDc6fDyri5AoJcWYZ/YYXPM1qswTgpcwY6vktSDShgb4ORvOROEOoa9N+h1G9zu4bEz/egq+brZ/beRbtHTxsMD4bHD3vdad6eXRDLZU74xFq84WydcBuonYIfqWZGQFuoszjtWxxaShi4qswLExEMnNZmIGNJgI4myTitihj4avllleDM0kVkpcrWI0/lsUy/a8HLpURijzzfRhusxRevTijtb9dMvPNPb+YsKs/G44OvLxKAuf8ZyfL+Zdnu/oJkJCblSjPYKV77KV8vUE8Z6BMcMxhMPrs4e5N+qJbPxwxLq8/quFFLZnpXlTaDDa3JONJ7r60TGhXIIAjEYcx3uw3lYIk0T01wdRQKhuKt0yNHT2u2cYkb21eEKpCvC6U6a6fvU7JrMO0iYRC5RE+KCgiggcoYPvak62BFiHLUB5yw6wEPQ9wb1p+shnPkBDPsOilDafEB8/XifSL7r83Mw== [email protected]' ]
diff --git a/ansible/inventory/group_vars/etherpad/all.yml b/ansible/inventory/group_vars/etherpad/all.yml
diff --git a/ansible/inventory/group_vars/f.erethon.com/all.yml b/ansible/inventory/group_vars/f.erethon.com/all.yml
diff --git a/ansible/inventory/group_vars/openbsd/all.yml b/ansible/inventory/group_vars/openbsd/all.yml
diff --git a/ansible/inventory/group_vars/plothopes/all.yml b/ansible/inventory/group_vars/plothopes/all.yml
diff --git a/ansible/inventory/group_vars/xmpp/ferm.yml b/ansible/inventory/group_vars/xmpp/ferm.yml
diff --git a/...nventory/host_vars/spinny/apt_install.yml → ...ventory/host_vars/anduril/apt_install.yml b/...nventory/host_vars/spinny/apt_install.yml → ...ventory/host_vars/anduril/apt_install.yml
diff --git a/ansible/inventory/host_vars/spinny/cron.yml → ansible/inventory/host_vars/anduril/cron.yml b/ansible/inventory/host_vars/spinny/cron.yml → ansible/inventory/host_vars/anduril/cron.yml
diff --git a/ansible/inventory/host_vars/spinny/ferm.yml → ansible/inventory/host_vars/anduril/ferm.yml b/ansible/inventory/host_vars/spinny/ferm.yml → ansible/inventory/host_vars/anduril/ferm.yml
diff --git a/ansible/inventory/host_vars/anduril/haproxy.yml b/ansible/inventory/host_vars/anduril/haproxy.yml
@@ -0,0 +1,2 @@
+---
+certs__names: ['grafana.dtsironis.net', 'capitalism.dtsironis.net', 'dtsironis.net',]
diff --git a/...inventory/host_vars/spinny/monitoring.yml → ...nventory/host_vars/anduril/monitoring.yml b/...inventory/host_vars/spinny/monitoring.yml → ...nventory/host_vars/anduril/monitoring.yml
diff --git a/ansible/inventory/host_vars/archiver/users.yml b/ansible/inventory/host_vars/archiver/users.yml
diff --git a/ansible/inventory/host_vars/spinny/haproxy.yml b/ansible/inventory/host_vars/spinny/haproxy.yml
diff --git a/ansible/playbooks/base_openbsd.yml b/ansible/playbooks/base_openbsd.yml
diff --git a/ansible/playbooks/etherpad.erethon.yml b/ansible/playbooks/etherpad.erethon.yml
diff --git a/ansible/playbooks/plothopes.com b/ansible/playbooks/plothopes.com
diff --git a/ansible/playbooks/prosody.yml b/ansible/playbooks/prosody.yml
diff --git a/ansible/playbooks/webd.yml b/ansible/playbooks/webd.yml
@@ -4,4 +4,4 @@
 
   roles:
 
-    - role: static.erethon.com
+    - role: static.dtsironis.net
diff --git a/ansible/roles/chat.erethon.com/tasks/main.yml b/ansible/roles/chat.erethon.com/tasks/main.yml
diff --git a/ansible/roles/etherpad.erethon.com/tasks/main.yml b/ansible/roles/etherpad.erethon.com/tasks/main.yml
diff --git a/ansible/roles/f.erethon.com/tasks/main.yml b/ansible/roles/f.erethon.com/tasks/main.yml
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -28,18 +28,6 @@ defaults
     errorfile 503 /etc/haproxy/errors/503.http
     errorfile 504 /etc/haproxy/errors/504.http
 
-userlist buildbotusers
-    user {{ buildbot__username }} password {{ buildbot__password }}
-
-frontend prosody_muc
-    bind {{ prosody__public_ip }}:5269
-    mode tcp
-    default_backend prosody_muc
-
-backend prosody_muc
-    mode tcp
-    server prosody_muc {{ prosody__private_ip }}:5269
-
 frontend eighty
     bind *:80
     mode http
@@ -52,34 +40,18 @@ frontend ssl
     http-request set-header X-Forwarded-Proto https if { ssl_fc }
 
     use_backend local if { url_beg /.well-known }
-    use_backend plothopes if { hdr(host) -i plothopes.com -i www.plothopes.com }
-    use_backend f.erethon.com if { hdr(host) -i f.erethon.com }
-    use_backend grafana.erethon.com if { hdr(host) -i grafana.erethon.com }
-    use_backend static if { hdr(host) -i capitalism.erethon.com -i hacked.erethon.com -i erethon.com -i www.erethon.com -i blog.erethon.com -i about.erethon.com -i git.erethon.com }
-    use_backend buildbot if { hdr(host) -i buildbot.erethon.com }
-
-backend plothopes
-    mode http
-    server plothopes {{ plothopes__private_ip }}:{{ plothopes__port }} 
+    use_backend grafana.dtsironis.net if { hdr(host) -i grafana.dtsironis.net }
+    use_backend static if { hdr(host) -i capitalism.dtsironis.net -i hacked.dtsironis.net -i dtsironis.net -i www.dtsironis.net }
+    use_backend buildbot if { hdr(host) -i buildbot.dtsironis.net }
 
-backend f.erethon.com
+backend grafana.dtsironis.net
     mode http
-    server f.erethon.com {{ files__private_ip }}:{{ files__port }} 
-
-backend grafana.erethon.com
-    mode http
-    server grafana.erethon.com {{ grafana__private_ip }}:{{ grafana__port }} 
+    server grafana.dtsironis.net {{ grafana__private_ip }}:{{ grafana__port }} 
 
 backend static
     mode http
     server webd {{ static__private_ip }}:80
 
-backend buildbot
-    mode http
-    acl authbuildbotusers http_auth(buildbotusers)
-    http-request auth realm buildbotrealm if !authbuildbotusers
-    server obsd001 {{ buildbot__private_ip }}:8010
-
 backend local
     mode http
     server local 127.0.0.1:8080
diff --git a/ansible/roles/laptop/files/etc/pf.conf b/ansible/roles/laptop/files/etc/pf.conf
diff --git a/ansible/roles/laptop/files/etc/rc.conf.local.gitignore b/ansible/roles/laptop/files/etc/rc.conf.local.gitignore
diff --git a/ansible/roles/openbsd/files/installurl b/ansible/roles/openbsd/files/installurl
diff --git a/ansible/roles/openbsd/tasks/main.yml b/ansible/roles/openbsd/tasks/main.yml
diff --git a/ansible/roles/plothopes.com/tasks/main.yml b/ansible/roles/plothopes.com/tasks/main.yml
diff --git a/...roles/static.erethon.com/files/httpd.conf → ...les/static.dtsironis.net/files/httpd.conf b/...roles/static.erethon.com/files/httpd.conf → ...les/static.dtsironis.net/files/httpd.conf
diff --git a/ansible/roles/static.dtsironis.net/files/httpd/capitalism.conf b/ansible/roles/static.dtsironis.net/files/httpd/capitalism.conf
@@ -0,0 +1,4 @@
+server "capitalism.dtsironis.net" {
+        listen on * port 80
+        root "/htdocs/capitalism.dtsironis.net"
+}
diff --git a/ansible/roles/static.dtsironis.net/files/httpd/dtsironis.conf b/ansible/roles/static.dtsironis.net/files/httpd/dtsironis.conf
@@ -0,0 +1,5 @@
+server "dtsironis.net" {
+        alias "www.dtsironis.net"
+        listen on * port 80
+        root "/htdocs/dtsironis.net"
+}
diff --git a/ansible/roles/static.dtsironis.net/files/httpd/hacked.conf b/ansible/roles/static.dtsironis.net/files/httpd/hacked.conf
@@ -0,0 +1,4 @@
+server "hacked.dtsironis.net" {
+        listen on * port 80
+        root "/htdocs/hacked.dtsironis.net"
+}
diff --git a/...oles/static.erethon.com/handlers/main.yml → ...es/static.dtsironis.net/handlers/main.yml b/...oles/static.erethon.com/handlers/main.yml → ...es/static.dtsironis.net/handlers/main.yml