Merge pull request #298 from noisebridge/bjk/rebuild_m6

Repurpose m6.
noisebridge · Oct 11, 2021 · c9904a2 · c9904a2
2 parents f47b0bb + 5e87031
commit c9904a2
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 20 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "roles/cloudalchemy.blackbox-exporter"]
 	path = roles/cloudalchemy.blackbox-exporter
 	url = https://github.com/cloudalchemy/ansible-blackbox-exporter.git
+[submodule "roles/podman"]
+	path = roles/podman
+	url = https://github.com/alvistack/ansible-role-podman.git
diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml
@@ -76,7 +76,7 @@ users:
     email: [email protected]
     github_username: patrickod
 
-  r:
+  rizend:
     fullname: ',,,'
     email: ...
     ssh_key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWvlc3+qDxhKE3jCCxKKU1h9QJyhCqLgHAwkiokvSPig6dXZW9f8uS/1CNMEmB5avrZhT6S3V00NExqZMldJechROhQoZb6YrUzakaeJCHrbThotQ/TlDuRWCCEh+y/qowk261X4Rbdx/KMwPuROP0p+pw2u3CVoLC7ejnsCwzTMZJ450QtZau0nvP7PY1vnehg2npA4HOqtwjOABJlMMpSZfaQdddwQJ7YE01GLpXF73Lwcnyue51fWFdjsQwIeQM2feO0yf1r1fjoLyMfWCVLK2GI0ONXVFWKQ52kfzr4QQ7Tq+Xi12qr7KGlHZ8yl7tw3MUoyU7k0HrUea1F8WF ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvHlZKV8yBsJOkeu2FkWZ1UDY/uTS8bBUbqh1W0pJ3BMec55uvRLNv1AT5Z7RHKbwdjiZTBm6sP0CRVjsOxeGRCVeddHx1SxsXeihZIRQLHX+Z7M1YwYdzmzRDIEhuZhp+RnGH71ESVEHlmUhNPYsNmlgE3nyNbbDatYRZQqC204pal6cz4CHRUWYIozAQvpO8BF+cNDbNgT1yR5DWflwHErlv8yltmxNjh+gQQgp7RzI+05uzpRgumLCIqdHIKUflDJGvZXnUNAr5nv8Xe3W77AZz348nK2SYoD7dOBw23LpEzmy0mENL+/d3ZCuricslc1eBqCpVxJiF7s/RCtix'

diff --git a/host_vars/m4.noisebridge.net/users.yml b/host_vars/m4.noisebridge.net/users.yml
@@ -4,5 +4,4 @@ noisebridge_admins:
 - superq
 - rizend
 - elimisteve
-- kevinjos
-- allyourbasepair
+- bfb
diff --git a/host_vars/m5.noisebridge.net/users.yml b/host_vars/m5.noisebridge.net/users.yml
@@ -3,5 +3,4 @@ noisebridge_admins:
 - superq
 - elimisteve
 - rizend
-- kevinjos
-- allyourbasepair
+- bfb
diff --git a/host_vars/m6.noisebridge.net/users.yml b/host_vars/m6.noisebridge.net/users.yml
@@ -3,5 +3,4 @@ noisebridge_admins:
 - superq
 - rizend
 - elimisteve
-- kevinjos
-- allyourbasepair
+- bfb
diff --git a/hosts.yml b/hosts.yml
@@ -63,6 +63,3 @@ all:
     donate:
       children:
         m5_noisebridge_net: {}
-    lists:
-      children:
-        m6_noisebridge_net: {}
diff --git a/roles/jnv.unattended-upgrades b/roles/jnv.unattended-upgrades
diff --git a/roles/podman b/roles/podman
diff --git a/roles/utils/tasks/main.yml b/roles/utils/tasks/main.yml
@@ -15,6 +15,7 @@
       - dnsutils
       - file
       - git
+      - gpg
       - htop
       - iftop
       - inotify-tools

diff --git a/site.yml b/site.yml
@@ -82,15 +82,6 @@
     - cloudalchemy.grafana
     - powerpanel
 
-- name: Mailman-3 List server
-  hosts: lists
-  become: yes
-  become_method: sudo
-  tags: [lists]
-  roles:
-    - postfix
-    - mailman3
-
 - name: Nextcloud on debian box in space
   hosts: cloud
   become: yes
@@ -122,3 +113,11 @@
   tags: [smartpi]
   roles:
     - smartpi
+
+- name: Misc server SCL
+  hosts: m6_noisebridge_net
+  become: yes
+  become_method: sudo
+  tags: [m6_noisebridge_net]
+  roles:
+    - {role: podman, tags: ['podman'] }
+23 −2		README.md
+22 −2		defaults/main.yml
+8 −0		tasks/unattended-upgrades.yml
+22 −1		templates/unattended-upgrades.j2
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ @@
           - dnsutils
           - file
           - git
+          - gpg
           - htop
           - iftop
           - inotify-tools
@@ Expand Down @@