Merge branch 'master' of zeus.thrace-lan.info:Thrace-lan.info/ansible

ansible.cfg

@@ -1,3 +1,5 @@
 [defaults]
 host_key_checking = False
 enable_plugins = community.digitalocean.digitalocean
+private_key_file = ~/.ssh/id_rsa
+inventory = /etc/ansible/hosts 

hosts

@@ -2,10 +2,10 @@ athena	ansible_host=167.71.188.165
 Zeus	ansible_host=68.183.50.72
 Hades	ansible_host=104.131.0.100
 Atreyu	ansible_host=159.65.178.119
-mpdf1	ansible_host=157.245.126.201
-mpdf2	ansible_host=68.183.151.54
-mpdb1	ansible_host=157.245.116.105
-mpdb2	ansible_host=159.65.241.29
+mpdf1	ansible_host=159.203.118.212
+mpdf2	ansible_host=45.55.57.172
+mpdb1	ansible_host=142.93.181.29
+mpdb2	ansible_host=134.209.37.25
 
 [ams1]
 
@@ -43,42 +43,31 @@ mpdb2
 
 [tor1]
 
-[Git]
-Zeus
-
-[www_apache]
-Zeus
-
-[controller]
-Atreyu
-
-[mpdf]
-mpdf1
-mpdf2
+[salt_minon]
+Hades
 
 [mpdb]
 mpdb1
 mpdb2
 
-[matrix]
+[consul]
 athena
+Hades
 
-[synapse]
+[prometheus]
 athena
 
-[salt_minion]
+[matrix]
+athena
+
+[synapse]
 athena
-Zeus
 
 [Saltmaster]
 Zeus
 
-[consul]
-athena
-Hades
-
-[prometheus]
-athena
+[nextcloud]
+Zeus
 
 [alertmanager]
 athena
@@ -91,11 +80,22 @@ mpdf2
 mpdb1
 mpdb2
 
-[nextcloud]
+[www_apache]
 Zeus
 
-[salt_minon]
-Hades
+[controller]
+Atreyu
+
+[mpdf]
+mpdf1
+mpdf2
+
+[salt_minion]
+athena
+Zeus
+
+[Git]
+Zeus
 
 [Thrace_Test]
 mpdb2