From 1de9984497115176f16c9aa45da733f9cc47b088 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Thu, 10 Dec 2020 22:14:04 +0100 Subject: [PATCH 1/5] Add pottwal.n39.eu to inventory --- inventory | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inventory b/inventory index c20bb0a..3eee2f1 100644 --- a/inventory +++ b/inventory @@ -60,3 +60,6 @@ all: 3661663132343639310a613431653031626434323064313465373866666332353931313836623465 3461 + pottwal.n39.eu: + server_admin: "admin+pottwal@netz39.de" + From b2e63994022ae8c181bf2f12abe5988c2645f4c4 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Thu, 10 Dec 2020 22:15:09 +0100 Subject: [PATCH 2/5] Add basic playbook for pottwal --- pottwal.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 pottwal.yml diff --git a/pottwal.yml b/pottwal.yml new file mode 100644 index 0000000..80f5c9a --- /dev/null +++ b/pottwal.yml @@ -0,0 +1,14 @@ +- hosts: pottwal.n39.eu + become: true + + vars: + ansible_python_interpreter: /usr/bin/python3 + + docker_compose_version: "1.25.4" + docker_compose_path: /usr/local/bin/docker-compose + + roles: + - role: docker + - role: apache + + tasks: From 521d6391eaa35ea58e8c8fa3e7b59446c683266e Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Thu, 10 Dec 2020 22:15:36 +0100 Subject: [PATCH 3/5] Include pottwal playbook --- main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.yml b/main.yml index d1ae3e3..45a5f1e 100644 --- a/main.yml +++ b/main.yml @@ -36,3 +36,6 @@ - name: Tau specific setup import_playbook: tau.yml + +- name: Pottwal specific setup + import_playbook: pottwal.yml From 2dab3608f8377695bf8989913545661344ab12d4 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Fri, 11 Dec 2020 17:25:32 +0100 Subject: [PATCH 4/5] Set correct docker data root for pottwal --- pottwal.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pottwal.yml b/pottwal.yml index 80f5c9a..fb83aff 100644 --- a/pottwal.yml +++ b/pottwal.yml @@ -9,6 +9,8 @@ roles: - role: docker + vars: + docker_data_root: "/srv/docker" - role: apache tasks: From a95374c13d9ee7249e44a6263f148f66fb1e5f18 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Fri, 11 Dec 2020 17:30:55 +0100 Subject: [PATCH 5/5] Remove docker variables that are defaults from inventory --- pottwal.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pottwal.yml b/pottwal.yml index fb83aff..14bbcea 100644 --- a/pottwal.yml +++ b/pottwal.yml @@ -4,9 +4,6 @@ vars: ansible_python_interpreter: /usr/bin/python3 - docker_compose_version: "1.25.4" - docker_compose_path: /usr/local/bin/docker-compose - roles: - role: docker vars: