Merge pull request 'fix-ansible-lint-warnings' (!93) from fix-yaml-lint-warnings into master

Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/93
Reviewed-by: tux <tux@netz39.de>
This commit is contained in:
Stefan Haun 2022-10-25 14:36:50 +00:00
commit ccd9fa3714
29 changed files with 38 additions and 38 deletions

View file

@ -28,6 +28,6 @@ To set up a new HTTPS vhost, the following steps need to be taken:
2. Create an external CNAME from this domain to `dyndns.n39.eu`.
3. Create an internal DNS entry in the [Descartes DNS config](https://gitea.n39.eu/Netz39_Admin/config.descartes/src/branch/prepare/dns_dhcp.txt). This is usually an alias on an existing server.
4. Add the entry to the [holmium playbook](holmium.yml).
5. Set up Dehydrated and vhost on the target host, e.g. using `setup-http-site-proxy`.
5. Set up Dehydrated and vhost on the target host, e.g. using `setup_http_site_proxy`.
Do not forget to execute all playbooks with relevant changes.

View file

@ -6,7 +6,7 @@
ansible_python_interpreter: /usr/bin/python3
roles:
- role: nginx-https-ingress
- role: nginx_https_ingress
vars:
ingress:
- server: kant

View file

@ -24,7 +24,7 @@
vars:
docker_data_root: "/srv/docker"
- role: apache
- role: apache-letsencrypt # Uses configuration from dehydrated setup
- role: apache_letsencrypt # Uses configuration from dehydrated setup
- role: ansible-role-dehydrated
vars:
dehydrated_contact_email: "{{ server_admin }}"
@ -61,13 +61,13 @@
pull: true
env:
LDAP_LOG_LEVEL: "256"
LDAP_ORGANISATION: "{{ldap_org}}"
LDAP_DOMAIN: "{{ldap_domain}}"
LDAP_BASE_DN: "{{ldap_base_dn}}"
LDAP_ORGANISATION: "{{ ldap_org }}"
LDAP_DOMAIN: "{{ ldap_domain }}"
LDAP_BASE_DN: "{{ ldap_base_dn }}"
LDAP_READONLY_USER: "false"
LDAP_ADMIN_PASSWORD: "{{ldap_admin_password}}"
# LDAP_CONFIG_PASSWORD: "{{ldap_config_password}}"
LDAP_ADMIN_PASSWORD: "{{ ldap_admin_password }}"
# LDAP_CONFIG_PASSWORD: "{{ ldap_config_password }}"
LDAP_RFC2307BIS_SCHEMA: "true"
@ -127,7 +127,7 @@
- name: Setup proxy site entities-validation.svc.n39.eu
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: entities-validation.svc.n39.eu
proxy_port: "{{ entities_validation_svc_host_port }}"

View file

@ -138,7 +138,7 @@
force: no
register: wiringPi_download
- name: Install wiringPi library
- name: Install wiringPi library # noqa 503
ansible.builtin.apt:
state: present
deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb"
@ -277,7 +277,7 @@
- name: Copy sounds
ansible.builtin.copy:
src: "files/platon/{{item}}"
src: "files/platon/{{ item }}"
dest: "/usr/local/share/asterisk/sounds/n39/"
owner: root
group: root

View file

@ -34,7 +34,7 @@
vars:
docker_data_root: "/srv/docker"
- role: apache
- role: apache-letsencrypt # Uses configuration from dehydrated setup
- role: apache_letsencrypt # Uses configuration from dehydrated setup
- role: ansible-role-dehydrated
vars:
dehydrated_contact_email: "{{ server_admin }}"
@ -52,7 +52,7 @@
- name: influx.n39.eu
- name: uptime.n39.eu
- role: penguineer.dehydrated_cron
- role: dd24-dyndns-cron
- role: dd24_dyndns_cron
# variables are set in the inventory
- role: cleanuri
vars:
@ -101,7 +101,7 @@
- name: Setup proxy site gitea.n39.eu
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: "gitea.n39.eu"
proxy_port: "{{ gitea_host_port }}"
@ -135,7 +135,7 @@
- name: Setup proxy site {{ shlink_domain_name }}
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: "{{ shlink_domain_name }}"
proxy_port: "{{ shlink_host_port }}"
@ -186,7 +186,7 @@
- name: Setup proxy site {{ prosody_domain_name }}
# point to static website for now
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: "{{ prosody_domain_name }}"
proxy_port: "{{ jabber_host_port }}"
@ -259,7 +259,7 @@
- name: Setup proxy site pad.n39.eu
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: pad.n39.eu
proxy_port: "{{ hedgedoc_host_port }}"
@ -291,7 +291,7 @@
- name: Setup proxy site influx.n39.eu
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: influx.n39.eu
proxy_port: "{{ influxdb_host_port }}"
@ -326,7 +326,7 @@
detach: yes
env:
MYSQL_ROOT_PASSWORD: "{{ redmine_database_password }}"
MYSQL_DATABASE: "{{redmine_database }}"
MYSQL_DATABASE: "{{ redmine_database }}"
volumes:
- "{{ data_dir }}/redmine/mysql:/var/lib/mysql"
networks:
@ -354,7 +354,7 @@
- name: Setup proxy site redmine.n39.eu
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: redmine.n39.eu
proxy_port: "{{ redmine_host_port }}"
@ -381,7 +381,7 @@
- name: Setup proxy site uptime.n39.eu
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: uptime.n39.eu
proxy_port: "{{ uptimekuma_host_port }}"

View file

@ -26,7 +26,7 @@
vars:
docker_data_root: "/srv/docker"
- role: apache
- role: apache-letsencrypt # Uses configuration from dehydrated setup
- role: apache_letsencrypt # Uses configuration from dehydrated setup
- role: ansible-role-dehydrated
vars:
dehydrated_contact_email: "{{ server_admin }}"
@ -102,7 +102,7 @@
- name: Setup proxy site nodered.n39.eu
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: "nodered.n39.eu"
proxy_port: 9002
@ -137,7 +137,7 @@
- name: Setup proxy site rabbitmq.n39.eu
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: "rabbitmq.n39.eu"
proxy_port: 15672
@ -162,7 +162,7 @@
- name: Setup proxy site pwr-meter-pulse-gw-19i.svc.n39.eu
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: "pwr-meter-pulse-gw-19i.svc.n39.eu"
proxy_port: 9003
@ -182,7 +182,7 @@
- name: Setup proxy site brotherql-web.n39.eu
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: brotherql-web.n39.eu
proxy_port: "{{ brotherql_host_port }}"

View file

@ -1,3 +1,3 @@
# Defaults for role apache-letsencrypt
# Defaults for role apache_letsencrypt
---
dehydrated_location: "/usr/local/etc/dehydrated"

View file

@ -1,4 +1,4 @@
# Handlers for role apache-letsencrypt
# Handlers for role apache_letsencrypt
---
- name: restart apache2
service:

View file

@ -1,4 +1,4 @@
# Tasks for role apache-letsencrypt
# Tasks for role apache_letsencrypt
---
- name: Create configuration for access to dehydrated location
ansible.builtin.template:

View file

@ -4,7 +4,7 @@
## Dependencies
This role uses the [setup-http-site-proxy](../setup-http-site-proxy) role.
This role uses the [setup_http_site_proxy](../setup_http_site_proxy) role.
## Use

View file

@ -15,7 +15,7 @@
- name: Setup proxy site for the CleanURI WebUI
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: "{{ cleanuri_ui_domain }}"
proxy_port: "{{ cleanuri_ui_host_port }}"
@ -73,7 +73,7 @@
- name: Setup proxy site the CleanURI API Gateway
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: "{{ cleanuri_api_domain }}"
proxy_port: "{{ cleanuri_api_host_port }}"

View file

@ -34,7 +34,7 @@
dest: /etc/apt/sources.list.d/docker.list
register: apt_repo
- name: Update package cache
- name: Update package cache # noqa 503
ansible.builtin.apt:
update_cache: true
when: apt_repo.changed

View file

@ -33,7 +33,7 @@
src: files/apt-preference-99nginx
dest: /etc/apt/preferences.d/99nginx
- name: Update package cache
- name: Update package cache # noqa 503
ansible.builtin.apt:
update_cache: true
when: apt_repo.changed

View file

@ -46,7 +46,7 @@
- name: Setup proxy site testredmine.netz39.de
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: testredmine.netz39.de
proxy_port: 9004
@ -69,7 +69,7 @@
- name: Setup proxy site mysql.adm.netz39.de
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: mysql.adm.netz39.de
proxy_port: 9001
@ -109,7 +109,7 @@
- name: Setup proxy site for the Docker Registry
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: "{{ docker_registry_domain }}"
proxy_port: "{{ docker_registry_port }}"
@ -147,7 +147,7 @@
- name: Setup proxy site for Dokuwiki
include_role:
name: setup-http-site-proxy
name: setup_http_site_proxy
vars:
site_name: "{{ dokuwiki_domain }}"
proxy_port: "{{ dokuwiki_port }}"