bundles/grafana/items.py

@@ -18,7 +18,7 @@ admin_password = node.metadata.get('grafana/config/security/admin_password')
 port = node.metadata.get('grafana/config/server/http_port')
 actions['reset_grafana_admin_password'] = {
     'command': f"sleep 5 && grafana-cli admin reset-admin-password {quote(admin_password)}",
-    'unless': f"curl http://admin:{quote(admin_password)}@localhost:{port}/api/org --fail-with-body",
+    'unless': f"curl http://admin:{quote(admin_password)}@localhost:{port}/api/org",
     'needs': [
         'svc_systemd:grafana-server',
     ],
@@ -35,8 +35,6 @@ directories = {
     },
     '/var/lib/grafana': {},
     '/var/lib/grafana/dashboards': {
-        'owner': 'grafana',
-        'group': 'grafana',
         'purge': True,
         'triggers': [
             'svc_systemd:grafana-server:restart',

bundles/macbook/files/bundlewrap

@@ -2,5 +2,5 @@
 
 cd "$OLDPWD"
 
-export BW_ITEM_WORKERS=$(expr "$(nproc)" '*' 15 '/' 10)
+export BW_ITEM_WORKERS=$(expr $(nproc) '*' 2)
-export BW_NODE_WORKERS=$(expr 320 '/' "$BW_ITEM_WORKERS")
+export BW_NODE_WORKERS=$(expr 256 '/' "$BW_ITEM_WORKERS")

groups/os/debian-11.py

@@ -3,14 +3,6 @@
         'debian',
     ],
     'metadata': {
-        'apt': {
-            'sources': {
-                'deb https://deb.debian.org/debian {codename} main contrib non-free',
-                'deb https://deb.debian.org/debian {codename}-updates main contrib non-free',
-                'deb https://deb.debian.org/debian {codename}-backports main contrib non-free',
-                'deb https://security.debian.org/ {codename}-security main contrib non-free',
-            },
-        },
         'php': {
             'version': '7.4',
         },

groups/os/debian-12.py

@@ -3,19 +3,11 @@
         'debian',
     ],
     'metadata': {
-        'apt': {
-            'sources': {
-                'deb https://deb.debian.org/debian {codename} main contrib non-free non-free-firmware',
-                'deb https://deb.debian.org/debian {codename}-updates main contrib non-free non-free-firmware',
-                'deb https://deb.debian.org/debian {codename}-backports main contrib non-free non-free-firmware',
-                'deb https://security.debian.org/ {codename}-security main contrib non-free non-free-firmware',
-            },
-        },
         'php': {
-            'version': '8.2',
+            'version': '8.1',
         },
         'postgresql': {
-            'version': '15',
+            'version': '14',
         },
         'os_codename': 'bookworm',
     },

groups/os/debian.py

@@ -9,6 +9,12 @@
     ],
     'metadata': {
         'apt': {
+            'sources': {
+                'deb https://deb.debian.org/debian {codename} main contrib non-free',
+                'deb https://deb.debian.org/debian {codename}-updates main contrib non-free',
+                'deb https://deb.debian.org/debian {codename}-backports main contrib non-free',
+                'deb https://security.debian.org/ {codename}-security main contrib non-free',
+            },
             'packages': {
                 'mtr-tiny': {},
             },

requirements.txt

@@ -1,4 +1,4 @@
-bundlewrap ~=4.0, >=4.17.2
+bundlewrap~=4.17
 pycryptodome
 PyNaCl
 PyYAML