From be759e25cd35b0d3a8e493babbfc5a9ec8f7cf5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Sat, 25 Mar 2023 13:30:15 +0100 Subject: [PATCH 1/4] Add to husbite * Add prometheus, radicale, syncthing, woodpecker, focalboard, docker registry browser and adguard --- group_vars/mash_servers | 79 +++++++++++++++++++++++++++++++++++++++++ requirements.yml | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/group_vars/mash_servers b/group_vars/mash_servers index 3ceb85f..c813d53 100644 --- a/group_vars/mash_servers +++ b/group_vars/mash_servers @@ -1267,6 +1267,30 @@ hubsite_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResol # Services ########## +# Adguard home +hubsite_service_adguard_home_enabled: "{{ adguard_home_enabled }}" +hubsite_service_adguard_home_name: Adguard Home +hubsite_service_adguard_home_url: "https://{{ adguard_home_hostname }}{{ adguard_home_path_prefix }}" +hubsite_service_adguard_home_logo_location: "{{ role_path }}/assets/shield.png" +hubsite_service_adguard_home_description: "A DNS based adblocker" +hubsite_service_adguard_home_priority: 1000 + +# Docker Registry Browser +hubsite_service_docker_registry_browser_enabled: "{{ docker_registry_browser_enabled }}" +hubsite_service_docker_registry_browser_name: Docker Registry Browser +hubsite_service_docker_registry_browser_url: "https://{{ docker_registry_browser_hostname }}{{ docker_registry_browser_path_prefix }}" +hubsite_service_docker_registry_browser_logo_location: "{{ role_path }}/assets/docker.png" +hubsite_service_docker_registry_browser_description: "Browse docker images" +hubsite_service_docker_registry_browser_priority: 1000 + +# Focalboard +hubsite_service_focalboard_enabled: "{{ focalboard_enabled }}" +hubsite_service_focalboard_name: Focalboard +hubsite_service_focalboard_url: "https://{{ focalboard_hostname }}{{ focalboard_path_prefix }}" +hubsite_service_focalboard_logo_location: "{{ role_path }}/assets/focalboard.png" +hubsite_service_focalboard_description: "A git service" +hubsite_service_focalboard_priority: 1000 + # Gitea hubsite_service_gitea_enabled: "{{ gitea_enabled }}" hubsite_service_gitea_name: Gitea @@ -1275,6 +1299,15 @@ hubsite_service_gitea_logo_location: "{{ role_path }}/assets/gitea.png" hubsite_service_gitea_description: "A git service" hubsite_service_gitea_priority: 1000 +# Grafana +hubsite_service_grafana_enabled: "{{ grafana_enabled }}" +hubsite_service_grafana_name: Grafana +hubsite_service_grafana_url: "https://{{ grafana_hostname }}{{ grafana_path_prefix }}" +hubsite_service_grafana_logo_location: "{{ role_path }}/assets/grafana.png" +hubsite_service_grafana_description: "Check how your server is doing" +hubsite_service_grafana_priority: 1000 + + # Miniflux hubsite_service_miniflux_enabled: "{{ miniflux_enabled }}" hubsite_service_miniflux_name: Miniflux @@ -1299,6 +1332,30 @@ hubsite_service_peertube_logo_location: "{{ role_path }}/assets/peertube.png" hubsite_service_peertube_description: "Watch and upload videos" hubsite_service_peertube_priority: 1000 +# Prometheus +hubsite_service_prometheus_enabled: "{{ prometheus_enabled }}" +hubsite_service_prometheus_name: prometheus +hubsite_service_prometheus_url: "https://{{ prometheus_hostname }}{{ prometheus_path_prefix }}" +hubsite_service_prometheus_logo_location: "{{ role_path }}/assets/prometheus.png" +hubsite_service_prometheus_description: "Collect monitoring data" +hubsite_service_prometheus_priority: 1000 + +# Radicale +hubsite_service_radicale_enabled: "{{ radicale_enabled }}" +hubsite_service_radicale_name: Radicale +hubsite_service_radicale_url: "https://{{ radicale_hostname }}{{ radicale_path_prefix }}" +hubsite_service_radicale_logo_location: "{{ role_path }}/assets/radicale.png" +hubsite_service_radicale_description: "" +hubsite_service_radicale_priority: 1000 + +# Syncthing +hubsite_service_syncthing_enabled: "{{ syncthing_enabled }}" +hubsite_service_syncthing_name: Syncthing +hubsite_service_syncthing_url: "https://{{ syncthing_hostname }}{{ syncthing_path_prefix }}" +hubsite_service_syncthing_logo_location: "{{ role_path }}/assets/syncthing.png" +hubsite_service_syncthing_description: "" +hubsite_service_syncthing_priority: 1000 + # Uptime Kuma hubsite_service_uptime_kuma_enabled: "{{ uptime_kuma_enabled }}" hubsite_service_uptime_kuma_name: Uptime Kuma @@ -1316,19 +1373,41 @@ hubsite_service_vaultwarden_logo_location: "{{ role_path }}/assets/vaultwarden.p hubsite_service_vaultwarden_description: "Securely access your passwords" hubsite_service_vaultwarden_priority: 1000 +# Woodpecker CI +hubsite_service_woodpecker_ci_enabled: "{{ woodpecker_ci_enabled }}" +hubsite_service_woodpecker_ci_name: Woodpecker CI +hubsite_service_woodpecker_ci_url: "https://{{ woodpecker_ci_hostname }}{{ woodpecker_ci_path_prefix }}" +hubsite_service_woodpecker_ci_logo_location: "{{ role_path }}/assets/woodpecker.png" +hubsite_service_woodpecker_ci_description: "Securely access your passwords" +hubsite_service_woodpecker_ci_priority: 1000 + hubsite_service_list_auto: | {{ + ([{'name': hubsite_service_adguard_home_name, 'url': hubsite_service_adguard_home_url, 'logo_location': hubsite_service_adguard_home_logo_location, 'description': hubsite_service_adguard_home_description, 'priority': hubsite_service_adguard_home_priority}] if hubsite_service_adguard_home_enabled else []) + + + ([{'name': hubsite_service_focalboard_name, 'url': hubsite_service_focalboard_url, 'logo_location': hubsite_service_focalboard_logo_location, 'description': hubsite_service_focalboard_description, 'priority': hubsite_service_focalboard_priority}] if hubsite_service_focalboard_enabled else []) + + ([{'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_grafana_name, 'url': hubsite_service_grafana_url, 'logo_location': hubsite_service_grafana_logo_location, 'description': hubsite_service_grafana_description, 'priority': hubsite_service_grafana_priority}] if hubsite_service_grafana_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_prometheus_name, 'url': hubsite_service_prometheus_url, 'logo_location': hubsite_service_prometheus_logo_location, 'description': hubsite_service_prometheus_description, 'priority': hubsite_service_prometheus_priority}] if hubsite_service_prometheus_enabled else []) + + + ([{'name': hubsite_service_radicale_name, 'url': hubsite_service_radicale_url, 'logo_location': hubsite_service_radicale_logo_location, 'description': hubsite_service_radicale_description, 'priority': hubsite_service_radicale_priority}] if hubsite_service_radicale_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_syncthing_name, 'url': hubsite_service_syncthing_url, 'logo_location': hubsite_service_syncthing_logo_location, 'description': hubsite_service_syncthing_description, 'priority': hubsite_service_syncthing_priority}] if hubsite_service_syncthing_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 []) + + + ([{'name': hubsite_service_woodpecker_ci_name, 'url': hubsite_service_woodpecker_ci_url, 'logo_location': hubsite_service_woodpecker_ci_logo_location, 'description': hubsite_service_woodpecker_ci_description, 'priority': hubsite_service_woodpecker_ci_priority}] if hubsite_service_woodpecker_ci_enabled else []) }} ######################################################################## diff --git a/requirements.yml b/requirements.yml index 7ee6e6a..a7d1b16 100644 --- a/requirements.yml +++ b/requirements.yml @@ -130,7 +130,7 @@ - src: git+https://github.com/moan0s/hubsite.git name: hubsite - version: da6fed398a9dd0761db941cb903b53277c341cc6 + version: 6b20c472d36ce5765dc44675d42cce74cbcbd0fe - src: git+https://github.com/moan0s/role-firezone.git name: firezone From 2be8286d07bf67b5af26d79f8801641415af4c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Sat, 25 Mar 2023 14:49:55 +0100 Subject: [PATCH 2/4] Remove Prometheus It currently does not expose the web gui --- group_vars/mash_servers | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/group_vars/mash_servers b/group_vars/mash_servers index c813d53..c8a81a0 100644 --- a/group_vars/mash_servers +++ b/group_vars/mash_servers @@ -1332,14 +1332,6 @@ hubsite_service_peertube_logo_location: "{{ role_path }}/assets/peertube.png" hubsite_service_peertube_description: "Watch and upload videos" hubsite_service_peertube_priority: 1000 -# Prometheus -hubsite_service_prometheus_enabled: "{{ prometheus_enabled }}" -hubsite_service_prometheus_name: prometheus -hubsite_service_prometheus_url: "https://{{ prometheus_hostname }}{{ prometheus_path_prefix }}" -hubsite_service_prometheus_logo_location: "{{ role_path }}/assets/prometheus.png" -hubsite_service_prometheus_description: "Collect monitoring data" -hubsite_service_prometheus_priority: 1000 - # Radicale hubsite_service_radicale_enabled: "{{ radicale_enabled }}" hubsite_service_radicale_name: Radicale @@ -1397,8 +1389,6 @@ hubsite_service_list_auto: | + ([{'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_prometheus_name, 'url': hubsite_service_prometheus_url, 'logo_location': hubsite_service_prometheus_logo_location, 'description': hubsite_service_prometheus_description, 'priority': hubsite_service_prometheus_priority}] if hubsite_service_prometheus_enabled else []) - + ([{'name': hubsite_service_radicale_name, 'url': hubsite_service_radicale_url, 'logo_location': hubsite_service_radicale_logo_location, 'description': hubsite_service_radicale_description, 'priority': hubsite_service_radicale_priority}] if hubsite_service_radicale_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 []) From 7cc031e5e62eae6dbaa03c6d22ebb86eec355323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Sat, 25 Mar 2023 14:50:35 +0100 Subject: [PATCH 3/4] Correct woordpecker hostname --- group_vars/mash_servers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/mash_servers b/group_vars/mash_servers index c8a81a0..329561a 100644 --- a/group_vars/mash_servers +++ b/group_vars/mash_servers @@ -1368,7 +1368,7 @@ hubsite_service_vaultwarden_priority: 1000 # Woodpecker CI hubsite_service_woodpecker_ci_enabled: "{{ woodpecker_ci_enabled }}" hubsite_service_woodpecker_ci_name: Woodpecker CI -hubsite_service_woodpecker_ci_url: "https://{{ woodpecker_ci_hostname }}{{ woodpecker_ci_path_prefix }}" +hubsite_service_woodpecker_ci_url: "https://{{ devture_woodpecker_ci_server_hostname }}" hubsite_service_woodpecker_ci_logo_location: "{{ role_path }}/assets/woodpecker.png" hubsite_service_woodpecker_ci_description: "Securely access your passwords" hubsite_service_woodpecker_ci_priority: 1000 From 8ea629324603a7a4dd7563dc0aff81ac9766a7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Sat, 25 Mar 2023 15:10:31 +0100 Subject: [PATCH 4/4] Add proper descriptions --- group_vars/mash_servers | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/group_vars/mash_servers b/group_vars/mash_servers index 329561a..03b5dc4 100644 --- a/group_vars/mash_servers +++ b/group_vars/mash_servers @@ -1272,7 +1272,7 @@ hubsite_service_adguard_home_enabled: "{{ adguard_home_enabled }}" hubsite_service_adguard_home_name: Adguard Home hubsite_service_adguard_home_url: "https://{{ adguard_home_hostname }}{{ adguard_home_path_prefix }}" hubsite_service_adguard_home_logo_location: "{{ role_path }}/assets/shield.png" -hubsite_service_adguard_home_description: "A DNS based adblocker" +hubsite_service_adguard_home_description: "A network-wide DNS software for blocking ads & tracking" hubsite_service_adguard_home_priority: 1000 # Docker Registry Browser @@ -1288,7 +1288,7 @@ hubsite_service_focalboard_enabled: "{{ focalboard_enabled }}" hubsite_service_focalboard_name: Focalboard hubsite_service_focalboard_url: "https://{{ focalboard_hostname }}{{ focalboard_path_prefix }}" hubsite_service_focalboard_logo_location: "{{ role_path }}/assets/focalboard.png" -hubsite_service_focalboard_description: "A git service" +hubsite_service_focalboard_description: "An open source, self-hosted alternative to Trello, Notion, and Asana." hubsite_service_focalboard_priority: 1000 # Gitea @@ -1337,7 +1337,7 @@ hubsite_service_radicale_enabled: "{{ radicale_enabled }}" hubsite_service_radicale_name: Radicale hubsite_service_radicale_url: "https://{{ radicale_hostname }}{{ radicale_path_prefix }}" hubsite_service_radicale_logo_location: "{{ role_path }}/assets/radicale.png" -hubsite_service_radicale_description: "" +hubsite_service_radicale_description: "Sync contacts and calendars" hubsite_service_radicale_priority: 1000 # Syncthing @@ -1345,7 +1345,7 @@ hubsite_service_syncthing_enabled: "{{ syncthing_enabled }}" hubsite_service_syncthing_name: Syncthing hubsite_service_syncthing_url: "https://{{ syncthing_hostname }}{{ syncthing_path_prefix }}" hubsite_service_syncthing_logo_location: "{{ role_path }}/assets/syncthing.png" -hubsite_service_syncthing_description: "" +hubsite_service_syncthing_description: "Sync your files" hubsite_service_syncthing_priority: 1000 # Uptime Kuma @@ -1370,7 +1370,7 @@ hubsite_service_woodpecker_ci_enabled: "{{ woodpecker_ci_enabled }}" hubsite_service_woodpecker_ci_name: Woodpecker CI hubsite_service_woodpecker_ci_url: "https://{{ devture_woodpecker_ci_server_hostname }}" hubsite_service_woodpecker_ci_logo_location: "{{ role_path }}/assets/woodpecker.png" -hubsite_service_woodpecker_ci_description: "Securely access your passwords" +hubsite_service_woodpecker_ci_description: "Check you CI" hubsite_service_woodpecker_ci_priority: 1000 hubsite_service_list_auto: |