bundles/nextcloud/metadata.py

@@ -41,16 +41,6 @@ defaults = {
         'admin_user': 'admin',
         'admin_pass': repo.vault.password_for(f'{node.name} nextcloud admin pw'),
     },
-    'php': {
-        'post_max_size': '32G',
-        'www.conf': {
-            'env[hostname]': '$HOSTNAME',
-            'env[path]': '/usr/local/bin:/usr/bin:/bin',
-            'env[tmp]': '/tmp',
-            'env[tmpdir]': '/tmp',
-            'env[temp]': '/tmp',
-        },
-    },
     'postgresql': {
         'roles': {
             'nextcloud': {

bundles/php/items.py

@@ -6,35 +6,23 @@ php_ini_context = {
 }
 
 files = {
-    f'/etc/php/{version}/cli/php.ini': {
-        'content_type': 'mako',
-        'context': php_ini_context,
-        'needs': {
-            f'pkg_apt:php{version}',
-            f'pkg_apt:php{version}-fpm',
-        },
-    },
     f'/etc/php/{version}/fpm/php.ini': {
         'content_type': 'mako',
         'context': php_ini_context,
         'needs': {
-            f'pkg_apt:php{version}',
+            # "all php packages"
-            f'pkg_apt:php{version}-fpm',
+            'pkg_apt:'
         },
         'triggers': {
             f'svc_systemd:php{version}-fpm:restart',
         },
     },
-    f'/etc/php/{version}/fpm/pool.d/www.conf': {
+    f'/etc/php/{version}/cli/php.ini': {
-        'content': repo.libs.ini.dumps({
+        'content_type': 'mako',
-            'www': node.metadata.get('php/www.conf'),
+        'context': php_ini_context,
-        }),
         'needs': {
-            f'pkg_apt:php{version}',
+            # "all php packages"
-            f'pkg_apt:php{version}-fpm',
+            'pkg_apt:'
-        },
-        'triggers': {
-            f'svc_systemd:php{version}-fpm:restart',
         },
     },
 }

bundles/php/metadata.py

@@ -1,32 +1,10 @@
 defaults = {
     'php': {
         'post_max_size': '32G',
-        'www.conf': {
+    },
-            'user': 'www-data',
+    'apt': {
-            'group': 'www-data',
+        'packages': {
-            'listen': '/run/php/php7.4-fpm.sock',
+            'php': {},
-            'listen.owner': 'www-data',
-            'listen.group': 'www-data',
-            'pm': 'dynamic',
-            'pm.max_children': '5',
-            'pm.start_servers': '2',
-            'pm.min_spare_servers': '1',
-            'pm.max_spare_servers': '3',
         },
     },
 }
-
-
-@metadata_reactor.provides(
-    'apt/packages',
-)
-def apt(metadata):
-    version = metadata.get('php/version')
-    return {
-        'apt': {
-            'packages': {
-                f'php{version}': {},
-                f'php{version}-fpm': {},
-            },
-        },
-    }

libs/ini.py

@@ -1,5 +1,4 @@
 from configparser import ConfigParser
-import json
 
 def parse(text):
     config = ConfigParser()
@@ -18,8 +17,7 @@ class Writable():
 
 def dumps(dict):
     config = ConfigParser()
-    sorted_dict = json.loads(json.dumps(dict, sort_keys=True))
+    config.read_dict(dict)
-    config.read_dict(sorted_dict)
     writable = Writable()
     config.write(writable)