From 1045cda520524ab398eb0ad4f6d89a8389a6608e Mon Sep 17 00:00:00 2001
From: jabertwo <git@jabertwo.de>
Date: Mon, 20 May 2024 21:36:51 +0200
Subject: [PATCH] added tags docker_services (for docker compose services) and
remote (for services on hix and hex)
---
site.yml | 116 +++++++++++++++++++++++++++----------------------------
1 file changed, 58 insertions(+), 58 deletions(-)
diff --git a/site.yml b/site.yml
index 7c50784e..0ea319ec 100644
--- a/site.yml
+++ b/site.yml
@@ -20,14 +20,14 @@
- { role: common/cronapt, tags: cronapt }
- { role: common/docker, tags: docker }
- {
- role: testserver/docker_traefik, tags: traefik,
+ role: testserver/docker_traefik, tags: [ traefik, docker_services ],
servicename: traefik,
basedir: /srv/traefik,
domain: "test-warpzone.de",
domain_default: "www.test-warpzone.de",
}
- {
- role: testserver/docker_mail, tags: test_mail,
+ role: testserver/docker_mail, tags: [ test_mail, docker_services ],
servicename: mail,
basedir: "/srv/{{ servicename }}",
domain: "test-warpzone.de",
@@ -35,13 +35,13 @@
listserver: "listserver.test-warpzone.de"
}
- {
- role: testserver/docker_uffd, tags: test_uffd,
+ role: testserver/docker_uffd, tags: [ test_uffd, docker_services ],
servicename: uffd,
basedir: "/srv/{{ servicename }}",
domain: "uffd.test-warpzone.de",
}
- {
- role: testserver/docker_icinga, tags: test_icinga,
+ role: testserver/docker_icinga, tags: [ test_icinga, docker_services ],
servicename: icinga,
basedir: "/srv/{{ servicename }}",
domain: "icinga.test-warpzone.de",
@@ -49,13 +49,13 @@
mysql_port: 33306
}
- {
- role: testserver/docker_gitea, tags: gitea,
+ role: testserver/docker_gitea, tags: [ gitea, docker_services ],
servicename: "gitea",
basedir: "/srv/{{ servicename }}",
domain: "verwaltung-git.test-warpzone.de"
}
- {
- role: testserver/docker_nextcloud, tags: nextcloud,
+ role: testserver/docker_nextcloud, tags: [ nextcloud, docker_services ],
servicename: "nextcloud",
basedir: "/srv/{{ servicename }}",
domain: "verwaltung.test-warpzone.de"
@@ -97,13 +97,13 @@
- { role: common/docker, tags: docker }
- { role: common/prometheus-node, tags: prometheus-node }
- {
- role: common/docker_dockerstats, tags: dockerstats,
+ role: common/docker_dockerstats, tags: [ dockerstats, docker_services ],
servicename: dockerstats,
basedir: /srv/dockerstats,
metrics_port: 9487
}
- {
- role: common/docker_traefik, tags: traefik,
+ role: common/docker_traefik, tags: [ traefik, docker_services ],
servicename: traefik,
basedir: /srv/traefik,
domain: "warpzone.lan",
@@ -112,32 +112,32 @@
selfSignedDomain: "*.warpzone.lan"
}
- {
- role: intern/docker_esphome, tags: esphome,
+ role: intern/docker_esphome, tags: [ esphome, docker_services ],
servicename: esphome,
basedir: /srv/esphome,
domain: "esphome.warpzone.lan"
}
- {
- role: intern/docker_esphome-dev, tags: esphome-dev,
+ role: intern/docker_esphome-dev, tags: [ esphome-dev, docker_services ],
servicename: esphome-dev,
basedir: /srv/esphome-dev,
domain: "esphome-dev.warpzone.lan"
}
- {
- role: intern/docker_grafana, tags: grafana,
+ role: intern/docker_grafana, tags: [ grafana, docker_services ],
servicename: grafana,
basedir: /srv/grafana,
domain: "grafana.warpzone.lan",
mqtt_influxdb_port: 18086
}
- {
- role: intern/docker_heimdall, tags: heimdall,
+ role: intern/docker_heimdall, tags: [ heimdall, docker_services ],
servicename: heimdall,
basedir: /srv/heimdall,
domain: "services.warpzone.lan"
}
- {
- role: intern/docker_homeassistant, tags: homeassistant,
+ role: intern/docker_homeassistant, tags: [ homeassistant, docker_services ],
servicename: homeassistant,
basedir: /srv/homeassistant,
domain: "ha.warpzone.lan",
@@ -145,20 +145,20 @@
influxdb_port: 38086
}
- {
- role: intern/docker_mqtt, tags: mqtt,
+ role: intern/docker_mqtt, tags: [ mqtt, docker_services ],
servicename: mqtt,
basedir: /srv/mqtt,
mqtt_port: 1883,
influxdb_port: 18086
}
- {
- role: intern/docker_nodered, tags: nodered,
+ role: intern/docker_nodered, tags: [ nodered, docker_services ],
servicename: nodered,
basedir: /srv/nodered,
domain: "nodered.warpzone.lan"
}
- {
- role: intern/docker_omada, tags: omada,
+ role: intern/docker_omada, tags: [ omada, docker_services ],
servicename: omada,
basedir: /srv/omada,
domain: "omada.warpzone.lan",
@@ -169,13 +169,13 @@
omada_portal_https: 8843
}
- {
- role: intern/docker_tasmoadmin, tags: tasmoadmin,
+ role: intern/docker_tasmoadmin, tags: [ tasmoadmin, docker_services ],
servicename: tasmoadmin,
basedir: /srv/tasmoadmin,
domain: "tasmoadmin.warpzone.lan"
}
- {
- role: intern/docker_fridgeserver, tags: fridgeserver,
+ role: intern/docker_fridgeserver, tags: [ fridgeserver, docker_services ],
servicename: fridgeserver,
basedir: /srv/fridgeserver,
domain: "fridgeserver.warpzone.lan"
@@ -192,19 +192,19 @@
- { role: common/prometheus-node, tags: prometheus-node }
- { role: common/wireguard, tags: wireguard }
- {
- role: common/docker_dockerstats, tags: dockerstats,
+ role: common/docker_dockerstats, tags: [ dockerstats, docker_services ],
servicename: dockerstats,
basedir: /srv/dockerstats,
metrics_port: 9487
}
- {
- role: common/docker_ldap, tags: ldap,
+ role: common/docker_ldap, tags: [ ldap, docker_services ],
servicename: ldap,
basedir: /srv/ldap,
domain: "ldap.warpzone.ms"
}
- {
- role: common/docker_traefik, tags: traefik,
+ role: common/docker_traefik, tags: [ traefik, docker_services ],
servicename: traefik,
basedir: /srv/traefik,
domain: "warpzone.ms",
@@ -212,30 +212,30 @@
matrix_federation: true
}
- {
- role: common/docker_watchtower, tags: watchtower,
+ role: common/docker_watchtower, tags: [ watchtower, docker_services ],
servicename: watchtower,
basedir: /srv/watchtower,
}
- {
- role: webserver/docker_coturn, tags: coturn,
+ role: webserver/docker_coturn, tags: [ coturn, docker_services ],
servicename: "coturn",
domain: "turn.warpzone.ms"
}
- {
- role: webserver/docker_dokuwiki, tags: dokuwiki,
+ role: webserver/docker_dokuwiki, tags: [ dokuwiki, docker_services ],
servicename: "dokuwiki",
domain: "wiki.warpzone.ms",
basedir: /srv/dokuwiki,
healthchecks_url: "https://hc-ping.com/038adcfe-05bf-45b4-919b-88b69aab8844"
}
- {
- role: webserver/docker_gitlab, tags: gitlab,
+ role: webserver/docker_gitlab, tags: [ gitlab, docker_services ],
servicename: "gitlab",
domain: "gitlab.warpzone.ms",
domain_registry: "gitlab-registry.warpzone.ms"
}
- {
- role: webserver/docker_icinga, tags: icinga,
+ role: webserver/docker_icinga, tags: [ icinga, docker_services ],
servicename: icinga,
basedir: /srv/icinga,
domain: icinga.warpzone.ms,
@@ -243,19 +243,19 @@
mysql_port: 33306
}
- {
- role: webserver/docker_hackmd, tags: hackmd,
+ role: webserver/docker_hackmd, tags: [ hackmd, docker_services ],
servicename: "hackmd",
basedir: /srv/hackmd,
domain: "md.warpzone.ms"
}
- {
- role: webserver/docker_keycloak, tags: keycloak,
+ role: webserver/docker_keycloak, tags: [ keycloak, docker_services ],
servicename: "keycloak",
basedir: /srv/keycloak,
domain: "keycloak.warpzone.ms"
}
- {
- role: webserver/docker_mail, tags: mail,
+ role: webserver/docker_mail, tags: [ mail, docker_services ],
servicename: mail,
basedir: /srv/mail,
domain: "warpzone.ms",
@@ -263,37 +263,37 @@
listserver: "listserver.warpzone.ms"
}
- {
- role: webserver/docker_matterbridge, tags: matterbridge,
+ role: webserver/docker_matterbridge, tags: [ matterbridge, docker_services ],
servicename: matterbridge,
basedir: /srv/matterbridge,
domain: "www.warpzone.ms"
}
- {
- role: webserver/docker_matrix, tags: matrix,
+ role: webserver/docker_matrix, tags: [ matrix, docker_services ],
servicename: "matrix",
basedir: /srv/matrix,
domain: "matrix.warpzone.ms"
}
- {
- role: webserver/docker_vpnserver, tags: vpnserver,
+ role: webserver/docker_vpnserver, tags: [ vpnserver, docker_services ],
servicename: "vpnserver",
basedir: /srv/vpnserver,
domain: "vpn.warpzone.ms"
}
- {
- role: webserver/docker_warpapi, tags: warpapi,
+ role: webserver/docker_warpapi, tags: [ warpapi, docker_services ],
servicename: "warpapi",
basedir: /srv/warpapi,
domain: "api.warpzone.ms"
}
- {
- role: webserver/docker_wordpress, tags: wordpress,
+ role: webserver/docker_wordpress, tags: [ wordpress, docker_services ],
servicename: "wordpress",
basedir: /srv/wordpress,
domain: "www.warpzone.ms"
}
# - {
- # role: webserver/docker_workadventure, tags: workadventure,
+ # role: webserver/docker_workadventure, tags: [ workadventure, docker_services ],
# servicename: "workadventure",
# basedir: /srv/workadventure,
# domain: "workadventure.warpzone.ms"
@@ -310,24 +310,24 @@
- { role: common/openvpn, tags: openvpn }
- { role: common/prometheus-node, tags: prometheus-node }
- {
- role: common/docker_dockerstats, tags: dockerstats,
+ role: common/docker_dockerstats, tags: [ dockerstats, docker_services ],
servicename: dockerstats,
basedir: /srv/dockerstats,
metrics_port: 9487
}
- {
- role: common/docker_traefik, tags: traefik,
+ role: common/docker_traefik, tags: [ traefik, docker_services ],
servicename: traefik,
basedir: /srv/traefik,
domain: "warpzone.ms",
}
- {
- role: common/docker_watchtower, tags: watchtower,
+ role: common/docker_watchtower, tags: [ watchtower, docker_services ],
servicename: watchtower,
basedir: /srv/watchtower,
}
- {
- role: verwaltung/docker_gitea, tags: gitea,
+ role: verwaltung/docker_gitea, tags: [ gitea, docker_services ],
servicename: "gitea",
domain: "verwaltung-git.warpzone.ms"
}
@@ -335,23 +335,23 @@
role: verwaltung/cryptdata, tags: cryptdata,
}
- {
- role: verwaltung/docker_jameica, tags: jameicavnc,
+ role: verwaltung/docker_jameica, tags: [ jameicavnc, docker_services ],
servicename: "jameicavnc",
domain: "verwaltung-jameica.warpzone.ms"
}
- {
- role: verwaltung/docker_nextcloud, tags: nextcloud,
+ role: verwaltung/docker_nextcloud, tags: [ nextcloud, docker_services ],
servicename: "nextcloud",
domain: "verwaltung.warpzone.ms"
}
- {
- role: verwaltung/docker_vaultwarden, tags: vaultwarden,
+ role: verwaltung/docker_vaultwarden, tags: [ vaultwarden, docker_services ],
servicename: "vaultwarden",
basedir: /srv/vaultwarden,
domain: "vault.warpzone.ms"
}
- {
- role: verwaltung/docker_mysql, tags: mysql
+ role: verwaltung/docker_mysql, tags: [ mysql, docker_services ],
}
- {
role: verwaltung/user, tags: user
@@ -370,24 +370,24 @@
- hosts: hex
remote_user: root
roles:
- - { role: common/proxmox, tags: proxmox }
- - { role: common/cronapt, tags: cronapt }
- - { role: common/prometheus-node, tags: prometheus-node }
+ - { role: common/proxmox, tags: [ proxmox, remote ] }
+ - { role: common/cronapt, tags: [ cronapt, remote ] }
+ - { role: common/prometheus-node, tags: [ prometheus-node, remote ] }
- hosts: hix
remote_user: root
roles:
- - { role: common/cronapt, tags: cronapt }
- - { role: common/docker, tags: docker }
- - { role: common/prometheus-node, tags: prometheus-node }
+ - { role: common/cronapt, tags: [ cronapt, remote ] }
+ - { role: common/docker, tags: [ docker, remote ] }
+ - { role: common/prometheus-node, tags: [ prometheus-node, remote ] }
- {
- role: common/docker_dockerstats, tags: dockerstats,
+ role: common/docker_dockerstats, tags: [ dockerstats, docker_services, remote ],
servicename: dockerstats,
basedir: /srv/dockerstats,
metrics_port: 9487
}
- {
- role: common/docker_traefik, tags: traefik,
+ role: common/docker_traefik, tags: [ traefik, docker_services, remote ],
servicename: traefik,
basedir: /srv/traefik,
domain: "warpzone.remote",
@@ -396,47 +396,47 @@
selfSignedDomain: "*.warpzone.remote"
}
- {
- role: intern/docker_mqtt, tags: mqtt,
+ role: intern/docker_mqtt, tags: [ mqtt, docker_services, remote ],
servicename: mqtt,
basedir: /srv/mqtt,
mqtt_port: 1883,
influxdb_port: 18086
}
- {
- role: remote/docker_netdata, tags: netdata,
+ role: remote/docker_netdata, tags: [ netdata, docker_services, remote ],
servicename: netdata,
basedir: /srv/netdata,
domain: "netdata.warpzone.remote"
}
- {
- role: remote/docker_prometheus, tags: prometheus,
+ role: remote/docker_prometheus, tags: [ prometheus, docker_services, remote ],
servicename: prometheus,
basedir: /srv/prometheus,
domain: "prometheus.warpzone.remote",
prometheus_port: 9090
}
- {
- role: intern/docker_grafana, tags: grafana,
+ role: intern/docker_grafana, tags: [ grafana, docker_services, remote ],
servicename: grafana,
basedir: /srv/grafana,
domain: "grafana.warpzone.remote",
mqtt_influxdb_port: 18086
}
- {
- role: remote/docker_homeassistant, tags: homeassistant,
+ role: remote/docker_homeassistant, tags: [ homeassistant, docker_services, remote ],
servicename: homeassistant,
basedir: /srv/homeassistant,
domain: "ha.warpzone.remote",
influxdb_port: 38086
}
- {
- role: intern/docker_tasmoadmin, tags: tasmoadmin,
+ role: intern/docker_tasmoadmin, tags: [ tasmoadmin, docker_services, remote ],
servicename: tasmoadmin,
basedir: /srv/tasmoadmin,
domain: "tasmoadmin.warpzone.remote"
}
- {
- role: remote/docker_unifi, tags: unifi,
+ role: remote/docker_unifi, tags: [ unifi, docker_services, remote ],
servicename: unifi,
basedir: /srv/unifi,
domain: "unifi.warpzone.remote"
--
GitLab