From 11923c757504d87f31d88432a8a89707f9ccf59c Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Wed, 20 May 2020 11:02:07 -0500
Subject: [PATCH] Move variables out of playbook Where possible, of course

---
 ec2.yml            | 71 ++++-----------------------------------------
 group_vars/all.yml | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 65 deletions(-)
 create mode 100644 group_vars/all.yml

diff --git a/ec2.yml b/ec2.yml
index 606f5bd..cb7dffb 100644
--- a/ec2.yml
+++ b/ec2.yml
@@ -7,59 +7,19 @@
     - user
     - influxdb
 - hosts: tag_www_true
-  vars:
-    mysql_root_password: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          62316565376333396465333931356163343363663063636233653536373033396230626639613964
-          3037613839373833646234626236643430393364643131610a333539373533663434373935376130
-          65323365313465316635646465376665616132653832316362363535366563363863636530313666
-          3036393134386131310a643734363261633166636263343538313533393738323934303137343163
-          39636637643035616236663364663562366133613233313139623937313531343564
-    acme_directory: "https://acme-v02.api.letsencrypt.org/directory"
-    #acme_directory: "https://acme-staging-v02.api.letsencrypt.org/directory"
-    acme_version: 2
-    acme_webroot: "/var/www/acme"
   roles:
     - role: backups
       vars:
         backups_outdir: "/cold/backups"
       tags: [ backups ]
-    - role: grafana
-      vars:
-        grafana_mysql_password: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          65376335363732633132326630323161393861323833323631613630343262383137656138356262
-          3730386139393739373738626535376636666135646463350a623331333032346434343465666234
-          38393539623437376133363063633238383031326431653737346564323837343265653431633962
-          6665346237666165330a643635653863356633623535383063366632336437313730626233346664
-          33303465616532313339393634386166363162393661393037323835323035386663
-        grafana_url: "monitor.9iron.club"
-        grafana_webroot: "/var/www/grafana"
-      tags: [ web, grafana ]
+    - role: dokuwiki
+      tags: [ web, dokuwiki ]
     - role: gitea
-      vars: 
-        gitea_mysql_password: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          62353264353465316661353738666161313036373761666163663733656461316536636334386335
-          6161386630663739363439383237343065333239613134610a383036373735326536386464343164
-          31346337636665356630336234306534646362386663633734353166373761316139313734306630
-          3364306566323666310a323034303434613237643665643637633430353437316339356463646331
-          33353062343164396465326365653561626363343961326363633231303736316436643935646161
-          3933353234613430373930663832643934613233383635613433
-        gitea_app_name: "9iron Gitea"
-        gitea_root_directory: "/cold/gitea-repositories/"
-        gitea_url: "git.9iron.club"
-        gitea_webroot: "/var/www/gitea"
-        gitea_admin_username: "salt"
-        gitea_admin_email: "rehashedsalt@cock.li"
-        gitea_admin_password: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          35613039646236306236363930353231303331633765303039373736626666666530323433356466
-          3062633166313332643039613561303431613735396339650a376664373137643439303465376365
-          35313266376539366134343562626164616666306338343538663361393964626565303331383234
-          3565646664333966650a323530356664366262653763363439613534303764366436376634373639
-          62303264653836656162366362316461656363353539343632616462626231643632
       tags: [ web, gitea ]
+    - role: grafana
+      tags: [ web, grafana ]
+    - role: nextcloud
+      tags: [ web, nextcloud ]
     - role: redirect
       vars:
         redirect_from: "9iron.club"
@@ -72,25 +32,6 @@
         gitweb_url: "www.9iron.club"
         gitweb_webroot: "/var/www/www"
       tags: [ web, webroot ]
-    - role: dokuwiki
-      vars:
-        dokuwiki_tgz: "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz"
-        dokuwiki_url: "wiki.9iron.club"
-        dokuwiki_webroot: "/var/www/dokuwiki"
-      tags: [ web, dokuwiki ]
-    - role: nextcloud
-      vars:
-        nextcloud_mysql_password: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          37633035633563646266346264333636393931323664313166633133653461646333643731636661
-          3966666665396239346662613764353333393038663762340a313236396331623061376462356437
-          66373234633939393034353439393465663131303661393164303335336435653734613064663964
-          3332313764623133630a393731613236373837316437653265636663666261383135636662373566
-          61373135303632336237333836353764646639633735323566346366623766646266
-        nextcloud_tarbz2: "https://download.nextcloud.com/server/releases/nextcloud-18.0.0.tar.bz2"
-        nextcloud_url: "nc.9iron.club"
-        nextcloud_webroot: "/var/www/nextcloud"
-      tags: [ web, nextcloud ]
 - hosts: tag_terraria_vanilla
   roles:
     - role: terraria
diff --git a/group_vars/all.yml b/group_vars/all.yml
new file mode 100644
index 0000000..efcae95
--- /dev/null
+++ b/group_vars/all.yml
@@ -0,0 +1,72 @@
+#!/usr/bin/ansible-playbook
+# vim:ft=ansible:
+
+## BACKEND
+# ACME endpoint
+# Switch me around if you're going to be doing testing!
+# Otherwise you WILL get ratelimited!
+acme_directory: "https://acme-v02.api.letsencrypt.org/directory"
+#acme_directory: "https://acme-staging-v02.api.letsencrypt.org/directory"
+acme_version: 2
+acme_webroot: "/var/www/acme"
+
+# MySQL
+mysql_root_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          62316565376333396465333931356163343363663063636233653536373033396230626639613964
+          3037613839373833646234626236643430393364643131610a333539373533663434373935376130
+          65323365313465316635646465376665616132653832316362363535366563363863636530313666
+          3036393134386131310a643734363261633166636263343538313533393738323934303137343163
+          39636637643035616236663364663562366133613233313139623937313531343564
+
+## WEBAPPS
+# Dokuwiki
+dokuwiki_tgz: "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz"
+dokuwiki_url: "wiki.9iron.club"
+dokuwiki_webroot: "/var/www/dokuwiki"
+
+# Gitea
+gitea_mysql_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          62353264353465316661353738666161313036373761666163663733656461316536636334386335
+          6161386630663739363439383237343065333239613134610a383036373735326536386464343164
+          31346337636665356630336234306534646362386663633734353166373761316139313734306630
+          3364306566323666310a323034303434613237643665643637633430353437316339356463646331
+          33353062343164396465326365653561626363343961326363633231303736316436643935646161
+          3933353234613430373930663832643934613233383635613433
+gitea_app_name: "9iron Gitea"
+gitea_root_directory: "/cold/gitea-repositories/"
+gitea_url: "git.9iron.club"
+gitea_webroot: "/var/www/gitea"
+gitea_admin_username: "salt"
+gitea_admin_email: "rehashedsalt@cock.li"
+gitea_admin_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          35613039646236306236363930353231303331633765303039373736626666666530323433356466
+          3062633166313332643039613561303431613735396339650a376664373137643439303465376365
+          35313266376539366134343562626164616666306338343538663361393964626565303331383234
+          3565646664333966650a323530356664366262653763363439613534303764366436376634373639
+          62303264653836656162366362316461656363353539343632616462626231643632
+
+# Grafana
+grafana_mysql_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          65376335363732633132326630323161393861323833323631613630343262383137656138356262
+          3730386139393739373738626535376636666135646463350a623331333032346434343465666234
+          38393539623437376133363063633238383031326431653737346564323837343265653431633962
+          6665346237666165330a643635653863356633623535383063366632336437313730626233346664
+          33303465616532313339393634386166363162393661393037323835323035386663
+grafana_url: "monitor.9iron.club"
+grafana_webroot: "/var/www/grafana"
+
+# Nextcloud
+nextcloud_mysql_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          37633035633563646266346264333636393931323664313166633133653461646333643731636661
+          3966666665396239346662613764353333393038663762340a313236396331623061376462356437
+          66373234633939393034353439393465663131303661393164303335336435653734613064663964
+          3332313764623133630a393731613236373837316437653265636663666261383135636662373566
+          61373135303632336237333836353764646639633735323566346366623766646266
+nextcloud_tarbz2: "https://download.nextcloud.com/server/releases/nextcloud-18.0.0.tar.bz2"
+nextcloud_url: "nc.9iron.club"
+nextcloud_webroot: "/var/www/nextcloud"