update--

group_vars/all/main.yml

@@ -1978,26 +1978,18 @@ root_ssh_keypair: []
 default_user:
 
   - name: chris
-    password: $y$j9T$t0OK33lTuB/3TME5h/GHn.$4EjhvjhelkpUB2vqWPBdDCV3xCwBcJHpDobTkkuHxy.
+    password: $6$bSHlaLHC$URSMVq090e/cJ1v55Jh9ws0w5WekhO7X3Y0RqryAl5R76K9khWBegC76Smjastja.xMiD57/LzUUXW7y9NvAL.
     shell: /bin/bash
     ssh_keys:
       - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
       - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
 
   - name: sysadm
+
     user_id: 1050
     group_id: 1050
     group: sysadm
-    password: $y$j9T$LIF1RrShGDGdCXkUubRPR/$N8M5c/dhBdJkJrLP3/Lchyosjg0FxaQ2M4epvuzTI78
-    shell: /bin/bash
-    ssh_keys:
-      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
-      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
-
-  - name: localadmin
-    user_id: 1051
-    group_id: 1051
-    password: $y$j9T$bqr.c39mSZOjjhVo/qmM2.$riPJ81SHLqfJMQ6/ZdeWNP7ma8R5nehI9mo5K8oUkw1
+    password: $6$EEVWxA5E$bNxU8EOp/tTcYVghFharUM10k3vRt2siEnIiiznfGmhMSM6zJTP0umdxql9VVEj856oKa.Sp.q3N2nthgNMeN1
     shell: /bin/bash
     ssh_keys:
       - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
@@ -2007,25 +1999,10 @@ default_user:
     user_id: 1060
     group_id: 1060
     group: back
-    password: $y$j9T$uYqbl2A6vQ6WsLinzhUfG0$/w02iPud/LURbhY19DGtKWgKNFTpNEP7J.jOu5CZPh.
+    password: $6$GntX81EP$O1GEmQF.BbOQfTMMw/m/BDKSXmANVpqmz0nyzw4O4R2/iK9huGOAjT/2eq8FVdMghvNOvdwrWtwohO.Mg4V9n.
     shell: /bin/bash
     ssh_keys:
       - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
-      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
-      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMvy+IDUeoVwLg+cJNcKzls5guOrVUretsf05v3Y2N+Y root@default-oopen-server'
-      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcEPd+MDJKzWqWStt3XpJU1OpJ0uxmipacIGkm6k3MS root@default-warenform-server'
-      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ/eGKbdxPYu7L/b/DjZrWek50e0AnkHFZS+zV12o5jy root@borg-client-key-warenform'
-      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6Sra1D8JU2A68G4rSny7D0ukYKy89NVMXbdxrtdZwr root@borg-client-key-oopen'
-
-  - name: borg
-    user_id: 1065
-    group_id: 1065
-    group: borg
-    password: $y$j9T$JPKlR6kIk7GJStSdmAQWq/$e1vJER6KL/dk1diFNtC.COw9lu2uT6ZdrUgGcNVb912
-    shell: /bin/bash
-    ssh_keys:
-      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
-      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
 
 extra_user: []
 

group_vars/oopen_office.yml

@@ -73,7 +73,6 @@ default_user:
     password: $6$GntX81EP$O1GEmQF.BbOQfTMMw/m/BDKSXmANVpqmz0nyzw4O4R2/iK9huGOAjT/2eq8FVdMghvNOvdwrWtwohO.Mg4V9n.
     shell: /bin/bash
     ssh_keys:
-      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
       - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
       - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
 

group_vars/oopen_server.yml

@@ -48,21 +48,30 @@ ssh_keypair_backup_client:
     target: backup.oopen.de
 
 
+
 default_user:
 
   - name: chris
-    password: $6$bSHlaLHC$URSMVq090e/cJ1v55Jh9ws0w5WekhO7X3Y0RqryAl5R76K9khWBegC76Smjastja.xMiD57/LzUUXW7y9NvAL.
+    password: $y$j9T$t0OK33lTuB/3TME5h/GHn.$4EjhvjhelkpUB2vqWPBdDCV3xCwBcJHpDobTkkuHxy.
     shell: /bin/bash
     ssh_keys:
       - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
       - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
 
   - name: sysadm
-
     user_id: 1050
     group_id: 1050
     group: sysadm
-    password: $6$EEVWxA5E$bNxU8EOp/tTcYVghFharUM10k3vRt2siEnIiiznfGmhMSM6zJTP0umdxql9VVEj856oKa.Sp.q3N2nthgNMeN1
+    password: $y$j9T$LIF1RrShGDGdCXkUubRPR/$N8M5c/dhBdJkJrLP3/Lchyosjg0FxaQ2M4epvuzTI78
+    shell: /bin/bash
+    ssh_keys:
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
+
+  - name: localadmin
+    user_id: 1051
+    group_id: 1051
+    password: $y$j9T$bqr.c39mSZOjjhVo/qmM2.$riPJ81SHLqfJMQ6/ZdeWNP7ma8R5nehI9mo5K8oUkw1
     shell: /bin/bash
     ssh_keys:
       - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
@@ -72,10 +81,15 @@ default_user:
     user_id: 1060
     group_id: 1060
     group: back
-    password: $6$GntX81EP$O1GEmQF.BbOQfTMMw/m/BDKSXmANVpqmz0nyzw4O4R2/iK9huGOAjT/2eq8FVdMghvNOvdwrWtwohO.Mg4V9n.
+    password: $y$j9T$uYqbl2A6vQ6WsLinzhUfG0$/w02iPud/LURbhY19DGtKWgKNFTpNEP7J.jOu5CZPh.
     shell: /bin/bash
     ssh_keys:
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol'
       - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol'
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMvy+IDUeoVwLg+cJNcKzls5guOrVUretsf05v3Y2N+Y root@default-oopen-server'
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcEPd+MDJKzWqWStt3XpJU1OpJ0uxmipacIGkm6k3MS root@default-warenform-server'
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ/eGKbdxPYu7L/b/DjZrWek50e0AnkHFZS+zV12o5jy root@borg-client-key-warenform'
+      - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6Sra1D8JU2A68G4rSny7D0ukYKy89NVMXbdxrtdZwr root@borg-client-key-oopen'
 
 
 sudo_users:

host_vars/backup.oopen.de.yml

@@ -22,6 +22,11 @@ root_ssh_keypair:
     priv_key_dest: /root/.ssh/id_ed25519-borg-backup
     pub_key_src: backup.oopen.de/root/.ssh/id_ed25519-borg-backup.pub
     pub_key_dest: /root/.ssh/id_ed25519-borg-backup.pub
+  - name: id_rsa
+    priv_key_src: backup.oopen.de/root/.ssh/id_rsa
+    priv_key_dest: /root/.ssh/id_rsa
+    pub_key_src: backup.oopen.de/root/.ssh/id_rsa.pub
+    pub_key_dest: /root/.ssh/id_rsa.pub
 
 
 # ---

hosts

@@ -31,7 +31,6 @@ dns1.warenform.de
 
 
 [extra_hosts]
-backup.oopen.de
 
 devel-root.wf.netz
 
@@ -138,7 +137,9 @@ test.mx.oopen.de
 
 # Backup Server O.OPEN
 o19.oopen.de
-37.27.121.218
+backup.oopen.de
+git.oopen.de
+munin.oopen.de
 
 o20.oopen.de
 
@@ -179,8 +180,6 @@ o26.oopen.de
 
 # - o29.oopen.de Backup Server
 o29.oopen.de
-backup.oopen.de
-git.oopen.de
 
 # AK - Server Nextcloud/Jitsi Meet
 o30.oopen.de
@@ -329,7 +328,9 @@ test.mariadb.oopen.de
 
 # Backup Server O.OPEN
 o19.oopen.de
-37.27.121.218
+backup.oopen.de
+git.oopen.de
+munin.oopen.de
 
 # - o20.oopen.de (srv-cityslang.cityslang.com)
 o20.oopen.de
@@ -374,9 +375,6 @@ o26.oopen.de
 
 # - o29.oopen.de
 o29.oopen.de
-backup.oopen.de
-git.oopen.de
-munin.oopen.de
 
 # AK - Server Nextcloud/Jitsi Meet
 o30.oopen.de
@@ -625,11 +623,8 @@ test.mariadb.oopen.de
 test.mx.oopen.de
 
 # o19.oopen.de
-37.27.121.218
-munin.oopen.de
-
-# o29.oopen.de
 backup.oopen.de
+munin.oopen.de
 
 # o20.oopen.de (srv-cityslang.cityslang.com)
 o20.oopen.de
@@ -658,9 +653,6 @@ mail.faire-mobilitaet.de
 o28.oopen.de
 o26.oopen.de
 
-# o29.oopen.de
-backup.oopen.de
-
 # o30.oopen.de - AK server Jitsi Meet/Nextcloud
 cloud.akweb.de
 
@@ -1009,7 +1001,8 @@ test.mariadb.oopen.de
 
 # o19.oopen.de
 munin.oopen.de
-37.27.121.218
+backup.oopen.de
+
 
 # o20.oopen.de (srv-cityslang.cityslang.com)
 o20.oopen.de
@@ -1038,9 +1031,6 @@ cl-fm.oopen.de
 o28.oopen.de
 o26.oopen.de
 
-# o29.oopen.de
-backup.oopen.de
-
 # o30.oopen.de - AK server Jitsi Meet/Nextcloud
 cloud.akweb.de
 
@@ -1132,7 +1122,7 @@ ga-al-ws1.ga.netz
 # ---
 
 # o19.oopen.de
-37.27.121.218
+backup.oopen.de
 
 # o23.oopen.de
 cl-01.oopen.de
@@ -1149,9 +1139,6 @@ o28.oopen.de
 # o26.oopen.de
 o26.oopen.de
 
-# o29.oopen.de
-backup.oopen.de
-
 # o30.oopen.de - AK server Jitsi Meet/Nextcloud
 cloud.akweb.de
 
@@ -1269,7 +1256,6 @@ gateway_server
 # - O.OPEN Server
 # ---
 
-37.27.121.218
 backup.oopen.de
 devel-root.wf.netz
 
@@ -1467,7 +1453,7 @@ test.mx.oopen.de
 test.mariadb.oopen.de
 
 # o19.oopen.de
-37.27.121.218
+backup.oopen.de
 git.oopen.de
 munin.oopen.de
 
@@ -1503,9 +1489,6 @@ mail.faire-mobilitaet.de
 
 # Hetzner Cloud CX31 - AK
 
-# o29.oopen.de
-backup.oopen.de
-
 # o30.oopen.de - AK Server Nextcloud/Jitsi Meet
 meet.akweb.de
 cloud.akweb.de
@@ -1663,7 +1646,7 @@ test.mariadb.oopen.de
 
 # Backup Server O.OPEN
 o19.oopen.de
-37.27.121.218
+backup.oopen.de
 git.oopen.de
 munin.oopen.de
 
@@ -1708,10 +1691,6 @@ mail.faire-mobilitaet.de
 o28.oopen.de
 o26.oopen.de
 
-# - o29.oopen.de
-o29.oopen.de
-backup.oopen.de
-
 # AK - Server Nextcloud/Jitsi Meet
 o30.oopen.de
 meet.akweb.de

roles/common/files/backup.oopen.de/root/.ssh/id_rsa

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEoQIBAAKCAQEAxRcrdHX8UHik7l1gpm7Oc4t4+1AKrkcbGtFlzrlwHV4HmMf2
+9nMxYWdOGUv47CFoAHCPSJAH2fnER22HUozsBlMkPrAgXTsMAfpMZB2gP+F7r4c7
+wiCuK1+uFy2dz2yBIG+1RK+ygJ5GickHPj7baWRQVbYwWeK15YJqL8oxrL6MpmNY
+r/cVZ7SDLRJp/44ZgnfxC83O00yJf8VEvoOvvj46JkhgnY9RETRfp7RaziIkJGs8
+EfNRZ6I0vRPC/shVTXf01GH5rdBcklZYZ2ptMvriyUZ2FfMMEOA86jWs73ZGuTcx
+8ZQGB3m9TCvz8kTBr9CKjz+fAkfKUpMbGOpO5wIBIwKCAQBlXF99uQVrNrs4wk72
+giEIORml0WSUJJGYw3YvzRUWat9V4y6NX9BAuMkUUvULuWivxNv5bqTzwkevtKv+
+kZ30n8l/U0PYLP7cchiohEPJFOCGKEqeWfMsP9XgCNTREzsX/u+CaPy3LNPR1Rmq
++8FMJPYdc6PWdJgPoif7UgrrH0Lwq5JtAs0x+CDDCAqn7zKxS6hNnH6BXn8a8Y5m
+vjt18WOJZsM7sR9WaY9Y0Qy2TH48MvEJHA1X6atm7mkRZNwaNC94ynM16cwZc/WF
+pnT3xQj3vTPEHXvpBT7MzNYZ+fVs/mo8Mtu8sxExMxaeMwtocaqK4ugh3I0mKL8m
+5OobAoGBAPeaan7wSMkC8T/3WNhYS3tUEKF4zTriwFTB/ZxPu5u0Qt0wpR5YwGPh
+anXelwuVCanh7v/89UgJqPVYRiToNKlv9yNyySmCDP13I2aPLxxRQP2yBJoE2+K3
+89lIs7qoRtYkY7dzYn5e0lzcWO3MjQscGTGYGsr5129B52OlkO6NAoGBAMvGOXXr
+txK8fTxlKe62DfSAVDL8F2URcOhCR0xuHUsWbRtqd+MX2hPO4DacamEr9YTNboPY
+nNL6JKsANu473cb/4nUTK5rRJ26w0Xf/Bd841zc1itr3T5v3YjChgeAxHr4IATol
+lb/yoIYeYXacxjzW2lR3Ty0b7iwqBydSY2BDAoGAW/eGpC1c3PJ23T6dV6vEQ8Aj
+byzeg5YM7EgNvbc3DfJ/PDajutCB+TZ3/+T2RiFp/UVKJJEn546PNo6AdBu7yefC
+MbzrobP2MkIxuGERf4vk8IPzFKK4EmGVFjDyTKTnHFaosdpmaXOtOG8Zt2k7s6tZ
+0JeU7E4rcneQdXgCob8CgYAXSdquZBTsMsx77k3vZUNsZnAF06rm+q3RZqkQDJWi
+LnLej9Mv5XgCQ4dWsspUP4nGCNluJ2JhQSjDFfemMrpCoOauS1Vwx3I4iTyCvg9M
+tgn3rlkDFPMnxIBAEnU+MX/bNB1luycOn2LNf9Cf12cc5VrH0x79105rcoR5hcI2
+4wKBgQCfzXqjjlHQcZIce52Zs7JzrJuBXziS/ctWxiGK7XHJ2WuT33wuo1OE9wIv
+qJ5Cvyh1XFl9xX+sTY+U4cL+lfExh81I7bKodgWttKYGFxb0bVvc4uRBWpWpt7G8
+Z+r0AZs+xGdV7k1pR15Le+Sd58F0mYsp1IPuG6nckSWpV1BgFA==
+-----END RSA PRIVATE KEY-----

roles/common/files/backup.oopen.de/root/.ssh/id_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxRcrdHX8UHik7l1gpm7Oc4t4+1AKrkcbGtFlzrlwHV4HmMf29nMxYWdOGUv47CFoAHCPSJAH2fnER22HUozsBlMkPrAgXTsMAfpMZB2gP+F7r4c7wiCuK1+uFy2dz2yBIG+1RK+ygJ5GickHPj7baWRQVbYwWeK15YJqL8oxrL6MpmNYr/cVZ7SDLRJp/44ZgnfxC83O00yJf8VEvoOvvj46JkhgnY9RETRfp7RaziIkJGs8EfNRZ6I0vRPC/shVTXf01GH5rdBcklZYZ2ptMvriyUZ2FfMMEOA86jWs73ZGuTcx8ZQGB3m9TCvz8kTBr9CKjz+fAkfKUpMbGOpO5w== root@backup.oopen.de