wip

bundles/mariadb/items.py

@@ -57,7 +57,6 @@ for db, conf in node.metadata.get('mariadb/databases', {}).items():
             f'action:mariadb_user_{db}_create',
         ],
     }
-    print(mariadb(f"SHOW GRANTS FOR {db}") + f" | grep -q '^GRANT ALL PRIVILEGES ON `{db}`.`{db}` TO `{db}`@`%`$'")
     actions[f'mariadb_grant_privileges_to_{db}'] = {
         'command': mariadb(f"GRANT ALL PRIVILEGES ON {db} TO '{db}'", database=db),
         'unless': mariadb(f"SHOW GRANTS FOR {db}") + f" | grep -q '^GRANT ALL PRIVILEGES ON `{db}`.`{db}` TO `{db}`@`%`$'",

bundles/wordpress/items.py

@@ -1,6 +1,6 @@
-for domain, conf in node.metadata.get('wordpress').items():
+for site, conf in node.metadata.get('wordpress').items():
     directories = {
-        f'/opt/wordpress/{domain}': {
+        f'/opt/wordpress/{site}': {
             'owner': 'www-data',
             'group': 'www-data',
             'mode': '0755',

bundles/wordpress/metadata.py

@@ -29,3 +29,22 @@ def mariadb(metadata):
             },
         },
     }
+
+
+@metadata_reactor.provides(
+    'nginx/vhosts'
+)
+def vhost(metadata):
+    return {
+        'nginx': {
+            'vhosts': {
+                conf['domain']: {
+                    'content': 'wordpress/vhost.conf',
+                    'context': {
+                        'root': f'/opt/{site}',
+                    },
+                }
+                    for site, conf in metadata.get('wordpress').items()
+            },
+        },
+    }

data/wordpress/vhost.conf

@@ -0,0 +1,37 @@
+# Upstream to abstract backend connection(s) for php
+server {
+    server_name ${server_name};
+    root ${root};
+    index index.php;
+
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        # This is cool because no php is touched for static content.
+        # include the "?$args" part so non-default permalinks doesn't break when using query string
+        try_files $uri $uri/ /index.php?$args;
+    }
+
+    location ~ \.php$ {
+        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
+        include params/fastcgi;
+        fastcgi_intercept_errors on;
+        fastcgi_pass php-handler;
+        # The following parameter can be also included in fastcgi_params file
+        fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    }
+
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
+        expires max;
+        log_not_found off;
+    }
+}

nodes/netcup.mails.py

@@ -79,10 +79,6 @@
                 'A': ['202.61.255.108'],
                 'AAAA': ['2a01:4f8:1c1c:4121::1'],
             },
-            'elimu-kwanza.de': {
-                'A': ['202.61.255.108'],
-                'AAAA': ['2a01:4f8:1c1c:4121::1'],
-            },
         },
         'download-server': {
             'hostname': 'dl.sublimity.de',
@@ -178,14 +174,6 @@
                     },
                     'internal_dns': False,
                 },
-                'elimu-kwanza.de': {
-                    'content': 'nginx/message.conf',
-                    'context': {
-                        'title': 'Im Aufbau/under construction',
-                        'message': '<a href=mailto:info@elimu-kwanza.de>info@elimu-kwanza.de</a>',
-                    },
-                    'internal_dns': False,
-                },
                 'cronekorkn.de': {
                     'content': 'nginx/redirect.conf',
                     'context': {