Merge pull request 'yamllint: Fix some warnings' (!118) from alex/netz39-infra-ansible:yamllint into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/118 Reviewed-by: Stefan Haun <tux@netz39.de>
This commit is contained in:
commit
871038d84c
13 changed files with 14 additions and 7 deletions
|
@ -2,6 +2,7 @@
|
||||||
extends: default
|
extends: default
|
||||||
|
|
||||||
rules:
|
rules:
|
||||||
|
line-length: disable
|
||||||
truthy:
|
truthy:
|
||||||
allowed-values:
|
allowed-values:
|
||||||
- 'true'
|
- 'true'
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
vars:
|
vars:
|
||||||
dehydrated_contact_email: "{{ server_admin }}"
|
dehydrated_contact_email: "{{ server_admin }}"
|
||||||
dehydrated_domains:
|
dehydrated_domains:
|
||||||
- name: entities-validation.svc.n39.eu
|
- name: entities-validation.svc.n39.eu
|
||||||
- role: penguineer.dehydrated_cron
|
- role: penguineer.dehydrated_cron
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
|
|
|
@ -95,7 +95,6 @@
|
||||||
TZ: "{{ timezone }}"
|
TZ: "{{ timezone }}"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- name: Ensure container for shlink is running
|
- name: Ensure container for shlink is running
|
||||||
docker_container:
|
docker_container:
|
||||||
name: shlink
|
name: shlink
|
||||||
|
@ -413,7 +412,7 @@
|
||||||
GF_SECURITY_ADMIN_PASSWORD: "{{ grafana_admin_password }}"
|
GF_SECURITY_ADMIN_PASSWORD: "{{ grafana_admin_password }}"
|
||||||
GF_USERS_ALLOW_SIGN_UP: "false"
|
GF_USERS_ALLOW_SIGN_UP: "false"
|
||||||
GF_INSTALL_PLUGINS: "flant-statusmap-panel,ae3e-plotly-panel"
|
GF_INSTALL_PLUGINS: "flant-statusmap-panel,ae3e-plotly-panel"
|
||||||
|
|
||||||
- name: Setup proxy site grafana.n39.eu
|
- name: Setup proxy site grafana.n39.eu
|
||||||
include_role:
|
include_role:
|
||||||
name: setup_http_site_proxy
|
name: setup_http_site_proxy
|
||||||
|
|
|
@ -170,4 +170,3 @@
|
||||||
- "53:53/udp"
|
- "53:53/udp"
|
||||||
env:
|
env:
|
||||||
TZ: "{{ timezone }}"
|
TZ: "{{ timezone }}"
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
---
|
||||||
server_admin: "admin+hobbes@netz39.de"
|
server_admin: "admin+hobbes@netz39.de"
|
||||||
mac: "b8:27:eb:f9:43:43"
|
mac: "b8:27:eb:f9:43:43"
|
||||||
kiosk_user: pi
|
kiosk_user: pi
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
|
---
|
||||||
server_admin: "admin+krypton@netz39.de"
|
server_admin: "admin+krypton@netz39.de"
|
||||||
ldap_admin_password: "{{ vault_ldap_admin_password }}"
|
ldap_admin_password: "{{ vault_ldap_admin_password }}"
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
---
|
||||||
grafana_users:
|
grafana_users:
|
||||||
- name: Netz39
|
- name: Netz39
|
||||||
email: accounts+grafana@netz39.de
|
email: accounts+grafana@netz39.de
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
---
|
||||||
server_admin: "admin+platon@netz39.de"
|
server_admin: "admin+platon@netz39.de"
|
||||||
mac: "b8:27:eb:8f:98:2f"
|
mac: "b8:27:eb:8f:98:2f"
|
||||||
gatekeeper_user: pi
|
gatekeeper_user: pi
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
---
|
||||||
server_admin: "admin+pottwal@netz39.de"
|
server_admin: "admin+pottwal@netz39.de"
|
||||||
ansible_python_interpreter: /usr/bin/python3
|
ansible_python_interpreter: /usr/bin/python3
|
||||||
data_dir: "/srv/data"
|
data_dir: "/srv/data"
|
||||||
|
@ -38,4 +39,4 @@ uptimekuma_host_port: 8085
|
||||||
|
|
||||||
grafana_host_port: 8089
|
grafana_host_port: 8089
|
||||||
grafana_domain_name: grafana.n39.eu
|
grafana_domain_name: grafana.n39.eu
|
||||||
grafana_admin_password: "{{ vault_grafana_admin_password }}"
|
grafana_admin_password: "{{ vault_grafana_admin_password }}"
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
---
|
||||||
server_admin: "admin+radon@netz39.de"
|
server_admin: "admin+radon@netz39.de"
|
||||||
pwr_meter_amqp_user: "pwr-meter"
|
pwr_meter_amqp_user: "pwr-meter"
|
||||||
pwr_meter_amqp_pass: "{{ vault_pwr_meter_amqp_pass }}"
|
pwr_meter_amqp_pass: "{{ vault_pwr_meter_amqp_pass }}"
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
|
---
|
||||||
server_admin: "admin+tau@netz39.de"
|
server_admin: "admin+tau@netz39.de"
|
||||||
mysql_root_pw: "{{ vault_mysql_root_pw }}"
|
mysql_root_pw: "{{ vault_mysql_root_pw }}"
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
server_admin: "admin+unicorn@netz39.de"
|
---
|
||||||
|
server_admin: "admin+unicorn@netz39.de"
|
||||||
|
|
|
@ -21,4 +21,4 @@
|
||||||
insertbefore: BOF
|
insertbefore: BOF
|
||||||
regexp: '^Include'
|
regexp: '^Include'
|
||||||
line: Include config.d/n39_config
|
line: Include config.d/n39_config
|
||||||
delegate_to: localhost
|
delegate_to: localhost
|
||||||
|
|
Loading…
Reference in a new issue