From fd68be18de28be7a48b1fc8bc9ea6a00a8212816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Sun, 19 Mar 2023 21:10:42 +0100 Subject: [PATCH 01/15] feat: Add hubsite Hubsite is will provide you with a simple, static site that shows an overview of the available services. It is written for this project but kept externally to enable reuse --- docs/services/hubsite.md | 19 ++++++++++++++ docs/supported-services.md | 35 +++++++++++++------------ group_vars/mash_servers | 53 ++++++++++++++++++++++++++++++++++++++ requirements.yml | 4 +++ setup.yml | 2 ++ 5 files changed, 96 insertions(+), 17 deletions(-) create mode 100644 docs/services/hubsite.md diff --git a/docs/services/hubsite.md b/docs/services/hubsite.md new file mode 100644 index 0000000..e9ac9a1 --- /dev/null +++ b/docs/services/hubsite.md @@ -0,0 +1,19 @@ +# Hubsite + +Hubsite is will provide you with a simple, static site that shows an overview of the available services. + +You can use the following variables to enable & control your hubsite: + +```yaml +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 +# hubsite_service_list: | +# {{ +# ([{'name': 'Miniflux', 'logo_location': '{{ role_path }}/assets/miniflux.png', 'description': 'An opinionated feed reader '}] if miniflux_enabled else []) +# + +# ([{'name': 'Uptime Kuma', 'logo_location': '{{ role_path }}/assets/uptime-kuma.png', 'description': 'Check if the status of services'}] if uptime_kuma_enabled else []) +# }} +``` diff --git a/docs/supported-services.md b/docs/supported-services.md index a6673a4..18fc048 100644 --- a/docs/supported-services.md +++ b/docs/supported-services.md @@ -1,22 +1,23 @@ # Supported services -| Name | Description | Documentation | -| ------------------------------ | ------------------------------------- | ------------- | -| [Collabora Online](https://www.collaboraoffice.com/) | Your Private Office Suite In The Cloud | [Link](services/collabora-online.md) | -| [Docker](https://www.docker.com/) | Open-source software for deploying containerized applications | [Link](services/docker.md) | -| [Gitea](https://gitea.io/) | A painless self-hosted Git service. | [Link](services/gitea.md) | -| [Miniflux](https://miniflux.app/) | Minimalist and opinionated feed reader. | [Link](services/miniflux.md) | -| [Nextcloud](https://nextcloud.com/) | The most popular self-hosted collaboration solution for tens of millions of users at thousands of organizations across the globe. | [Link](services/nextcloud.md) | -| [PeerTube](https://joinpeertube.org/) | A tool for sharing online videos | [Link](services/peertube.md) | -| [Postgres](https://www.postgresql.org) | A powerful, open source object-relational database system | [Link](services/postgres.md) | -| [Postgres Backup](https://github.com/prodrigestivill/docker-postgres-backup-local) | A solution for backing up PostgresSQL to local filesystem with periodic backups. | [Link](services/postgres-backup.md) | -| [Radicale](https://radicale.org/) | A Free and Open-Source CalDAV and CardDAV Server (solution for hosting contacts and calendars) | [Link](services/radicale.md) | -| [Redmine](https://redmine.org/) | A flexible project management web application. | [Link](services/redmine.md) | -| [Redis](https://redis.io/) | An in-memory data store used by millions of developers as a database, cache, streaming engine, and message broker. | [Link](services/redis.md) | -| [Traefik](https://doc.traefik.io/traefik/) | A container-aware reverse-proxy server | [Link](services/traefik.md) | -| [Vaultwarden](https://github.com/dani-garcia/vaultwarden) | A lightweight unofficial and compatible implementation of the [Bitwarden](https://bitwarden.com/) password manager | [Link](services/vaultwarden.md) | -| [Uptime-kuma](https://uptime.kuma.pet/) | A fancy self-hosted monitoring tool | [Link](services/uptime-kuma.md) | -| [Woodpecker CI](https://woodpecker-ci.org/) | A simple Continuous Integration (CI) engine with great extensibility. | [Link](services/woodpecker-ci.md) | +| Name | Description | Documentation | +|------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|--------------------------------------| +| [Collabora Online](https://www.collaboraoffice.com/) | Your Private Office Suite In The Cloud | [Link](services/collabora-online.md) | +| [Docker](https://www.docker.com/) | Open-source software for deploying containerized applications | [Link](services/docker.md) | +| [Gitea](https://gitea.io/) | A painless self-hosted Git service. | [Link](services/gitea.md) | +| [Hubsite](https://github.com/moan0s/hubsite) | A simple, static site that shows an overview of the available services | [Link](services/hubsite.md) | +| [Miniflux](https://miniflux.app/) | Minimalist and opinionated feed reader. | [Link](services/miniflux.md) | +| [Nextcloud](https://nextcloud.com/) | The most popular self-hosted collaboration solution for tens of millions of users at thousands of organizations across the globe. | [Link](services/nextcloud.md) | +| [PeerTube](https://joinpeertube.org/) | A tool for sharing online videos | [Link](services/peertube.md) | +| [Postgres](https://www.postgresql.org) | A powerful, open source object-relational database system | [Link](services/postgres.md) | +| [Postgres Backup](https://github.com/prodrigestivill/docker-postgres-backup-local) | A solution for backing up PostgresSQL to local filesystem with periodic backups. | [Link](services/postgres-backup.md) | +| [Radicale](https://radicale.org/) | A Free and Open-Source CalDAV and CardDAV Server (solution for hosting contacts and calendars) | [Link](services/radicale.md) | +| [Redmine](https://redmine.org/) | A flexible project management web application. | [Link](services/redmine.md) | +| [Redis](https://redis.io/) | An in-memory data store used by millions of developers as a database, cache, streaming engine, and message broker. | [Link](services/redis.md) | +| [Traefik](https://doc.traefik.io/traefik/) | A container-aware reverse-proxy server | [Link](services/traefik.md) | +| [Vaultwarden](https://github.com/dani-garcia/vaultwarden) | A lightweight unofficial and compatible implementation of the [Bitwarden](https://bitwarden.com/) password manager | [Link](services/vaultwarden.md) | +| [Uptime-kuma](https://uptime.kuma.pet/) | A fancy self-hosted monitoring tool | [Link](services/uptime-kuma.md) | +| [Woodpecker CI](https://woodpecker-ci.org/) | A simple Continuous Integration (CI) engine with great extensibility. | [Link](services/woodpecker-ci.md) | ## Related playbooks diff --git a/group_vars/mash_servers b/group_vars/mash_servers index f6097b8..01d93e1 100644 --- a/group_vars/mash_servers +++ b/group_vars/mash_servers @@ -41,6 +41,8 @@ devture_systemd_service_manager_services_list_auto: | ([{'name': (vaultwarden_identifier + '.service'), 'priority': 2000, 'groups': ['mash', 'vaultwarden', 'vaultwarden-server']}] if vaultwarden_enabled else []) + ([{'name': (uptime_kuma_identifier + '.service'), 'priority': 2000, 'groups': ['mash', 'uptime-kuma']}] if uptime_kuma_enabled else []) + + + ([{'name': (hubsite_identifier + '.service'), 'priority': 2000, 'groups': ['mash', 'hubsite']}] if hubsite_enabled else []) }} ######################################################################## @@ -789,3 +791,54 @@ devture_woodpecker_ci_agent_config_agent_secret: "{{ devture_woodpecker_ci_serve # /woodpecker-ci-agent # # # ######################################################################## + +######################################################################## +# # +# hubsite # +# # +######################################################################## + +hubsite_enabled: false + +hubsite_service_list: | + {{ + ([{'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 []) + + + ([{'name': 'Uptime Kuma', 'url': 'https://' + uptime_kuma_hostname + uptime_kuma_path_prefix, 'logo_location': '{{ role_path }}/assets/uptime-kuma.png', 'description': 'Check if the status of services'}] if uptime_kuma_enabled else []) + + + ([{'name': 'Nextcloud', 'url': 'https://' + nextcloud_hostname + nextcloud_path_prefix, 'logo_location': '{{ role_path }}/assets/nextcloud.png', 'description': 'Sync your files & much more'}] if nextcloud_enabled else []) + + + ([{'name': 'Peertube', 'url': 'https://' + peertube_hostname + peertube_path_prefix, 'logo_location': '{{ role_path }}/assets/peertube.png', 'description': 'Watch videos '}] if peertube_enabled else []) + + + ([{'name': 'Vaultwarden', 'url': 'https://' + vaultwarden_hostname + vaultwarden_path_prefix, ' logo_location': '{{ role_path }}/assets/vaultwarden.png', 'description': 'Securly access your passwords'}] if vaultwarden_enabled else []) + + + ([{'name': 'Gitea', 'url': 'https://' + gitea_hostname + gitea_path_prefix, 'logo_location': '{{ role_path }}/assets/gitea.png', 'description': 'A git service'}] if gitea_enabled else []) + }} + +hubsite_identifier: "{{ mash_playbook_service_identifier_prefix }}hubsite" + +hubsite_base_path: "{{ mash_playbook_base_path }}/hubsite" + +hubsite_uid: "{{ mash_playbook_uid }}" +hubsite_gid: "{{ mash_playbook_gid }}" + +hubsite_systemd_required_services_list: | + {{ + (['docker.service']) + }} + +hubsite_container_additional_networks: | + {{ + ([mash_playbook_reverse_proxyable_services_additional_network] if mash_playbook_reverse_proxyable_services_additional_network else []) + }} + +hubsite_container_labels_traefik_enabled: "{{ mash_playbook_traefik_labels_enabled }}" +hubsite_container_labels_traefik_docker_network: "{{ mash_playbook_reverse_proxyable_services_additional_network }}" +hubsite_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}" +hubsite_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}" + +######################################################################## +# # +# /hubsite # +# # +######################################################################## diff --git a/requirements.yml b/requirements.yml index d4ba929..8547a83 100644 --- a/requirements.yml +++ b/requirements.yml @@ -76,3 +76,7 @@ - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-peertube.git name: peertube version: v5.0.1-0 + +- src: git+https://github.com/moan0s/hubsite.git + name: hubsite + version: ac7607b514c998779946a5ae8c98bea27e167f49 diff --git a/setup.yml b/setup.yml index 5ab8b4e..06aa016 100644 --- a/setup.yml +++ b/setup.yml @@ -52,6 +52,8 @@ - role: galaxy/miniflux + - role: galaxy/hubsite + - role: galaxy/nextcloud - role: galaxy/peertube From 9725dc41f98e1b9f2693ffb178efaaf5c86cc3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Sun, 19 Mar 2023 21:18:30 +0100 Subject: [PATCH 02/15] Revert unrelated change --- requirements.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/requirements.yml b/requirements.yml index e367200..1f330d2 100644 --- a/requirements.yml +++ b/requirements.yml @@ -93,10 +93,6 @@ name: nextcloud version: v25.0.4-1 -- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-collabora-online.git - name: collabora_online - version: v22.05.12.1.1-0 - - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-peertube.git name: peertube version: v5.0.1-0 From 2266b595b6fd5da9bcd58eaf15ce3dae4b3d8bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Sun, 19 Mar 2023 22:11:21 +0100 Subject: [PATCH 03/15] Add link to project --- docs/services/hubsite.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/services/hubsite.md b/docs/services/hubsite.md index e9ac9a1..31b69ae 100644 --- a/docs/services/hubsite.md +++ b/docs/services/hubsite.md @@ -1,6 +1,6 @@ # Hubsite -Hubsite is will provide you with a simple, static site that shows an overview of the available services. +[Hubsite](https://github.com/moan0s/hubsite) is will provide you with a simple, static site that shows an overview of the available services. You can use the following variables to enable & control your hubsite: 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 04/15] 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 From e9e42f332f8f7e1ebb12b47ed9bdfc80cb2ef518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Mon, 20 Mar 2023 08:24:35 +0100 Subject: [PATCH 05/15] Correct doc variable name --- docs/services/hubsite.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/services/hubsite.md b/docs/services/hubsite.md index 8f9010e..a426f28 100644 --- a/docs/services/hubsite.md +++ b/docs/services/hubsite.md @@ -6,7 +6,7 @@ You can use the following variables to enable & control your hubsite: ```yaml hubsite_enabled: true -hubsite_domain: "example.com" +hubsite_hostname: "example.com" hubsite_title: "My services" hubsite_subtitle: "Just click on a service to use it" # Use the `hubsite_service_list_additional` variable to add services that are not provided by this playbook From 6c4a3106a0ab8b66d475fff6c7583c93598d9387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Mon, 20 Mar 2023 09:05:48 +0100 Subject: [PATCH 06/15] Bump hubsite version --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 7d6a351..6ebc5c5 100644 --- a/requirements.yml +++ b/requirements.yml @@ -103,4 +103,4 @@ - src: git+https://github.com/moan0s/hubsite.git name: hubsite - version: 70fc142309b258cffdc1b447f7f3cca809b948d5 + version: 0a54ba45c88d11afb47477b26f4a3ff40678738b From 034ef4f83b693496ba4de51bbcf5f4c2d016e90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Mon, 20 Mar 2023 11:39:16 +0100 Subject: [PATCH 07/15] Update docs/services/hubsite.md Co-authored-by: Slavi Pantaleev --- docs/services/hubsite.md | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/services/hubsite.md b/docs/services/hubsite.md index a426f28..b878fd2 100644 --- a/docs/services/hubsite.md +++ b/docs/services/hubsite.md @@ -5,10 +5,19 @@ You can use the following variables to enable & control your hubsite: ```yaml +######################################################################## +# # +# hubsite # +# # +######################################################################## + hubsite_enabled: true -hubsite_hostname: "example.com" + +hubsite_hostname: mash.example.com + hubsite_title: "My services" hubsite_subtitle: "Just click on a service to use it" + # Use the `hubsite_service_list_additional` variable to add services that are not provided by this playbook # hubsite_service_list: | # {{ @@ -22,4 +31,8 @@ hubsite_subtitle: "Just click on a service to use it" # + # ([{'name': 'Uptime Kuma', 'logo_location': '{{ role_path }}/assets/uptime-kuma.png', 'description': 'Check if the status of services'}]) # }} -``` +######################################################################## +# # +# /hubsite # +# # +######################################################################## From bd891fb8b3fc109660ea1cbf5e626d278546ed81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Mon, 20 Mar 2023 13:50:44 +0100 Subject: [PATCH 08/15] Bump hubsite version --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 6ebc5c5..c3d611d 100644 --- a/requirements.yml +++ b/requirements.yml @@ -103,4 +103,4 @@ - src: git+https://github.com/moan0s/hubsite.git name: hubsite - version: 0a54ba45c88d11afb47477b26f4a3ff40678738b + version: 48d2fa4111afd83e2f1450b0828f4613d34814b0 From a8d495ce7b9e0753871c01d9b197166461b0795f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Mon, 20 Mar 2023 13:53:14 +0100 Subject: [PATCH 09/15] Fix table formatting --- docs/supported-services.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/supported-services.md b/docs/supported-services.md index e529c7c..23b9a2e 100644 --- a/docs/supported-services.md +++ b/docs/supported-services.md @@ -9,7 +9,7 @@ | [Docker Registry Purger](https://github.com/devture/docker-registry-purger) | A small tool used for purging a private Docker Registry's old tags | [Link](services/docker-registry-purger.md) | | [Gitea](https://gitea.io/) | A painless self-hosted Git service. | [Link](services/gitea.md) | | [Hubsite](https://github.com/moan0s/hubsite) | A simple, static site that shows an overview of the available services | [Link](services/hubsite.md) | -[Miniflux](https://miniflux.app/) | Minimalist and opinionated feed reader. | [Link](services/miniflux.md) | +| [Miniflux](https://miniflux.app/) | Minimalist and opinionated feed reader. | [Link](services/miniflux.md) | | [Nextcloud](https://nextcloud.com/) | The most popular self-hosted collaboration solution for tens of millions of users at thousands of organizations across the globe. | [Link](services/nextcloud.md) | | [PeerTube](https://joinpeertube.org/) | A tool for sharing online videos | [Link](services/peertube.md) | | [Prometheus Node Exporter](https://github.com/prometheus/node_exporter) | Exporter for machine metrics | [Link](services/prometheus-node-exporter.md) | From dfce7809b88d2c224ead028454d8a5dab81ee081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Mon, 20 Mar 2023 14:59:10 +0100 Subject: [PATCH 10/15] Custom ordering + better configuration options --- group_vars/mash_servers | 81 +++++++++++++++++++++++++++++++++-------- requirements.yml | 2 +- 2 files changed, 67 insertions(+), 16 deletions(-) diff --git a/group_vars/mash_servers b/group_vars/mash_servers index 6ace469..ec63066 100644 --- a/group_vars/mash_servers +++ b/group_vars/mash_servers @@ -982,21 +982,6 @@ devture_woodpecker_ci_agent_config_agent_secret: "{{ devture_woodpecker_ci_serve hubsite_enabled: false -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 []) - + - ([{'name': 'Uptime Kuma', 'url': 'https://' + uptime_kuma_hostname + uptime_kuma_path_prefix, 'logo_location': '{{ role_path }}/assets/uptime-kuma.png', 'description': 'Check if the status of services'}] if uptime_kuma_enabled else []) - + - ([{'name': 'Nextcloud', 'url': 'https://' + nextcloud_hostname + nextcloud_path_prefix, 'logo_location': '{{ role_path }}/assets/nextcloud.png', 'description': 'Sync your files & much more'}] if nextcloud_enabled else []) - + - ([{'name': 'Peertube', 'url': 'https://' + peertube_hostname + peertube_path_prefix, 'logo_location': '{{ role_path }}/assets/peertube.png', 'description': 'Watch videos '}] if peertube_enabled else []) - + - ([{'name': 'Vaultwarden', 'url': 'https://' + vaultwarden_hostname + vaultwarden_path_prefix, ' logo_location': '{{ role_path }}/assets/vaultwarden.png', 'description': 'Securly access your passwords'}] if vaultwarden_enabled else []) - + - ([{'name': 'Gitea', 'url': 'https://' + gitea_hostname + gitea_path_prefix, 'logo_location': '{{ role_path }}/assets/gitea.png', 'description': 'A git service'}] if gitea_enabled else []) - }} - hubsite_identifier: "{{ mash_playbook_service_identifier_prefix }}hubsite" hubsite_base_path: "{{ mash_playbook_base_path }}/hubsite" @@ -1019,6 +1004,72 @@ hubsite_container_labels_traefik_docker_network: "{{ mash_playbook_reverse_proxy hubsite_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}" hubsite_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}" +# Services +########## + +# Gitea +hubsite_service_gitea_enabled: "{{ gitea_enabled }}" +hubsite_service_gitea_name: Gitea +hubsite_service_gitea_url: "'https://{{ gitea_hostname }}{{ gitea_path_prefix }}" +hubsite_service_gitea_logo_location: "{{ role_path }}/assets/gitea.png" +hubsite_service_gitea_description: "A git service" +hubsite_service_gitea_priority: 1000 + +# Miniflux +hubsite_service_miniflux_enabled: "{{ miniflux_enabled }}" +hubsite_service_miniflux_name: Miniflux +hubsite_service_miniflux_url: "'https://{{ miniflux_hostname }}{{ miniflux_path_prefix }}" +hubsite_service_miniflux_logo_location: "{{ role_path }}/assets/miniflux.png" +hubsite_service_miniflux_description: "An opinionated feed reader" +hubsite_service_miniflux_priority: 1000 + +# Nextcloud +hubsite_service_nextcloud_enabled: "{{ nextcloud_enabled }}" +hubsite_service_nextcloud_name: Nextcloud +hubsite_service_nextcloud_url: "'https://{{ nextcloud_hostname }}{{ nextcloud_path_prefix }}" +hubsite_service_nextcloud_logo_location: "{{ role_path }}/assets/nextcloud.png" +hubsite_service_nextcloud_description: "Sync your files & much more" +hubsite_service_nextcloud_priority: 1000 + +# Peertube +hubsite_service_peertube_enabled: "{{ peertube_enabled }}" +hubsite_service_peertube_name: Peertube +hubsite_service_peertube_url: "'https://{{ peertube_hostname }}{{ peertube_path_prefix }}" +hubsite_service_peertube_logo_location: "{{ role_path }}/assets/peertube.png" +hubsite_service_peertube_description: "Watch and upload videos" +hubsite_service_peertube_priority: 1000 + +# Uptime Kuma +hubsite_service_uptime_kuma_enabled: "{{ uptime_kuma_enabled }}" +hubsite_service_uptime_kuma_name: Uptime Kuma +hubsite_service_uptime_kuma_url: "'https://{{ uptime_kuma_hostname }}{{ uptime_kuma_path_prefix }}" +hubsite_service_uptime_kuma_logo_location: "{{ role_path }}/assets/uptime-kuma.png" +hubsite_service_uptime_kuma_description: "An opinionated feed reader" +hubsite_service_uptime_kuma_priority: 1000 + +# Vaultwarden +hubsite_service_vaultwarden_enabled: "{{ vaultwarden_enabled }}" +hubsite_service_vaultwarden_name: Vaultwarden +hubsite_service_vaultwarden_url: "'https://{{ vaultwarden_hostname }}{{ vaultwarden_path_prefix }}" +hubsite_service_vaultwarden_logo_location: "{{ role_path }}/assets/vaultwarden.png" +hubsite_service_vaultwarden_description: "Securely access your passwords" +hubsite_service_vaultwarden_priority: 1000 + +hubsite_service_list_auto: | + {{ + ([{'name': hubsite_service_gitea_name, 'url': hubsite_service_gitea_url, 'logo_location': hubsite_service_gitea_logo_location, 'description': hubsite_service_gitea_description, 'priority': hubsite_service_gitea_priority}] if hubsite_service_gitea_enabled else []) + + + ([{'name': hubsite_service_miniflux_name, 'url': hubsite_service_miniflux_url, 'logo_location': hubsite_service_miniflux_logo_location, 'description': hubsite_service_miniflux_description, 'priority': hubsite_service_miniflux_priority}] if hubsite_service_miniflux_enabled else []) + + + ([{'name': hubsite_service_nextcloud_name, 'url': hubsite_service_nextcloud_url, 'logo_location': hubsite_service_nextcloud_logo_location, 'description': hubsite_service_nextcloud_description, 'priority': hubsite_service_nextcloud_priority}] if hubsite_service_nextcloud_enabled else []) + + + ([{'name': hubsite_service_peertube_name, 'url': hubsite_service_peertube_url, 'logo_location': hubsite_service_peertube_logo_location, 'description': hubsite_service_peertube_description, 'priority': hubsite_service_peertube_priority}] if hubsite_service_peertube_enabled else []) + + + ([{'name': hubsite_service_uptime_kuma_name, 'url': hubsite_service_uptime_kuma_url, 'logo_location': hubsite_service_uptime_kuma_logo_location, 'description': hubsite_service_uptime_kuma_description, 'priority': hubsite_service_uptime_kuma_priority}] if hubsite_service_uptime_kuma_enabled else []) + + + ([{'name': hubsite_service_vaultwarden_name, 'url': hubsite_service_vaultwarden_url, 'logo_location': hubsite_service_vaultwarden_logo_location, 'description': hubsite_service_vaultwarden_description, 'priority': hubsite_service_vaultwarden_priority}] if hubsite_service_vaultwarden_enabled else []) + }} + ######################################################################## # # # /hubsite # diff --git a/requirements.yml b/requirements.yml index c3d611d..82927ab 100644 --- a/requirements.yml +++ b/requirements.yml @@ -103,4 +103,4 @@ - src: git+https://github.com/moan0s/hubsite.git name: hubsite - version: 48d2fa4111afd83e2f1450b0828f4613d34814b0 + version: 8085a75f54447c47369ee60cbb56c9e27a3bccc2 From 9fa3c1346210c51ca45fa3452eb8848806f3c9bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Tue, 21 Mar 2023 09:53:56 +0100 Subject: [PATCH 11/15] Fix broken merge --- docs/supported-services.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/supported-services.md b/docs/supported-services.md index 93b1598..7e3168a 100644 --- a/docs/supported-services.md +++ b/docs/supported-services.md @@ -2,6 +2,7 @@ | Name | Description | Documentation | | ------------------------------ | ------------------------------------- | ------------- | +| [AUX](https://github.com/mother-of-all-self-hosting/ansible-role-aux) | Auxiliary file/directory management on your server via Ansible | [Link](services/aux.md) | | [Collabora Online](https://www.collaboraoffice.com/) | Your Private Office Suite In The Cloud | [Link](services/collabora-online.md) | | [Docker](https://www.docker.com/) | Open-source software for deploying containerized applications | [Link](services/docker.md) | | [Docker Registry](https://docs.docker.com/registry/) | A container image distribution registry | [Link](services/docker-registry.md) | From 1443acc492eb75ca26ff23ac308418b4b30a26ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Tue, 21 Mar 2023 15:04:21 +0100 Subject: [PATCH 12/15] Bump hubsite version Now it uses prefers-color-scheme to set the correct schema --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 7b3677d..fd34296 100644 --- a/requirements.yml +++ b/requirements.yml @@ -121,4 +121,4 @@ - src: git+https://github.com/moan0s/hubsite.git name: hubsite - version: 8085a75f54447c47369ee60cbb56c9e27a3bccc2 + version: 1de7e3e0f0538c1292cbcf7f6ab44ea7128bf31a From 1c51bec05b14943034fa51f13c54346b42e63b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Wed, 22 Mar 2023 09:09:26 +0100 Subject: [PATCH 13/15] Disable vaultwarden by default --- group_vars/mash_servers | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/group_vars/mash_servers b/group_vars/mash_servers index d8b9278..0ce8072 100644 --- a/group_vars/mash_servers +++ b/group_vars/mash_servers @@ -1228,7 +1228,8 @@ hubsite_service_uptime_kuma_description: "An opinionated feed reader" hubsite_service_uptime_kuma_priority: 1000 # Vaultwarden -hubsite_service_vaultwarden_enabled: "{{ vaultwarden_enabled }}" +# The vaultwarden service link is deactivated by default for security reasons, see: https://github.com/dani-garcia/vaultwarden/wiki/Hardening-Guide#hiding-under-a-subdir +hubsite_service_vaultwarden_enabled: false hubsite_service_vaultwarden_name: Vaultwarden hubsite_service_vaultwarden_url: "'https://{{ vaultwarden_hostname }}{{ vaultwarden_path_prefix }}" hubsite_service_vaultwarden_logo_location: "{{ role_path }}/assets/vaultwarden.png" From b9f05dcabc82b2c5bb4ac3ea9ef21db99c5e436b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Wed, 22 Mar 2023 15:59:49 +0100 Subject: [PATCH 14/15] Bump hubsite version: Font size for mobile --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index fd34296..a6368ad 100644 --- a/requirements.yml +++ b/requirements.yml @@ -121,4 +121,4 @@ - src: git+https://github.com/moan0s/hubsite.git name: hubsite - version: 1de7e3e0f0538c1292cbcf7f6ab44ea7128bf31a + version: da6fed398a9dd0761db941cb903b53277c341cc6 From 3830754102131b2facf795699c4efeaaf3bd258a Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 23 Mar 2023 07:58:46 +0200 Subject: [PATCH 15/15] Fix Hubsite URL typos --- group_vars/mash_servers | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/group_vars/mash_servers b/group_vars/mash_servers index 0ce8072..128a804 100644 --- a/group_vars/mash_servers +++ b/group_vars/mash_servers @@ -1190,7 +1190,7 @@ hubsite_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResol # Gitea hubsite_service_gitea_enabled: "{{ gitea_enabled }}" hubsite_service_gitea_name: Gitea -hubsite_service_gitea_url: "'https://{{ gitea_hostname }}{{ gitea_path_prefix }}" +hubsite_service_gitea_url: "https://{{ gitea_hostname }}{{ gitea_path_prefix }}" hubsite_service_gitea_logo_location: "{{ role_path }}/assets/gitea.png" hubsite_service_gitea_description: "A git service" hubsite_service_gitea_priority: 1000 @@ -1198,7 +1198,7 @@ hubsite_service_gitea_priority: 1000 # Miniflux hubsite_service_miniflux_enabled: "{{ miniflux_enabled }}" hubsite_service_miniflux_name: Miniflux -hubsite_service_miniflux_url: "'https://{{ miniflux_hostname }}{{ miniflux_path_prefix }}" +hubsite_service_miniflux_url: "https://{{ miniflux_hostname }}{{ miniflux_path_prefix }}" hubsite_service_miniflux_logo_location: "{{ role_path }}/assets/miniflux.png" hubsite_service_miniflux_description: "An opinionated feed reader" hubsite_service_miniflux_priority: 1000 @@ -1206,7 +1206,7 @@ hubsite_service_miniflux_priority: 1000 # Nextcloud hubsite_service_nextcloud_enabled: "{{ nextcloud_enabled }}" hubsite_service_nextcloud_name: Nextcloud -hubsite_service_nextcloud_url: "'https://{{ nextcloud_hostname }}{{ nextcloud_path_prefix }}" +hubsite_service_nextcloud_url: "https://{{ nextcloud_hostname }}{{ nextcloud_path_prefix }}" hubsite_service_nextcloud_logo_location: "{{ role_path }}/assets/nextcloud.png" hubsite_service_nextcloud_description: "Sync your files & much more" hubsite_service_nextcloud_priority: 1000 @@ -1214,7 +1214,7 @@ hubsite_service_nextcloud_priority: 1000 # Peertube hubsite_service_peertube_enabled: "{{ peertube_enabled }}" hubsite_service_peertube_name: Peertube -hubsite_service_peertube_url: "'https://{{ peertube_hostname }}{{ peertube_path_prefix }}" +hubsite_service_peertube_url: "https://{{ peertube_hostname }}{{ peertube_path_prefix }}" hubsite_service_peertube_logo_location: "{{ role_path }}/assets/peertube.png" hubsite_service_peertube_description: "Watch and upload videos" hubsite_service_peertube_priority: 1000 @@ -1222,7 +1222,7 @@ hubsite_service_peertube_priority: 1000 # Uptime Kuma hubsite_service_uptime_kuma_enabled: "{{ uptime_kuma_enabled }}" hubsite_service_uptime_kuma_name: Uptime Kuma -hubsite_service_uptime_kuma_url: "'https://{{ uptime_kuma_hostname }}{{ uptime_kuma_path_prefix }}" +hubsite_service_uptime_kuma_url: "https://{{ uptime_kuma_hostname }}{{ uptime_kuma_path_prefix }}" hubsite_service_uptime_kuma_logo_location: "{{ role_path }}/assets/uptime-kuma.png" hubsite_service_uptime_kuma_description: "An opinionated feed reader" hubsite_service_uptime_kuma_priority: 1000 @@ -1231,7 +1231,7 @@ hubsite_service_uptime_kuma_priority: 1000 # The vaultwarden service link is deactivated by default for security reasons, see: https://github.com/dani-garcia/vaultwarden/wiki/Hardening-Guide#hiding-under-a-subdir hubsite_service_vaultwarden_enabled: false hubsite_service_vaultwarden_name: Vaultwarden -hubsite_service_vaultwarden_url: "'https://{{ vaultwarden_hostname }}{{ vaultwarden_path_prefix }}" +hubsite_service_vaultwarden_url: "https://{{ vaultwarden_hostname }}{{ vaultwarden_path_prefix }}" hubsite_service_vaultwarden_logo_location: "{{ role_path }}/assets/vaultwarden.png" hubsite_service_vaultwarden_description: "Securely access your passwords" hubsite_service_vaultwarden_priority: 1000