From 6022bac0ef34b1cc8325ee6da7946883eec5459b Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Fri, 16 Jul 2021 14:20:01 +0200
Subject: [PATCH] have more bundles provide nginx metadata for themselves

---
 bundles/element-web/metadata.py |  2 +-
 bundles/gitea/metadata.py       |  2 +-
 bundles/jenkins-ci/metadata.py  | 25 +++++++++++++++++++++++++
 bundles/miniflux/metadata.py    |  2 +-
 bundles/travelynx/metadata.py   | 31 +++++++++++++++++++++++++++++++
 nodes/rx300.py                  | 30 ++++--------------------------
 6 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/bundles/element-web/metadata.py b/bundles/element-web/metadata.py
index 04fefb1..0ce259a 100644
--- a/bundles/element-web/metadata.py
+++ b/bundles/element-web/metadata.py
@@ -12,7 +12,7 @@ defaults = {
 }
 
 @metadata_reactor.provides(
-    'nginx/vhosts',
+    'nginx/vhosts/element-web',
 )
 def nginx_config(metadata):
     return {
diff --git a/bundles/gitea/metadata.py b/bundles/gitea/metadata.py
index 26eebac..06556a9 100644
--- a/bundles/gitea/metadata.py
+++ b/bundles/gitea/metadata.py
@@ -66,7 +66,7 @@ defaults = {
 
 
 @metadata_reactor.provides(
-    'nginx/vhosts',
+    'nginx/vhosts/gitea',
 )
 def nginx(metadata):
     if not node.has_bundle('nginx'):
diff --git a/bundles/jenkins-ci/metadata.py b/bundles/jenkins-ci/metadata.py
index fae8052..18c9799 100644
--- a/bundles/jenkins-ci/metadata.py
+++ b/bundles/jenkins-ci/metadata.py
@@ -32,3 +32,28 @@ defaults = {
         },
     },
 }
+
+
+@metadata_reactor.provides(
+    'nginx/vhosts/jenkins-ci',
+)
+def nginx(metadata):
+    if not node.has_bundle('nginx'):
+        raise DoNotRunAgain
+
+    return {
+        'nginx': {
+            'vhosts': {
+                'jenkins-ci': {
+                    'domain': metadata.get('jenkins-ci/domain'),
+                    'locations': {
+                        '/': {
+                            'target': 'http://localhost:22010/',
+                        },
+                    },
+                    'website_check_path': '/login',
+                    'website_check_string': 'Welcome to Jenkins',
+                },
+            },
+        },
+    }
diff --git a/bundles/miniflux/metadata.py b/bundles/miniflux/metadata.py
index 907d2ae..8c51627 100644
--- a/bundles/miniflux/metadata.py
+++ b/bundles/miniflux/metadata.py
@@ -36,7 +36,7 @@ defaults = {
 
 
 @metadata_reactor.provides(
-    'nginx/vhosts',
+    'nginx/vhosts/miniflux',
 )
 def nginx(metadata):
     if not node.has_bundle('nginx'):
diff --git a/bundles/travelynx/metadata.py b/bundles/travelynx/metadata.py
index 155fa60..969b0cd 100644
--- a/bundles/travelynx/metadata.py
+++ b/bundles/travelynx/metadata.py
@@ -23,3 +23,34 @@ defaults = {
         },
     },
 }
+
+
+@metadata_reactor.provides(
+    'nginx/vhosts/travelynx',
+)
+def nginx(metadata):
+    if not node.has_bundle('nginx'):
+        raise DoNotRunAgain
+
+    return {
+        'nginx': {
+            'vhosts': {
+                'travelynx': {
+                    'domain': metadata.get('travelynx/domain'),
+                    'locations': {
+                        '/': {
+                            'target': 'http://127.0.0.1:22020',
+                        },
+                        '/static': {
+                            'root': '/opt/travelynx/public',
+                        },
+                        '/service-worker.js': {
+                            'root': '/opt/travelynx/public',
+                        },
+                    },
+                    'website_check_path': '/login',
+                    'website_check_string': 'travelynx',
+                },
+            },
+        },
+    }
diff --git a/nodes/rx300.py b/nodes/rx300.py
index fdfbccb..2246716 100644
--- a/nodes/rx300.py
+++ b/nodes/rx300.py
@@ -115,6 +115,7 @@ nodes['rx300'] = {
         },
         'jenkins-ci': {
             'install_ssh_key': True,
+            'domain': 'jenkins.franzi.business',
         },
         'miniflux': {
             'domain': 'rss.franzi.business',
@@ -123,7 +124,9 @@ nodes['rx300'] = {
             'vhosts': {
                 'element-web': {'ssl': '_.franzi.business'},
                 'gitea': {'ssl': '_.franzi.business'},
+                'jenkins-ci': {'ssl': '_.franzi.business'},
                 'miniflux': {'ssl': '_.franzi.business'},
+                'travelynx': {'ssl': '_.franzi.business'},
                 'franzi.business': {
                     'webroot': '/var/www/franzi.business/_site/',
                     'ssl': '_.franzi.business',
@@ -156,17 +159,6 @@ nodes['rx300'] = {
                         },
                     },
                 },
-                'jenkins': {
-                    'domain': 'jenkins.franzi.business',
-                    'ssl': '_.franzi.business',
-                    'locations': {
-                        '/': {
-                            'target': 'http://localhost:22010/',
-                        },
-                    },
-                    'website_check_path': '/login',
-                    'website_check_string': 'Welcome to Jenkins',
-                },
                 'unicornsden-redirect': {
                     'domain': 'unicornsden.franzi.business',
                     'ssl': '_.franzi.business',
@@ -185,21 +177,6 @@ nodes['rx300'] = {
                         'mode': '0755',
                     },
                 },
-                'travelynx': {
-                    'domain': 'travelynx.franzi.business',
-                    'ssl': '_.franzi.business',
-                    'locations': {
-                        '/': {
-                            'target': 'http://127.0.0.1:22020',
-                        },
-                        '/static': {
-                            'root': '/opt/travelynx/public',
-                        },
-                        '/service-worker.js': {
-                            'root': '/opt/travelynx/public',
-                        },
-                    },
-                },
                 'wiki.franzi.business': {
                     'ssl': '_.franzi.business',
                     'extras': True,
@@ -246,6 +223,7 @@ nodes['rx300'] = {
         'travelynx': {
             'version': '1.20.3',
             'mail_from': 'travelynx@franzi.business',
+            'domain': 'travelynx.franzi.business',
         },
         'users': {
             'kunsi': {