From 4a263e3a0d19c2309b32b48fcc417a804a128ff4 Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Fri, 18 Nov 2022 08:39:00 +0100 Subject: [PATCH 1/6] :rotating_light: Fix "too many blank lines" warnings yamllint warned: host-pottwal.yml 98:1 error too many blank lines (3 > 2) (empty-lines) host-tau.yml 173:1 error too many blank lines (1 > 0) (empty-lines) --- host-pottwal.yml | 1 - host-tau.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/host-pottwal.yml b/host-pottwal.yml index d2c9271..5a88ba5 100644 --- a/host-pottwal.yml +++ b/host-pottwal.yml @@ -95,7 +95,6 @@ TZ: "{{ timezone }}" - - name: Ensure container for shlink is running docker_container: name: shlink diff --git a/host-tau.yml b/host-tau.yml index 147ee7c..d640cde 100644 --- a/host-tau.yml +++ b/host-tau.yml @@ -170,4 +170,3 @@ - "53:53/udp" env: TZ: "{{ timezone }}" - From 69d98b461df33ba1cbae0fb3d87aad33051db2fc Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Fri, 18 Nov 2022 08:42:06 +0100 Subject: [PATCH 2/6] :rotating_light: Fix "wrong indentation" warnings yamllint warned: host-krypton.yml 32:9 error wrong indentation: expected 10 but found 8 (indentation) --- host-krypton.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host-krypton.yml b/host-krypton.yml index e260480..045204f 100644 --- a/host-krypton.yml +++ b/host-krypton.yml @@ -29,7 +29,7 @@ vars: dehydrated_contact_email: "{{ server_admin }}" dehydrated_domains: - - name: entities-validation.svc.n39.eu + - name: entities-validation.svc.n39.eu - role: penguineer.dehydrated_cron tasks: From 54426e75aa235a1be3a91f67623c3a10d79e7f56 Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Fri, 18 Nov 2022 08:43:48 +0100 Subject: [PATCH 3/6] :rotating_light: Fix new-line-at-end-of-file warnings yamllint warned: setup-ssh.yml 24:29 error no new line character at the end of file (new-line-at-end-of-file) host_vars/pottwal.n39.eu/vars.yml 41:61 error no new line character at the end of file (new-line-at-end-of-file) host_vars/unicorn.n39.eu/vars.yml 1:40 error no new line character at the end of file (new-line-at-end-of-file) --- host_vars/pottwal.n39.eu/vars.yml | 2 +- host_vars/unicorn.n39.eu/vars.yml | 2 +- setup-ssh.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/host_vars/pottwal.n39.eu/vars.yml b/host_vars/pottwal.n39.eu/vars.yml index 1139a67..e01460f 100644 --- a/host_vars/pottwal.n39.eu/vars.yml +++ b/host_vars/pottwal.n39.eu/vars.yml @@ -38,4 +38,4 @@ uptimekuma_host_port: 8085 grafana_host_port: 8089 grafana_domain_name: grafana.n39.eu -grafana_admin_password: "{{ vault_grafana_admin_password }}" \ No newline at end of file +grafana_admin_password: "{{ vault_grafana_admin_password }}" diff --git a/host_vars/unicorn.n39.eu/vars.yml b/host_vars/unicorn.n39.eu/vars.yml index 467d832..0855361 100644 --- a/host_vars/unicorn.n39.eu/vars.yml +++ b/host_vars/unicorn.n39.eu/vars.yml @@ -1 +1 @@ -server_admin: "admin+unicorn@netz39.de" \ No newline at end of file +server_admin: "admin+unicorn@netz39.de" diff --git a/setup-ssh.yml b/setup-ssh.yml index 2d8c594..e5297a3 100644 --- a/setup-ssh.yml +++ b/setup-ssh.yml @@ -21,4 +21,4 @@ insertbefore: BOF regexp: '^Include' line: Include config.d/n39_config - delegate_to: localhost \ No newline at end of file + delegate_to: localhost From d37b6cea82389b5d4e2f08bf239285f8ad4ac35f Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Fri, 18 Nov 2022 08:45:55 +0100 Subject: [PATCH 4/6] :rotating_light: Fix "trailing spaces" warnings yamllint complained: host-pottwal.yml 415:1 error trailing spaces (trailing-spaces) --- host-pottwal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host-pottwal.yml b/host-pottwal.yml index 5a88ba5..efdb0ec 100644 --- a/host-pottwal.yml +++ b/host-pottwal.yml @@ -412,7 +412,7 @@ GF_SECURITY_ADMIN_PASSWORD: "{{ grafana_admin_password }}" GF_USERS_ALLOW_SIGN_UP: "false" GF_INSTALL_PLUGINS: "flant-statusmap-panel,ae3e-plotly-panel" - + - name: Setup proxy site grafana.n39.eu include_role: name: setup_http_site_proxy From ec55d5970b74886fca3d017d0de090a8f7cd5ceb Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Fri, 18 Nov 2022 08:58:19 +0100 Subject: [PATCH 5/6] :rotating_light: yamllint: Ignore line-length warnings We have quite some long lines where it makes no sense to split them. Those warnings distract more than they help. --- .yamllint | 1 + 1 file changed, 1 insertion(+) diff --git a/.yamllint b/.yamllint index da54cad..2522155 100644 --- a/.yamllint +++ b/.yamllint @@ -2,6 +2,7 @@ extends: default rules: + line-length: disable truthy: allowed-values: - 'true' From 97c5a75b6df8b180ed622de3210cf89f6e2ab0db Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Fri, 18 Nov 2022 09:02:35 +0100 Subject: [PATCH 6/6] :rotating_light: Fix "missing document start" warnings yamllint warned: host_vars/hobbes.n39.eu/vars.yml 1:1 warning missing document start "---" (document-start) host_vars/krypton.n39.eu/vars.yml 1:1 warning missing document start "---" (document-start) host_vars/localhost/vars.yml 1:1 warning missing document start "---" (document-start) host_vars/platon.n39.eu/vars.yml 1:1 warning missing document start "---" (document-start) host_vars/pottwal.n39.eu/vars.yml 1:1 warning missing document start "---" (document-start) host_vars/radon.n39.eu/vars.yml 1:1 warning missing document start "---" (document-start) host_vars/tau.netz39.de/vars.yml 1:1 warning missing document start "---" (document-start) host_vars/unicorn.n39.eu/vars.yml 1:1 warning missing document start "---" (document-start) --- host_vars/hobbes.n39.eu/vars.yml | 1 + host_vars/krypton.n39.eu/vars.yml | 1 + host_vars/localhost/vars.yml | 1 + host_vars/platon.n39.eu/vars.yml | 1 + host_vars/pottwal.n39.eu/vars.yml | 1 + host_vars/radon.n39.eu/vars.yml | 1 + host_vars/tau.netz39.de/vars.yml | 1 + host_vars/unicorn.n39.eu/vars.yml | 1 + 8 files changed, 8 insertions(+) diff --git a/host_vars/hobbes.n39.eu/vars.yml b/host_vars/hobbes.n39.eu/vars.yml index ad3650e..39f5c6f 100644 --- a/host_vars/hobbes.n39.eu/vars.yml +++ b/host_vars/hobbes.n39.eu/vars.yml @@ -1,3 +1,4 @@ +--- server_admin: "admin+hobbes@netz39.de" mac: "b8:27:eb:f9:43:43" kiosk_user: pi diff --git a/host_vars/krypton.n39.eu/vars.yml b/host_vars/krypton.n39.eu/vars.yml index 51abc0c..9fbed9c 100644 --- a/host_vars/krypton.n39.eu/vars.yml +++ b/host_vars/krypton.n39.eu/vars.yml @@ -1,2 +1,3 @@ +--- server_admin: "admin+krypton@netz39.de" ldap_admin_password: "{{ vault_ldap_admin_password }}" diff --git a/host_vars/localhost/vars.yml b/host_vars/localhost/vars.yml index cd3c13d..fd4d599 100644 --- a/host_vars/localhost/vars.yml +++ b/host_vars/localhost/vars.yml @@ -1,3 +1,4 @@ +--- grafana_users: - name: Netz39 email: accounts+grafana@netz39.de diff --git a/host_vars/platon.n39.eu/vars.yml b/host_vars/platon.n39.eu/vars.yml index 2f04ab2..294efed 100644 --- a/host_vars/platon.n39.eu/vars.yml +++ b/host_vars/platon.n39.eu/vars.yml @@ -1,3 +1,4 @@ +--- server_admin: "admin+platon@netz39.de" mac: "b8:27:eb:8f:98:2f" gatekeeper_user: pi diff --git a/host_vars/pottwal.n39.eu/vars.yml b/host_vars/pottwal.n39.eu/vars.yml index e01460f..c70ce80 100644 --- a/host_vars/pottwal.n39.eu/vars.yml +++ b/host_vars/pottwal.n39.eu/vars.yml @@ -1,3 +1,4 @@ +--- server_admin: "admin+pottwal@netz39.de" ansible_python_interpreter: /usr/bin/python3 data_dir: "/srv/data" diff --git a/host_vars/radon.n39.eu/vars.yml b/host_vars/radon.n39.eu/vars.yml index db62d9e..fc9bff6 100644 --- a/host_vars/radon.n39.eu/vars.yml +++ b/host_vars/radon.n39.eu/vars.yml @@ -1,3 +1,4 @@ +--- server_admin: "admin+radon@netz39.de" pwr_meter_amqp_user: "pwr-meter" pwr_meter_amqp_pass: "{{ vault_pwr_meter_amqp_pass }}" diff --git a/host_vars/tau.netz39.de/vars.yml b/host_vars/tau.netz39.de/vars.yml index ac0c976..7fb2b4d 100644 --- a/host_vars/tau.netz39.de/vars.yml +++ b/host_vars/tau.netz39.de/vars.yml @@ -1,2 +1,3 @@ +--- server_admin: "admin+tau@netz39.de" mysql_root_pw: "{{ vault_mysql_root_pw }}" diff --git a/host_vars/unicorn.n39.eu/vars.yml b/host_vars/unicorn.n39.eu/vars.yml index 0855361..9a7141f 100644 --- a/host_vars/unicorn.n39.eu/vars.yml +++ b/host_vars/unicorn.n39.eu/vars.yml @@ -1 +1,2 @@ +--- server_admin: "admin+unicorn@netz39.de"