diff --git a/group_vars/docker.yml b/group_vars/docker.yml index 38a76fab..83449f8a 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -28,9 +28,3 @@ to_port: 4949 protocol: tcp comment: 'munin' - ### geerlingguy.munin-node - munin_node_allowed_cidrs: [0.0.0.0/0] # weil der munin-server aus einem anderen subnet zugreift - munin_node_allowed_ips: # weil der munin-server aus einem anderen subnet zugreift - - '^127\.0\.0\.1$' - - '^::1$' - - ^0\.0\.0\.0$ diff --git a/host_vars/docker-test.grote.lan.yml b/host_vars/docker-test.grote.lan.yml index 3b34ad25..a92df759 100644 --- a/host_vars/docker-test.grote.lan.yml +++ b/host_vars/docker-test.grote.lan.yml @@ -7,3 +7,8 @@ repository_url: git.mgrote.net/mg/docker-homer repository_user: mg repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" + - name: watchtower + dir_name: docker-watchtower + repository_url: git.mgrote.net/mg/docker-watchtower + repository_user: mg + repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" diff --git a/host_vars/docker2.grote.lan.yml b/host_vars/docker2.grote.lan.yml index f653bef6..39b5fc3f 100644 --- a/host_vars/docker2.grote.lan.yml +++ b/host_vars/docker2.grote.lan.yml @@ -7,3 +7,24 @@ repository_url: git.mgrote.net/mg/docker-munin-master repository_user: mg repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" + - name: watchtower + dir_name: docker-watchtower + repository_url: git.mgrote.net/mg/docker-watchtower + repository_user: mg + repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" + - name: homer + dir_name: docker-homer + repository_url: git.mgrote.net/mg/docker-homer + repository_user: mg + repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" + - name: unifi-controller + dir_name: docker-unifi-controller + repository_url: git.mgrote.net/mg/docker-unifi-controller + repository_user: mg + repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" + ### geerlingguy.munin-node + munin_node_allowed_cidrs: [0.0.0.0/0] # weil der munin-server aus einem anderen subnet zugreift + munin_node_allowed_ips: # weil der munin-server aus einem anderen subnet zugreift + - '^127\.0\.0\.1$' + - '^::1$' + - ^0\.0\.0\.0$ diff --git a/host_vars/docker.grote.lan.yml b/host_vars/docker3.grote.lan.yml similarity index 64% rename from host_vars/docker.grote.lan.yml rename to host_vars/docker3.grote.lan.yml index f0ebda3d..19da6b81 100644 --- a/host_vars/docker.grote.lan.yml +++ b/host_vars/docker3.grote.lan.yml @@ -2,11 +2,6 @@ ### mgrote.docker-compose-deploy docker_compose_base_dir: /home/mg/docker docker_compose_projects: - - name: homer - dir_name: docker-homer - repository_url: git.mgrote.net/mg/docker-homer - repository_user: mg - repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" - name: miniflux dir_name: docker-miniflux repository_url: git.mgrote.net/mg/docker-miniflux @@ -22,21 +17,11 @@ repository_url: git.mgrote.net/mg/docker-nightscout repository_user: mg repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" - - name: photoprism - dir_name: docker-photoprism - repository_url: git.mgrote.net/mg/docker-photoprism - repository_user: mg - repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" - name: traefik dir_name: docker-traefik repository_url: git.mgrote.net/mg/docker-traefik repository_user: mg repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" - - name: unifi-controller - dir_name: docker-unifi-controller - repository_url: git.mgrote.net/mg/docker-unifi-controller - repository_user: mg - repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" - name: watchtower dir_name: docker-watchtower repository_url: git.mgrote.net/mg/docker-watchtower diff --git a/host_vars/docker4.grote.lan.yml b/host_vars/docker4.grote.lan.yml new file mode 100644 index 00000000..8f49cd8e --- /dev/null +++ b/host_vars/docker4.grote.lan.yml @@ -0,0 +1,9 @@ +--- + ### mgrote.docker-compose-deploy + docker_compose_base_dir: /home/mg/docker + docker_compose_projects: + - name: watchtower + dir_name: docker-watchtower + repository_url: git.mgrote.net/mg/docker-watchtower + repository_user: mg + repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" diff --git a/inventory b/inventory index 653de21e..12337456 100644 --- a/inventory +++ b/inventory @@ -26,8 +26,9 @@ all: ansible-test.grote.lan: docker: hosts: - docker.grote.lan: + docker3.grote.lan: docker2.grote.lan: + docker4.grote.lan: docker-test.grote.lan: vmtest: hosts: @@ -67,7 +68,6 @@ all: fileserver2.grote.lan: acng.grote.lan: ansible2.grote.lan: - docker.grote.lan: pve2.grote.lan: pve3.grote.lan: pve4.grote.lan: @@ -75,6 +75,8 @@ all: pihole2.grote.lan: ntp-server.grote.lan: docker2.grote.lan: + docker3.grote.lan: + docker4.grote.lan: test: hosts: dokuwiki-test.grote.lan: