nits

10 files changed, 57 insertions, 12 deletions

diff --git a/ansible/all.yml b/ansible/all.yml
index 3103f3b..90cdef8 100644
--- a/ansible/all.yml
+++ b/ansible/all.yml
@@ -17,8 +17,7 @@
     - postfix-satellite
 
 - hosts:
-    - desktops
-    - sbcs
+    - linode-dns-update
   roles:
     - linode-dns-update
 
diff --git a/ansible/group_vars/all/users.yml b/ansible/group_vars/all/users.yml
index a2a59d3..85fed2e 100644
--- a/ansible/group_vars/all/users.yml
+++ b/ansible/group_vars/all/users.yml
@@ -5,3 +5,10 @@ users:
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJAzB6JB/hZ87M6ozsd7lgKxgOacEOZZRxa4ucs11lqq trygvis@conflatorio
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFMRccGxF1l7xIUavu5vDqypCe/aon3+bdFgEhPa7pPb trygvis@arius-v3
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/Xrsk69KhaXdHPcbBoCbqlQ2DXmx77OnkLAk22ui5m trygvis@malabaricus
+      ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKXVnzqo+JTVNrt3p0LGeH59DPMc9WkVMXO3wpAyTH6 trygvis@akili
+
+lusers:
+  - trygvis
+
+superusers:
+  - trygvis
diff --git a/ansible/group_vars/modern1/lusers.yml b/ansible/group_vars/modern1/lusers.yml
new file mode 100644
index 0000000..0f06078
--- /dev/null
+++ b/ansible/group_vars/modern1/lusers.yml
@@ -0,0 +1 @@
+lusers_authorized_keys_exclusive: yes
diff --git a/ansible/host_vars/homepi/postfix.yml b/ansible/host_vars/homepi/postfix.yml
new file mode 100644
index 0000000..8174c21
--- /dev/null
+++ b/ansible/host_vars/homepi/postfix.yml
@@ -0,0 +1,11 @@
+$ANSIBLE_VAULT;1.1;AES256
+64323965303364363764646134636130303735346263363936313963353339336562363730343761
+3635383339366534326361303837366166303966316438660a656231373535663861663931303761
+30356365396133383639393735306439333833396330653937363461383465646232363135383634
+3564303065383162310a326335396161636664636264656536366264363130393234326438666566
+64313539353763623664623861383735613439336537636532323133313932333135616336353465
+66623261316334613938373437636537386536613931323261636136666662663566343535316638
+30353864383538383534366634633939356564616263663663393464343366313466633666623337
+34333564353662386161333161303764303062326534363430636333633230343231396433333566
+64623139373432616531626337383863626366353336636135633664366162386265396135383962
+6166663564323962333736333561343464333339663031633562
diff --git a/ansible/host_vars/mw/users.yml b/ansible/host_vars/homepi/users.yml
index d0d4852..d0d4852 100644
--- a/ansible/host_vars/mw/users.yml
+++ b/ansible/host_vars/homepi/users.yml
diff --git a/ansible/host_vars/malabaricus/linode-dns.yml b/ansible/host_vars/malabaricus/linode-dns.yml
new file mode 100644
index 0000000..516181f
--- /dev/null
+++ b/ansible/host_vars/malabaricus/linode-dns.yml
@@ -0,0 +1,7 @@
+$ANSIBLE_VAULT;1.1;AES256
+32353664356630643661616530343130393864323065613334316231363632633162666361636437
+3332303262346531373036373066373837383431646533640a386331363261396531313562623431
+34373137626463383165363937346363663063393530323062646330393033393031643735303534
+3364616661373361330a353365353532633465636339316233623063363762666162386235626534
+36383039646233386664386665626535613462313466666361323337353264636137386532333937
+3330636639393730623436326637343962666334656539663732
diff --git a/ansible/host_vars/malabaricus/postfix.yml b/ansible/host_vars/malabaricus/postfix.yml
new file mode 100644
index 0000000..a78e062
--- /dev/null
+++ b/ansible/host_vars/malabaricus/postfix.yml
@@ -0,0 +1,11 @@
+$ANSIBLE_VAULT;1.1;AES256
+62376638333038663363323337633031383533623661393361623265353762646633396234343038
+3465373234366261363965623166353662303366303463360a393937393333373631366263663234
+36303863613734393238343837383230393730646331303037316438353932666434383332653130
+6566346565376561630a623662653730633239376136326137653764393734656339626466363131
+37376130306364663961376637656366636139666365343132353331633138636339323938383664
+65326537323232366635613965653135393538623363346137636265643337633839316237666131
+32316339353736616439306531376466383935313032333238373637373031303465623038376238
+65356263666263636134646164626136326635623736646635326161663833613534316139636534
+65326663356139343330396635396134666362333531303635613735353534306562373333623165
+3938616134376462336131323934373538336132313036633063
diff --git a/ansible/host_vars/nextcloud/postfix.yml b/ansible/host_vars/nextcloud/postfix.yml
index 83974e9..407e74e 100644
--- a/ansible/host_vars/nextcloud/postfix.yml
+++ b/ansible/host_vars/nextcloud/postfix.yml
@@ -1,5 +1,11 @@
-postfix:
-  sasl_password:
-    - host: "[trygvis.io]:587"
-      username: nextcloud.trygvis.io
-      password: gWC8uPCT90
+$ANSIBLE_VAULT;1.1;AES256
+32323437616164363239363936343562303632323930386362386631636361383636666464636261
+6532633233656566376239663935333434653961646263320a316666626362623831336230613630
+31366666646437363435316136613964653234336664316262666239613333633635626261323033
+3934663237616133350a663139623661613933633765353033383733303737656264616234326665
+39623965386139643333306166323238333965616466393363363339363165393661663435316362
+34353435396531303633323536623064326438373462393134393631363930643633373038346634
+32663537663564383936663932643535643833316338646130636438633732323633396539636436
+63663739386665313361613965326635333135626338346561376133303932383934376162303537
+62656563313162356137653534373232363963373532336164386232306561656165313634363338
+6363386664313566636537353036646161643638363831386336
diff --git a/ansible/host_vars/nextcloud/users.yml b/ansible/host_vars/nextcloud/users.yml
deleted file mode 100644
index d0d4852..0000000
--- a/ansible/host_vars/nextcloud/users.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-lusers:
-  - trygvis
-
-superusers:
-  - trygvis
diff --git a/ansible/inventory b/ansible/inventory
index 4c99672..ebf9485 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -38,6 +38,14 @@ all:
       hosts:
         birgitte:
 #        knot:
+    linode-dns-update:
+      hosts:
+        akysis:
+        arius:
+        birgitte:
+        conflatorio:
+        homepi:
+        malabaricus:
     vm:
       hosts:
         mw: