From b31a6ab73ecfafcb2ffac981259b8456d98c091d Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sat, 20 May 2023 14:01:36 +0200 Subject: [PATCH] clean up docker host stuff --- ansible/roles/cyberchef/tasks/main.yml | 3 --- ansible/roles/forgejo/tasks/main.yml | 6 ------ ansible/roles/freshrss/tasks/main.yml | 3 --- ansible/roles/hedgedoc/tasks/main.yml | 3 --- ansible/roles/inbucket/tasks/main.yml | 3 --- ansible/roles/jitsi/tasks/main.yml | 3 --- ansible/roles/kms/tasks/main.yml | 3 --- ansible/roles/mastodon/tasks/main.yml | 3 --- ansible/roles/overleaf/tasks/main.yml | 3 --- ansible/roles/pihole/tasks/main.yml | 3 --- ansible/roles/radicale/tasks/main.yml | 13 ++----------- ansible/roles/seafile/tasks/main.yml | 3 --- ansible/roles/shephard/tasks/main.yml | 3 --- ansible/roles/static/tasks/main.yml | 3 --- ansible/roles/swarm_dashboard/tasks/main.yml | 3 --- ansible/roles/traefik/tasks/main.yml | 8 +------- 16 files changed, 3 insertions(+), 63 deletions(-) diff --git a/ansible/roles/cyberchef/tasks/main.yml b/ansible/roles/cyberchef/tasks/main.yml index e1afc90..553f2e8 100644 --- a/ansible/roles/cyberchef/tasks/main.yml +++ b/ansible/roles/cyberchef/tasks/main.yml @@ -3,6 +3,3 @@ name: cyberchef compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/forgejo/tasks/main.yml b/ansible/roles/forgejo/tasks/main.yml index 40c2ddc..0e47f9e 100644 --- a/ansible/roles/forgejo/tasks/main.yml +++ b/ansible/roles/forgejo/tasks/main.yml @@ -4,9 +4,6 @@ data: "{{ lookup('template', '{{ role_path }}/app.ini.j2') }}" use_ssh_client: true rolling_versions: true - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost register: config - name: Deploy Docker stack @@ -14,6 +11,3 @@ name: forgejo compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/freshrss/tasks/main.yml b/ansible/roles/freshrss/tasks/main.yml index c9c0e82..ac6c8bd 100644 --- a/ansible/roles/freshrss/tasks/main.yml +++ b/ansible/roles/freshrss/tasks/main.yml @@ -3,6 +3,3 @@ name: freshrss compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/hedgedoc/tasks/main.yml b/ansible/roles/hedgedoc/tasks/main.yml index 3c46a3e..e3ca514 100644 --- a/ansible/roles/hedgedoc/tasks/main.yml +++ b/ansible/roles/hedgedoc/tasks/main.yml @@ -3,6 +3,3 @@ name: hedgedoc compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/inbucket/tasks/main.yml b/ansible/roles/inbucket/tasks/main.yml index 04b894b..ffcad7e 100644 --- a/ansible/roles/inbucket/tasks/main.yml +++ b/ansible/roles/inbucket/tasks/main.yml @@ -3,6 +3,3 @@ name: inbucket compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/jitsi/tasks/main.yml b/ansible/roles/jitsi/tasks/main.yml index f2dfb4a..1e46217 100644 --- a/ansible/roles/jitsi/tasks/main.yml +++ b/ansible/roles/jitsi/tasks/main.yml @@ -3,6 +3,3 @@ name: jitsi compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/kms/tasks/main.yml b/ansible/roles/kms/tasks/main.yml index 7443e6b..9e1738c 100644 --- a/ansible/roles/kms/tasks/main.yml +++ b/ansible/roles/kms/tasks/main.yml @@ -3,6 +3,3 @@ name: kms compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/mastodon/tasks/main.yml b/ansible/roles/mastodon/tasks/main.yml index b0d92fd..531e13e 100644 --- a/ansible/roles/mastodon/tasks/main.yml +++ b/ansible/roles/mastodon/tasks/main.yml @@ -3,6 +3,3 @@ name: mastodon compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/overleaf/tasks/main.yml b/ansible/roles/overleaf/tasks/main.yml index 1026d56..fc3a917 100644 --- a/ansible/roles/overleaf/tasks/main.yml +++ b/ansible/roles/overleaf/tasks/main.yml @@ -3,6 +3,3 @@ name: overleaf compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/pihole/tasks/main.yml b/ansible/roles/pihole/tasks/main.yml index 7a2eb2c..999eb7d 100644 --- a/ansible/roles/pihole/tasks/main.yml +++ b/ansible/roles/pihole/tasks/main.yml @@ -3,6 +3,3 @@ name: pihole compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/radicale/tasks/main.yml b/ansible/roles/radicale/tasks/main.yml index f3461d8..eb07f13 100644 --- a/ansible/roles/radicale/tasks/main.yml +++ b/ansible/roles/radicale/tasks/main.yml @@ -1,23 +1,17 @@ - name: Create radicale config docker_config: name: radicale_config - data_src: "{{ role_path }}/radicale.conf" + data: "{{ lookup('file', '{{ role_path }}/radicale.conf') }}" use_ssh_client: true rolling_versions: true - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost register: config - name: Create radicale users docker_config: name: radicale_users - data_src: "{{ role_path }}/users" + data: "{{ lookup('file', '{{ role_path }}/users') }}" use_ssh_client: true rolling_versions: true - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost register: users - name: Deploy Docker stack @@ -25,6 +19,3 @@ name: radicale compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/seafile/tasks/main.yml b/ansible/roles/seafile/tasks/main.yml index 4b67a9a..c63c02d 100644 --- a/ansible/roles/seafile/tasks/main.yml +++ b/ansible/roles/seafile/tasks/main.yml @@ -3,6 +3,3 @@ name: seafile compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/shephard/tasks/main.yml b/ansible/roles/shephard/tasks/main.yml index feea0f7..41bf642 100644 --- a/ansible/roles/shephard/tasks/main.yml +++ b/ansible/roles/shephard/tasks/main.yml @@ -3,6 +3,3 @@ name: shephard compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/static/tasks/main.yml b/ansible/roles/static/tasks/main.yml index 4e82a2e..11bf22b 100644 --- a/ansible/roles/static/tasks/main.yml +++ b/ansible/roles/static/tasks/main.yml @@ -3,6 +3,3 @@ name: static compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/swarm_dashboard/tasks/main.yml b/ansible/roles/swarm_dashboard/tasks/main.yml index 223c4e8..bb1f97c 100644 --- a/ansible/roles/swarm_dashboard/tasks/main.yml +++ b/ansible/roles/swarm_dashboard/tasks/main.yml @@ -3,6 +3,3 @@ name: swarm_dashboard compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost diff --git a/ansible/roles/traefik/tasks/main.yml b/ansible/roles/traefik/tasks/main.yml index 41d57cb..88af962 100644 --- a/ansible/roles/traefik/tasks/main.yml +++ b/ansible/roles/traefik/tasks/main.yml @@ -6,12 +6,9 @@ - name: Create Docker config docker_config: name: traefik_services - data_src: "{{ role_path }}/services.yml" + data: "{{ lookup('file', '{{ role_path }}/services.yml') }}" use_ssh_client: true rolling_versions: true - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost register: services - name: Deploy Docker stack @@ -19,6 +16,3 @@ name: forgejo compose: - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" - environment: - DOCKER_HOST: ssh://root@maestro.dmz - delegate_to: localhost