From e0efd68c6f4eaa37dc4017e8a5a3675cc5df665f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Sun, 19 Mar 2023 22:12:01 +0100 Subject: [PATCH] Add more fine control of service list + conventions --- docs/services/hubsite.md | 12 +++++++++--- group_vars/mash_servers | 2 +- requirements.yml | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/services/hubsite.md b/docs/services/hubsite.md index 31b69ae..8f9010e 100644 --- a/docs/services/hubsite.md +++ b/docs/services/hubsite.md @@ -9,11 +9,17 @@ hubsite_enabled: true hubsite_domain: "example.com" hubsite_title: "My services" hubsite_subtitle: "Just click on a service to use it" -# Use the `hubsite_service_list` variable to only enable services you want to show on this page +# Use the `hubsite_service_list_additional` variable to add services that are not provided by this playbook # hubsite_service_list: | # {{ -# ([{'name': 'Miniflux', 'logo_location': '{{ role_path }}/assets/miniflux.png', 'description': 'An opinionated feed reader '}] if miniflux_enabled else []) +# ([{'name': 'My blog', 'logo_location': '', 'description': 'A link to a blog not hosted by this playbook'}]) +# }} + +# If you want to explicitly control which services you want to show on this page you can overwrite +# hubsite_service_list_auto: | +# {{ +# ([{'name': 'Miniflux', 'logo_location': '{{ role_path }}/assets/miniflux.png', 'description': 'An opinionated feed reader '}]) # + -# ([{'name': 'Uptime Kuma', 'logo_location': '{{ role_path }}/assets/uptime-kuma.png', 'description': 'Check if the status of services'}] if uptime_kuma_enabled else []) +# ([{'name': 'Uptime Kuma', 'logo_location': '{{ role_path }}/assets/uptime-kuma.png', 'description': 'Check if the status of services'}]) # }} ``` diff --git a/group_vars/mash_servers b/group_vars/mash_servers index be86400..6ace469 100644 --- a/group_vars/mash_servers +++ b/group_vars/mash_servers @@ -982,7 +982,7 @@ devture_woodpecker_ci_agent_config_agent_secret: "{{ devture_woodpecker_ci_serve hubsite_enabled: false -hubsite_service_list: | +hubsite_service_list_auto: | {{ ([{'name': 'Miniflux', 'url': 'https://' + miniflux_hostname + miniflux_path_prefix, 'logo_location': '{{ role_path }}/assets/miniflux.png', 'description': 'An opinionated feed reader '}] if miniflux_enabled else []) + diff --git a/requirements.yml b/requirements.yml index 1f330d2..7d6a351 100644 --- a/requirements.yml +++ b/requirements.yml @@ -103,4 +103,4 @@ - src: git+https://github.com/moan0s/hubsite.git name: hubsite - version: ac7607b514c998779946a5ae8c98bea27e167f49 + version: 70fc142309b258cffdc1b447f7f3cca809b948d5