wip

bundles/blog/README.md

@@ -1,2 +0,0 @@
-JSON=$(cat bundles/build-server/example.json)
-curl -X POST 'https://build.sublimity.de/crystal?file=procio.cr' -H "Content-Type: application/json" --data-binary @- <<< $JSON

bundles/blog/items.py

@@ -1,8 +0,0 @@
-directories = {}
-
-files = {
-    # '/etc/build-server.json': {
-    #     'owner': 'build-server',
-    #     'content': json.dumps(node.metadata.get('build-server'), indent=4, sort_keys=True, cls=MetadataJSONEncoder)
-    # },
-}

bundles/blog/metadata.py

@@ -3,17 +3,13 @@ from ipaddress import ip_interface
 defaults = {
     'flask': {
         'blog' : {
-            'git_url': "https://git.sublimity.de/cronekorkn/blog.git",
+            'git_url': "https://git.sublimity.de/cronekorkn/flask-blog.git",
-            'port': 5000,
+            'port': 5010,
-            'app_module': 'ckn_blog',
+            'app_module': 'blog',
-            'env': {
-                'CONFIG': '/etc/ckn-blog.json',
-            },
         },
     },
     'users': {
         'blog': {
-            'home': '/opt/blog',
         },
     },
 }
@@ -26,12 +22,11 @@ def nginx(metadata):
     return {
         'nginx': {
             'vhosts': {
-                metadata.get('build-server/hostname'): {
+                metadata.get('blog/hostname'): {
                     'content': 'nginx/proxy_pass.conf',
                     'context': {
-                        'target': 'http://127.0.0.1:4000',
+                        'target': 'http://127.0.0.1:5010',
                     },
-                    'check_path': '/status',
                 },
             },
         },

nodes/home.server.py

@@ -37,18 +37,6 @@
         'zfs',
     ],
     'metadata': {
-        'dns': {
-            'wiegand.tel': {
-                'A': {'202.61.255.108'},
-            },
-        },
-
-
-
-
-
-
-
         'id': 'af96709e-b13f-4965-a588-ef2cd476437a',
         'network': {
             'internal': {

nodes/netcup.mails.py

@@ -20,6 +20,7 @@
         'wireguard',
         'zfs',
         'blog',
+        'flask',
     ],
     'metadata': {
         'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',
@@ -36,6 +37,10 @@
                 'gateway6': 'fe80::1',
             }
         },
+        'blog': {
+            'hostname': 'wiegand.tel',
+            'repo': 'https://git.sublimity.de/cronekorkn/blog.git',
+        },
         'bind': {
             'hostname': 'resolver.name',
             'acme_zone': 'acme.sublimity.de',