From c3992ae03d786b26e8f13cd89fa9b75e74b5c4e9 Mon Sep 17 00:00:00 2001
From: CroneKorkN <i@ckn.li>
Date: Mon, 9 Jun 2025 17:55:28 +0200
Subject: [PATCH] wip

---
 bundles/yourls/files/config.php |  2 +-
 bundles/yourls/items.py         |  2 +-
 bundles/yourls/metadata.py      | 12 +++++++-----
 nodes/mseibert.yourls.py        |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bundles/yourls/files/config.php b/bundles/yourls/files/config.php
index 821e139..9be0a49 100644
--- a/bundles/yourls/files/config.php
+++ b/bundles/yourls/files/config.php
@@ -5,7 +5,7 @@ define( 'YOURLS_DB_NAME', 'yourls' );
 define( 'YOURLS_DB_HOST', 'localhost' );
 define( 'YOURLS_DB_PREFIX', 'yourls_' );
 
-define( 'YOURLS_SITE', '${url}' );
+define( 'YOURLS_SITE', 'https://${hostname}' );
 define( 'YOURLS_LANG', '' );
 define( 'YOURLS_UNIQUE_URLS', true );
 define( 'YOURLS_PRIVATE', true );
diff --git a/bundles/yourls/items.py b/bundles/yourls/items.py
index 6efd7ed..4d8a684 100644
--- a/bundles/yourls/items.py
+++ b/bundles/yourls/items.py
@@ -27,7 +27,7 @@ files = {
         'group': 'www-data',
         'context': {
             'db_password': node.metadata.get('mariadb/databases/yourls/password'),
-            'url': node.metadata.get('yourls/url'),
+            'hostname': node.metadata.get('yourls/hostname'),
             'cookiekey': node.metadata.get('yourls/cookiekey'),
             'users': node.metadata.get('yourls/users'),
         },
diff --git a/bundles/yourls/metadata.py b/bundles/yourls/metadata.py
index 967d978..0b76340 100644
--- a/bundles/yourls/metadata.py
+++ b/bundles/yourls/metadata.py
@@ -9,16 +9,18 @@ defaults = {
 }
 
 
-metadata_reactor.provides(
-    'nginx/vhosts/yourls',
+@metadata_reactor.provides(
+    'nginx/vhosts',
 )
 def nginx(metadata):
     return {
         'nginx': {
             'vhosts': {
-                'yourls': {
-                    'server_name': metadata.get('yourls/url'),
-                    'php_version': metadata.get('php/version'),
+                metadata.get('yourls/url'): {
+                    'content': 'yourls/vhost.conf',
+                    'context': {
+                        'php_version': metadata.get('php/version'),
+                    },
                 },
             },
         },
diff --git a/nodes/mseibert.yourls.py b/nodes/mseibert.yourls.py
index 5bbdaf7..61edf55 100644
--- a/nodes/mseibert.yourls.py
+++ b/nodes/mseibert.yourls.py
@@ -36,7 +36,7 @@
             'ram': 4096,
         },
         'yourls': {
-            'url': "https://direkt.oranienschule.de",
+            'hostname': "direkt.oranienschule.de",
             'cookiekey': "!decrypt:encrypt$gAAAAABoRvmcUs3t7PREllyeN--jBqs0XYewMHW16GWC-ikLzsDSe02YKGycOlgXuHU4hzKbNjGMEutpFXRLk9Zji6bbpy4GdyE6vStfwd8ZT0obAyoqBPwI47LwUlDSFMS51y5j8rG5",
             'version': "1.10.1",
             'users': {