From 1763f42018e58c60a1e8bb49458c363f0a2bec13 Mon Sep 17 00:00:00 2001 From: otthorn Date: Thu, 7 Jan 2021 11:17:34 +0100 Subject: [PATCH 1/9] Add RP (CNAME) for zero.auro.re (just for chirac) --- host_vars/proxy-ovh.adm.auro.re.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/host_vars/proxy-ovh.adm.auro.re.yml b/host_vars/proxy-ovh.adm.auro.re.yml index 3b427e8..81f3e18 100644 --- a/host_vars/proxy-ovh.adm.auro.re.yml +++ b/host_vars/proxy-ovh.adm.auro.re.yml @@ -14,6 +14,7 @@ certbot: - status.auro.re - wiki.auro.re - www.auro.re + - zero.auro.re mail: tech.aurore@lists.crans.org certname: auro.re @@ -56,6 +57,8 @@ nginx: to: "10.128.0.150:8082" - from: privatebin.auro.re to: "10.128.0.150:8083" + - from: zero.auro.re + to: "10.128.0.150:8083" - from: pad.auro.re to: "10.128.0.150:8084" - from: cas.auro.re From 15ebe0ee4b2042b69817a3750c7426e39c23e9d8 Mon Sep 17 00:00:00 2001 From: otthorn Date: Thu, 7 Jan 2021 11:19:57 +0100 Subject: [PATCH 2/9] remove whitespace to please yaml linter --- group_vars/rives/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/rives/main.yml b/group_vars/rives/main.yml index 034b19c..a587f6a 100644 --- a/group_vars/rives/main.yml +++ b/group_vars/rives/main.yml @@ -1,6 +1,6 @@ --- apartment_block: rives -apartment_block_id: 3 +apartment_block_id: 3 router_ip_suffix: 254 From e68ef218a25c9ccd03539c2bc2c9d95b7a91dcfa Mon Sep 17 00:00:00 2001 From: otthorn Date: Thu, 7 Jan 2021 11:20:53 +0100 Subject: [PATCH 3/9] Added yaml document start --- to please yaml linter --- group_vars/all/vault.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml index b813ba3..324d814 100644 --- a/group_vars/all/vault.yml +++ b/group_vars/all/vault.yml @@ -1,3 +1,4 @@ +--- $ANSIBLE_VAULT;1.1;AES256 34336231623938346631313932323131336439623837626366646338396137633436646365386639 6332383765386235396331373836366230663563376665380a616436373136633933376435653230 From 07f9ee1fbbe417555ef4b260b40dabb3d5e9e7fb Mon Sep 17 00:00:00 2001 From: otthorn Date: Thu, 7 Jan 2021 11:21:53 +0100 Subject: [PATCH 4/9] yes -> true to please yaml linter (truthy) --- roles/isc_dhcp_server/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/isc_dhcp_server/tasks/main.yml b/roles/isc_dhcp_server/tasks/main.yml index e198163..b40b2b8 100644 --- a/roles/isc_dhcp_server/tasks/main.yml +++ b/roles/isc_dhcp_server/tasks/main.yml @@ -17,7 +17,7 @@ state: directory owner: re2o-services group: nogroup - recurse: yes + recurse: true - name: Install isc-dhcp-server apt: From 20dc6a80e62b57d27849940e46285baf7e76a41d Mon Sep 17 00:00:00 2001 From: otthorn Date: Thu, 7 Jan 2021 11:32:19 +0100 Subject: [PATCH 5/9] Please the yaml linter for document line start another because it breaks vault --- .yamllint.yml | 2 ++ group_vars/all/vault.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.yamllint.yml b/.yamllint.yml index 3a7ea3d..179129c 100644 --- a/.yamllint.yml +++ b/.yamllint.yml @@ -5,4 +5,6 @@ rules: line-length: max: 120 level: warning + document-start: + level: warning ... diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml index 324d814..b813ba3 100644 --- a/group_vars/all/vault.yml +++ b/group_vars/all/vault.yml @@ -1,4 +1,3 @@ ---- $ANSIBLE_VAULT;1.1;AES256 34336231623938346631313932323131336439623837626366646338396137633436646365386639 6332383765386235396331373836366230663563376665380a616436373136633933376435653230 From 217b210295e75cd84681af50fa601434e8e40470 Mon Sep 17 00:00:00 2001 From: otthorn Date: Thu, 7 Jan 2021 11:32:19 +0100 Subject: [PATCH 6/9] Please the yaml linter for document line start another because it breaks vault --- .yamllint.yml | 2 ++ group_vars/all/vault.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.yamllint.yml b/.yamllint.yml index 3a7ea3d..179129c 100644 --- a/.yamllint.yml +++ b/.yamllint.yml @@ -5,4 +5,6 @@ rules: line-length: max: 120 level: warning + document-start: + level: warning ... diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml index 324d814..b813ba3 100644 --- a/group_vars/all/vault.yml +++ b/group_vars/all/vault.yml @@ -1,4 +1,3 @@ ---- $ANSIBLE_VAULT;1.1;AES256 34336231623938346631313932323131336439623837626366646338396137633436646365386639 6332383765386235396331373836366230663563376665380a616436373136633933376435653230 From 8bc52f926cbc876826b19adb451a5c5c0a982220 Mon Sep 17 00:00:00 2001 From: otthorn Date: Thu, 7 Jan 2021 11:42:20 +0100 Subject: [PATCH 7/9] yaml linting error in the yamllint config file, how funny! --- .yamllint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamllint.yml b/.yamllint.yml index 179129c..6fa9379 100644 --- a/.yamllint.yml +++ b/.yamllint.yml @@ -6,5 +6,5 @@ rules: max: 120 level: warning document-start: - level: warning + level: warning ... From b7f4f23e44ee729e94fb479b1f90c497e325fc53 Mon Sep 17 00:00:00 2001 From: otthorn Date: Thu, 7 Jan 2021 11:49:21 +0100 Subject: [PATCH 8/9] finally fixed yamllint --- .yamllint.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.yamllint.yml b/.yamllint.yml index 6fa9379..c8666c8 100644 --- a/.yamllint.yml +++ b/.yamllint.yml @@ -6,5 +6,6 @@ rules: max: 120 level: warning document-start: - level: warning + ignore: | + /groups_var/all/vault.yml ... From b189bcf36f60c6ea7a4d0884ca07da4921a16c31 Mon Sep 17 00:00:00 2001 From: otthorn Date: Thu, 7 Jan 2021 12:19:10 +0100 Subject: [PATCH 9/9] remove CAS --- host_vars/proxy-ovh.adm.auro.re.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/host_vars/proxy-ovh.adm.auro.re.yml b/host_vars/proxy-ovh.adm.auro.re.yml index 81f3e18..3939e6e 100644 --- a/host_vars/proxy-ovh.adm.auro.re.yml +++ b/host_vars/proxy-ovh.adm.auro.re.yml @@ -2,7 +2,6 @@ certbot: domains: - auro.re - - cas.auro.re - codimd.auro.re - grafana.auro.re - pad.auro.re