wip

.envrc

@@ -1,10 +1,17 @@
 #!/usr/bin/env bash
 
+if test -f .venv/bin/python && test "$(realpath .venv/bin/python)" != "$(realpath "$(pyenv which python)")"
+then
+  echo "rebuilding venv für new python version"
+  rm -rf .venv
+fi
+
 python3 -m venv .venv
-source ./.venv/bin/activate
+source .venv/bin/activate
 PATH_add .venv/bin
 PATH_add bin
-python3 -m pip install --upgrade pip
+python3 -m pip install --upgrade pip wheel
+python3 -m pip install --upgrade -r requirements.txt
 
 rm -rf .cache/bw/git_deploy
 export BW_GIT_DEPLOY_CACHE=.cache/bw/git_deploy

bundles/blog/metadata.py

@@ -0,0 +1,35 @@
+from ipaddress import ip_interface
+
+defaults = {
+    'flask': {
+        'blog' : {
+            'git_url': "https://git.sublimity.de/cronekorkn/flask-blog.git",
+            'port': 5010,
+            'app_module': 'blog',
+            'env': {
+                'DATA_PATH': '/var/blog',
+            },
+        },
+    },
+    'users': {
+        'blog': {},
+    },
+}
+
+
+@metadata_reactor.provides(
+    'nginx/vhosts',
+)
+def nginx(metadata):
+    return {
+        'nginx': {
+            'vhosts': {
+                metadata.get('blog/hostname'): {
+                    'content': 'nginx/proxy_pass.conf',
+                    'context': {
+                        'target': 'http://127.0.0.1:5010',
+                    },
+                },
+            },
+        },
+    }

bundles/macbook/files/macbook-update

@@ -7,6 +7,8 @@ git -C ~/.zsh/oh-my-zsh pull
 brew upgrade
 brew upgrade --cask --greedy
 
+pyenv install
+
 sudo softwareupdate -ia --verbose
 
 if test "$(defaults read com.apple.dock autohide-time-modifier)" == 0.16

nodes/netcup.mails.py

@@ -19,6 +19,8 @@
         'steam',
         'wireguard',
         'zfs',
+        'blog',
+        'flask',
     ],
     'metadata': {
         'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',
@@ -35,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',