wip

bin/upgrade_and_restart_all

@@ -10,6 +10,7 @@ nodes = [
         for node in sorted(repo.nodes_in_group('debian'))
         if not node.dummy
 ]
+reboot_nodes = []
 
 print('updating nodes:', sorted(node.name for node in nodes))
 
@@ -24,12 +25,13 @@ for node in nodes:
     print(node.run('DEBIAN_FRONTEND=noninteractive apt list --upgradable').stdout.decode())
     if int(node.run('DEBIAN_FRONTEND=noninteractive apt list --upgradable 2> /dev/null | grep upgradable | wc -l').stdout.decode()):
         print(node.run('DEBIAN_FRONTEND=noninteractive apt -y dist-upgrade').stdout.decode())
+        reboot_nodes.append(node)
 
 # REBOOT IN ORDER
 
 wireguard_servers = [
     node
-        for node in nodes
+        for node in reboot_nodes
         if node.has_bundle('wireguard')
         and (
             ip_interface(node.metadata.get('wireguard/my_ip')).network.prefixlen <
@@ -39,7 +41,7 @@ wireguard_servers = [
 
 wireguard_s2s = [
     node
-        for node in nodes
+        for node in reboot_nodes
         if node.has_bundle('wireguard')
         and (
             ip_interface(node.metadata.get('wireguard/my_ip')).network.prefixlen ==
@@ -49,7 +51,7 @@ wireguard_s2s = [
 
 everything_else = [
     node
-        for node in nodes
+        for node in reboot_nodes
         if not node.has_bundle('wireguard')
 ]
 
@@ -60,9 +62,8 @@ for node in [
     *wireguard_s2s,
     *wireguard_servers,
 ]:
+    print('rebooting', node.name)
     try:
-        if node.run('test -e /var/run/reboot-required').return_code == 0:
-            print('rebooting', node.name)
-            print(node.run('systemctl reboot').stdout.decode())
+        print(node.run('systemctl reboot').stdout.decode())
     except Exception as e:
         print(e)

bundles/backup-freshness-check/metadata.py

@@ -25,8 +25,7 @@ def backup_freshness_check(metadata):
             'datasets': {
                 f"{other_node.metadata.get('id')}/{dataset}"
                     for other_node in repo.nodes
-                    if not other_node.dummy
-                    and other_node.has_bundle('backup')
+                    if other_node.has_bundle('backup')
                     and other_node.has_bundle('zfs')
                     and other_node.metadata.get('backup/server') == metadata.get('backup-freshness-check/server')
                     for dataset, options in other_node.metadata.get('zfs/datasets').items()

bundles/backup-server/metadata.py

@@ -35,7 +35,6 @@ def zfs(metadata):
 
     for other_node in repo.nodes:
         if (
-            not other_node.dummy and
             other_node.has_bundle('backup') and
             other_node.metadata.get('backup/server') == node.name
         ):

bundles/macbook/files/macbook-update

@@ -10,7 +10,6 @@ password   required       pam_deny.so
 session    required       pam_permit.so
 EOT
 
-sudo xcodebuild -license accept
 xcode-select --install
 
 git -C ~/.zsh/oh-my-zsh pull
@@ -42,5 +41,3 @@ fi
 sudo systemsetup -setremotelogin on # enable ssh
 
 pip install --upgrade pip
-
-# https://sysadmin-journal.com/apache-directory-studio-on-the-apple-m1/