From 14dde77134dd6de868c3bfaf9c747812ed3e2374 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Mon, 21 Jul 2025 08:56:23 +0200 Subject: [PATCH] Implemented correct sphinx id --- group_vars/all/09_ports.yml | 2 +- group_vars/all/10_networks.yml | 2 +- roles/web-app-port-ui/templates/menu/footer.yml.j2 | 6 +++--- roles/web-app-sphinx/config/main.yml | 2 +- roles/web-app-sphinx/vars/main.yml | 2 +- roles/web-svc-simpleicons/templates/server.js.j2 | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/group_vars/all/09_ports.yml b/group_vars/all/09_ports.yml index c6b56124..d862b436 100644 --- a/group_vars/all/09_ports.yml +++ b/group_vars/all/09_ports.yml @@ -57,7 +57,7 @@ ports: web-app-lam: 8033 web-app-phpmyadmin: 8034 web-app-snipe-it: 8035 - sphinx: 8036 + web-app-sphinx: 8036 phpldapadmin: 8037 fusiondirectory: 8038 presentation: 8039 diff --git a/group_vars/all/10_networks.yml b/group_vars/all/10_networks.yml index 286ba414..e3bcf33f 100644 --- a/group_vars/all/10_networks.yml +++ b/group_vars/all/10_networks.yml @@ -70,7 +70,7 @@ defaults_networks: subnet: 192.168.102.192/28 web-app-discourse: subnet: 192.168.102.208/28 - sphinx: + web-app-sphinx: subnet: 192.168.102.224/28 web-app-lam: subnet: 192.168.103.0/28 diff --git a/roles/web-app-port-ui/templates/menu/footer.yml.j2 b/roles/web-app-port-ui/templates/menu/footer.yml.j2 index 97ca635d..46548d18 100644 --- a/roles/web-app-port-ui/templates/menu/footer.yml.j2 +++ b/roles/web-app-port-ui/templates/menu/footer.yml.j2 @@ -3,14 +3,14 @@ children: # - link: support -{% if "sphinx" in group_names %} +{% if "web-app-sphinx" in group_names %} - name: Documentation description: Access our comprehensive documentation and support resources to help you get the most out of the software. icon: class: fas fa-book - url: https://{{domains | get_domain('sphinx')}} - iframe: {{ applications | get_app_conf('sphinx','features.port-ui-desktop',True) }} + url: https://{{domains | get_domain('web-app-sphinx')}} + iframe: {{ applications | get_app_conf('web-app-sphinx','features.port-ui-desktop',True) }} {% endif %} diff --git a/roles/web-app-sphinx/config/main.yml b/roles/web-app-sphinx/config/main.yml index 7038d850..07a28fd9 100644 --- a/roles/web-app-sphinx/config/main.yml +++ b/roles/web-app-sphinx/config/main.yml @@ -1,7 +1,7 @@ features: matomo: true css: true - port-ui-desktop: true + port-ui-desktop: true csp: flags: script-src: diff --git a/roles/web-app-sphinx/vars/main.yml b/roles/web-app-sphinx/vars/main.yml index 0ec382fa..b22ad026 100644 --- a/roles/web-app-sphinx/vars/main.yml +++ b/roles/web-app-sphinx/vars/main.yml @@ -1 +1 @@ -application_id: "sphinx" \ No newline at end of file +application_id: "web-app-sphinx" \ No newline at end of file diff --git a/roles/web-svc-simpleicons/templates/server.js.j2 b/roles/web-svc-simpleicons/templates/server.js.j2 index 43ca6c6c..5932d97f 100644 --- a/roles/web-svc-simpleicons/templates/server.js.j2 +++ b/roles/web-svc-simpleicons/templates/server.js.j2 @@ -15,7 +15,7 @@ function getExportName(slug) { // Root: redirect to your documentation app.get('/', (req, res) => { - res.redirect('{{ domains | get_url('sphinx', web_protocol) }}/{{ application_id | rel_role_path_by_application_id }}/README.html'); + res.redirect('{{ domains | get_url('web-app-sphinx', web_protocol) }}/{{ application_id | rel_role_path_by_application_id }}/README.html'); }); // GET /:slug.svg