wip

bundles/nextcloud/metadata.py

@@ -63,18 +63,20 @@ defaults = {
     },
 }
 
-# @metadata_reactor.provides(
+
-#     'nginx/vhosts/nextcloud/domain',
+@metadata_reactor.provides(
-# )
+    'nginx/vhosts'
-# def nginx(metadata):
+)
-#     return {
+def vhost(metadata):
-#         'nginx': {
+    return {
-#             'vhosts': {
+        'nginx': {
-#                 'nextcloud': {
+            'vhosts': {
-#                     'domain': metadata.get('nextcloud/domain'),
+                metadata.get('nextcloud/hostname'): {
-#                     'webroot': '/opt/nextcloud',
+                    'root': '/opt/nextcloud',
-#                     'php': True,
+                    'include': [
-#                 },
+                        'php.conf',
-#             },
+                    ],
-#         },
+                },
-#     }
+            },
+        },
+    }

bundles/nginx/items.py

@@ -28,6 +28,12 @@ files = {
             'svc_systemd:nginx:restart',
         },
     }, 
+    '/etc/nginx/sites-available': {
+        'delete': True,
+    },
+    '/etc/nginx/sites-enabled': {
+        'delete': True,
+    },
 }
 
 actions = {
@@ -46,6 +52,18 @@ svc_systemd = {
     },
 }
 
+for name, config in node.metadata.get('nginx/includes').items():
+    files[f'/etc/nginx/{name}.conf'] = {
+        'content': repo.libs.nginx.render_config(config),
+        'needed_by': {
+            'svc_systemd:nginx',
+            'svc_systemd:nginx:restart',
+        },
+        'triggers': {
+            'svc_systemd:nginx:restart',
+        },
+    }
+    
 for name, config in {
     **node.metadata.get('nginx/default_vhosts'),
     **node.metadata.get('nginx/vhosts'),

bundles/nginx/metadata.py

@@ -47,9 +47,28 @@ defaults = {
             },
         },
         'vhosts': {},
+        'includes': {},
     },
 }
 
+@metadata_reactor.provides(
+    'nginx/includes/php',
+)
+def php(metadata):
+    return {
+        'nginx': {
+            'includes': {
+                'php': {
+                    'location ~ \.php$': {
+                        'include': 'fastcgi.conf',
+                        'fastcgi_split_path_info': '^(.+\.php)(/.+)$',
+                        'fastcgi_pass': f"unix:/run/php/php{metadata.get('php/version')}-fpm.sock",
+                    },
+                },
+            },
+        },
+    }
+
 
 @metadata_reactor.provides(
     'nginx/vhosts',

bundles/roundcube/metadata.py

@@ -57,11 +57,9 @@ def vhost(metadata):
             'vhosts': {
                 metadata.get('mailserver/hostname'): {
                     'root': '/opt/roundcube',
-                    'location ~ \.php$': {
+                    'include': [
-                        'include': 'fastcgi.conf',
+                        'php.conf',
-                        'fastcgi_split_path_info': '^(.+\.php)(/.+)$',
+                    ],
-                        'fastcgi_pass': f"unix:/run/php/php{metadata.get('php/version')}-fpm.sock",
-                    },
                 },
             },
         },

nodes/htz.mails.py

@@ -17,7 +17,7 @@
     ],
     'metadata': {
         'nextcloud': {
-            'domain': 'cloud.sublimity.de',
+            'hostname': 'cloud.sublimity.de',
             'version': '21.0.0',
         },
         'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',