nextcloud php www.conf

bundles/nextcloud/metadata.py

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

bundles/php/metadata.py

@@ -1,10 +1,32 @@
 defaults = {
     'php': {
         'post_max_size': '32G',
-    },
+        'www.conf': {
-    'apt': {
+            'user': 'www-data',
-        'packages': {
+            'group': 'www-data',
-            'php': {},
+            'listen': '/run/php/php7.4-fpm.sock',
+            '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,4 +1,5 @@
 from configparser import ConfigParser
+import json
 
 def parse(text):
     config = ConfigParser()
@@ -17,7 +18,8 @@ class Writable():
 
 def dumps(dict):
     config = ConfigParser()
-    config.read_dict(dict)
+    sorted_dict = json.loads(json.dumps(dict, sort_keys=True))
+    config.read_dict(sorted_dict)
     writable = Writable()
     config.write(writable)