Remove deploy script, plonk it all in configs where it should be

9iron-deploy.sh

@@ -1,2 +0,0 @@
-#! /bin/sh
-ansible-playbook 9iron.yml --ask-vault-pass "$@"

ansible.cfg

@@ -6,5 +6,6 @@ ssh_extra_args =-o ForwardAgent=yes -o StrictHostKeyChecking=no
 host_key_checking = false
 deprecation_warnings = false
 ask_become_pass = true
+ask_vault_pass = true
 pipelining = true
 interpreter_python = python3

ansiblehosts.yml

@@ -0,0 +1,7 @@
+#!/usr/bin/env ansible-playbook
+# vim:ft=ansible:
+---
+- hosts: ansiblehosts
+  roles:
+    - role: ansiblehost
+      tags: [ ansiblehost ]

gameservers.yml

@@ -0,0 +1,35 @@
+#!/usr/bin/env ansible-playbook
+# vim:ft=ansible:
+---
+- hosts: terraria.9iron.club
+  roles:
+    - role: terraria
+      vars:
+        terraria_name: "1401-main"
+        terraria_password: "dicks"
+        terraria_worldsize: 3
+        terraria_motd: "New major release edition"
+        terraria_worldname: "The Home Base"
+        terraria_port: 7777
+        terraria_difficulty: 0
+      tags: [ gameserver, terraria ]
+    - role: terraria
+      vars:
+        terraria_name: "1401-farm-normal1"
+        terraria_password: "dicks"
+        terraria_worldsize: 3
+        terraria_motd: "New major release edition"
+        terraria_worldname: "Farman - Normal 1"
+        terraria_port: 7778
+        terraria_difficulty: 0
+      tags: [ gameserver, terraria ]
+    - role: terraria
+      vars:
+        terraria_name: "1401-farm-master1"
+        terraria_password: "dicks"
+        terraria_worldsize: 3
+        terraria_motd: "New major release edition"
+        terraria_worldname: "Farman - Master 1"
+        terraria_port: 7779
+        terraria_difficulty: 3
+      tags: [ gameserver, terraria ]

site.yml

@@ -0,0 +1,11 @@
+#!/usr/bin/env ansible-playbook
+# vim:ft=ansible:
+---
+- hosts: all
+  roles:
+    - common
+    - user
+    - influxdb
+- import_playbook: webservers.yml
+- import_playbook: gameservers.yml
+- import_playbook: ansiblehosts.yml

webservers.yml

@@ -0,0 +1,29 @@
+#!/usr/bin/env ansible-playbook
+# vim:ft=ansible:
+---
+- hosts: 9iron.club
+  roles:
+    - role: backups
+      vars:
+        backups_outdir: "/cold/backups"
+      tags: [ backups ]
+    - role: dokuwiki
+      tags: [ web, dokuwiki ]
+    - role: gitea
+      tags: [ web, gitea ]
+    - role: grafana
+      tags: [ web, grafana ]
+    - role: nextcloud
+      tags: [ web, nextcloud ]
+    - role: redirect
+      vars:
+        redirect_from: "9iron.club"
+        redirect_to: "www.9iron.club"
+        redirect_webroot: "/var/www/redirect"
+      tags: [ web, redirect ]
+    - role: gitweb
+      vars:
+        gitweb_repo: "https://git.9iron.club/salt/www"
+        gitweb_url: "www.9iron.club"
+        gitweb_webroot: "/var/www/www"
+      tags: [ web, webroot ]