diff --git a/bin/upgrade_and_restart_all b/bin/upgrade_and_restart_all index a20bd1c..16b24eb 100755 --- a/bin/upgrade_and_restart_all +++ b/bin/upgrade_and_restart_all @@ -61,8 +61,10 @@ for node in [ *wireguard_servers, ]: try: - if node.run('test -e /var/run/reboot-required').return_code == 0: + if node.run('test -e /var/run/reboot-required', may_fail=True).return_code == 0: print('rebooting', node.name) print(node.run('systemctl reboot').stdout.decode()) + else: + print('not rebooting', node.name) except Exception as e: print(e) diff --git a/bundles/icingaweb2/metadata.py b/bundles/icingaweb2/metadata.py index 7575963..de3be18 100644 --- a/bundles/icingaweb2/metadata.py +++ b/bundles/icingaweb2/metadata.py @@ -11,7 +11,7 @@ defaults = { 'php-imagick': {}, 'php-pgsql': {}, 'icingaweb2': {}, - 'icingaweb2-module-monitoring': {}, + #'icingaweb2-module-monitoring': {}, # ? }, 'sources': { 'icinga': { diff --git a/bundles/influxdb2/items.py b/bundles/influxdb2/items.py index fcf2e09..f485f6f 100644 --- a/bundles/influxdb2/items.py +++ b/bundles/influxdb2/items.py @@ -4,7 +4,7 @@ from shlex import quote directories['/var/lib/influxdb'] = { 'owner': 'influxdb', 'group': 'influxdb', - 'mode': '0750', + 'mode': '0755', 'needs': [ 'zfs_dataset:tank/influxdb', ],