bundles/php/metadata.py

@@ -141,10 +141,10 @@ def www_conf(metadata):
                 'listen.owner': 'www-data',
                 'listen.group': 'www-data',
                 'pm': 'dynamic',
-                'pm.max_children': '32',
+                'pm.max_children': '30',
-                'pm.start_servers': '16',
+                'pm.start_servers': '10',
-                'pm.min_spare_servers': '8',
+                'pm.min_spare_servers': '5',
-                'pm.max_spare_servers': '16',
+                'pm.max_spare_servers': '10',
                 'pm.max_requests': '500',
             },
         },

bundles/postgresql/items.py

@@ -6,7 +6,7 @@ directories = {
         'group': 'postgres',
         'needs': [
             'pkg_apt:postgresql',
-            f"zfs_dataset:{node.metadata.get('zfs/storage_classes/ssd')}/postgresql",
+            'zfs_dataset:tank/postgresql',
         ],
         'needed_by': [
             'svc_systemd:postgresql',

bundles/postgresql/metadata.py

@@ -1,6 +1,3 @@
-from importlib.metadata import metadata
-
-
 root_password = repo.vault.password_for(f'{node.name} postgresql root')
 
 defaults = {
@@ -26,22 +23,13 @@ defaults = {
     'grafana_rows': set(),
 }
 
-
+if node.has_bundle('zfs'):
-@metadata_reactor.provides(
+    defaults['zfs'] = {
-    'zfs/datasets',
+        'datasets': {
-)
+            'tank/postgresql': {
-def zfs(metadata):
+                'mountpoint': '/var/lib/postgresql',
-    if not node.has_bundle('zfs'):
+                'recordsize': '8192',
-        return {}
+                'atime': 'off',
-
-    return {
-        'zfs': {
-            'datasets': {
-                f"{metadata.get('zfs/storage_classes/ssd')}/postgresql": {
-                    'mountpoint': '/var/lib/postgresql',
-                    'recordsize': '8192',
-                    'atime': 'off',
-                },
             },
         },
     }

bundles/zfs/metadata.py

@@ -78,13 +78,9 @@ defaults = {
         'datasets': {},
         'pools': {},
         'kernel_params': {},
-        'storage_classes': {
-            'ssd': 'tank',
-        },
     },
 }
 
-
 @metadata_reactor.provides(
     'zfs/datasets'
 )
@@ -136,23 +132,3 @@ def headers(metadata):
             },
         },
     }
-
-
-@metadata_reactor.provides(
-    'zfs/kernel_params/zfs_arc_max',
-)
-def arc_size(metadata):
-    arc_percent = metadata.get('zfs/zfs_arc_max_percent', None)
-    
-    if arc_percent:
-        return {
-            'zfs': {
-                'kernel_params': {
-                    'zfs_arc_max': str(int(
-                        metadata.get('vm/ram') * 1024 * 1024 * (arc_percent/100)
-                    )),
-                },
-            },
-        }
-    else:
-        return {}

nodes/home.server.py

@@ -119,7 +119,7 @@
             },
         },
         'vm': {
-            'cores': 16,
+            'cores': 2,
             'ram':  32384,
         },
         'wireguard': {
@@ -136,9 +136,6 @@
         },
         'zfs': {
             'zfs_arc_max_percent': 75,
-            'storage_classes': {
-                'ssd': 'ssd',
-            },
             'pools': {
                 'tank': {
                     'type': 'mirror',