Merge pull request 'Fix trivial yamllint whitespace warnings/errors' (!97) from alex/netz39-infra-ansible:yamllint-whitespace into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/97 Reviewed-by: tux <tux@netz39.de>
This commit is contained in:
commit
3e4964302b
8 changed files with 24 additions and 24 deletions
|
@ -116,7 +116,7 @@ all:
|
||||||
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
|
||||||
gatekeeper_sip_registration: !vault |
|
gatekeeper_sip_registration: !vault |
|
||||||
$ANSIBLE_VAULT;1.1;AES256
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
31306464613437343762323366393132323231306362393762636361353230353632333834663430
|
31306464613437343762323366393132323231306362393762636361353230353632333834663430
|
||||||
3133663661396566623664323134353737643039646263320a333434326561383962643739346265
|
3133663661396566623664323134353737643039646263320a333434326561383962643739346265
|
||||||
|
|
|
@ -78,8 +78,8 @@
|
||||||
KEEP_EXISTING_CONFIG: "false"
|
KEEP_EXISTING_CONFIG: "false"
|
||||||
LDAP_REMOVE_CONFIG_AFTER_SETUP: "true"
|
LDAP_REMOVE_CONFIG_AFTER_SETUP: "true"
|
||||||
published_ports:
|
published_ports:
|
||||||
- "389:389" # unencrypted/STARTTLS
|
- "389:389" # unencrypted/STARTTLS
|
||||||
- "636:636" # SSL
|
- "636:636" # SSL
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ openldap_data }}/ldap:/var/lib/ldap"
|
- "{{ openldap_data }}/ldap:/var/lib/ldap"
|
||||||
- "{{ openldap_data }}/slapd:/etc/ldap/slapd.d"
|
- "{{ openldap_data }}/slapd:/etc/ldap/slapd.d"
|
||||||
|
|
|
@ -138,7 +138,7 @@
|
||||||
force: no
|
force: no
|
||||||
register: wiringPi_download
|
register: wiringPi_download
|
||||||
|
|
||||||
- name: Install wiringPi library # noqa 503
|
- name: Install wiringPi library # noqa 503
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
state: present
|
state: present
|
||||||
deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb"
|
deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb"
|
||||||
|
|
|
@ -326,7 +326,7 @@
|
||||||
detach: yes
|
detach: yes
|
||||||
env:
|
env:
|
||||||
MYSQL_ROOT_PASSWORD: "{{ redmine_database_password }}"
|
MYSQL_ROOT_PASSWORD: "{{ redmine_database_password }}"
|
||||||
MYSQL_DATABASE: "{{ redmine_database }}"
|
MYSQL_DATABASE: "{{ redmine_database }}"
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ data_dir }}/redmine/mysql:/var/lib/mysql"
|
- "{{ data_dir }}/redmine/mysql:/var/lib/mysql"
|
||||||
networks:
|
networks:
|
||||||
|
@ -369,7 +369,7 @@
|
||||||
- name: Ensure container for uptime-kuma is running
|
- name: Ensure container for uptime-kuma is running
|
||||||
docker_container:
|
docker_container:
|
||||||
name: uptime-kuma
|
name: uptime-kuma
|
||||||
image: "louislam/uptime-kuma:1"
|
image: "louislam/uptime-kuma:1"
|
||||||
pull: true
|
pull: true
|
||||||
state: started
|
state: started
|
||||||
detach: yes
|
detach: yes
|
||||||
|
|
|
@ -31,10 +31,10 @@
|
||||||
vars:
|
vars:
|
||||||
dehydrated_contact_email: "{{ server_admin }}"
|
dehydrated_contact_email: "{{ server_admin }}"
|
||||||
dehydrated_domains:
|
dehydrated_domains:
|
||||||
- name: nodered.n39.eu
|
- name: nodered.n39.eu
|
||||||
- name: rabbitmq.n39.eu
|
- name: rabbitmq.n39.eu
|
||||||
- name: pwr-meter-pulse-gw-19i.svc.n39.eu
|
- name: pwr-meter-pulse-gw-19i.svc.n39.eu
|
||||||
- name: brotherql-web.n39.eu
|
- name: brotherql-web.n39.eu
|
||||||
- role: penguineer.dehydrated_cron
|
- role: penguineer.dehydrated_cron
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
- src: hifis.unattended_upgrades
|
- src: hifis.unattended_upgrades
|
||||||
version: v1.12.2
|
version: v1.12.2
|
||||||
- src: git+https://github.com/adriagalin/ansible.timezone.git
|
- src: git+https://github.com/adriagalin/ansible.timezone.git
|
||||||
version: 3.0.0
|
version: 3.0.0
|
||||||
|
|
14
tau.yml
14
tau.yml
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
data_dir: "/srv/docker"
|
data_dir: "/srv/docker"
|
||||||
|
|
||||||
docker_registry_port: 5000 # this is the reg standard port
|
docker_registry_port: 5000 # this is the reg standard port
|
||||||
docker_registry_domain: "docker.n39.eu"
|
docker_registry_domain: "docker.n39.eu"
|
||||||
|
|
||||||
dokuwiki_domain: "wiki.netz39.de"
|
dokuwiki_domain: "wiki.netz39.de"
|
||||||
|
@ -98,14 +98,14 @@
|
||||||
restart_policy: unless-stopped
|
restart_policy: unless-stopped
|
||||||
detach: yes
|
detach: yes
|
||||||
ports:
|
ports:
|
||||||
- 127.0.0.1:{{ docker_registry_port }}:{{ docker_registry_port }}
|
- 127.0.0.1:{{ docker_registry_port }}:{{ docker_registry_port }}
|
||||||
env:
|
env:
|
||||||
REGISTRY_HTTP_HOST: "https://{{ docker_registry_domain }}"
|
REGISTRY_HTTP_HOST: "https://{{ docker_registry_domain }}"
|
||||||
REGISTRY_AUTH_HTPASSWD_REALM: "Netz39 Docker Registry"
|
REGISTRY_AUTH_HTPASSWD_REALM: "Netz39 Docker Registry"
|
||||||
REGISTRY_AUTH_HTPASSWD_PATH: "/auth/htpasswd"
|
REGISTRY_AUTH_HTPASSWD_PATH: "/auth/htpasswd"
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ data_dir }}/registry/data:/var/lib/registry:rw"
|
- "{{ data_dir }}/registry/data:/var/lib/registry:rw"
|
||||||
- "{{ data_dir }}/registry/auth:/auth:rw"
|
- "{{ data_dir }}/registry/auth:/auth:rw"
|
||||||
|
|
||||||
- name: Setup proxy site for the Docker Registry
|
- name: Setup proxy site for the Docker Registry
|
||||||
include_role:
|
include_role:
|
||||||
|
@ -139,11 +139,11 @@
|
||||||
restart_policy: unless-stopped
|
restart_policy: unless-stopped
|
||||||
detach: yes
|
detach: yes
|
||||||
ports:
|
ports:
|
||||||
- 127.0.0.1:{{ dokuwiki_port }}:{{ 8080 }}
|
- 127.0.0.1:{{ dokuwiki_port }}:{{ 8080 }}
|
||||||
# env: No env here, because we copy the data
|
# env: No env here, because we copy the data
|
||||||
# and the container will never be created from scratch.
|
# and the container will never be created from scratch.
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ data_dir }}/dokuwiki:/bitnami/dokuwiki:rw"
|
- "{{ data_dir }}/dokuwiki:/bitnami/dokuwiki:rw"
|
||||||
|
|
||||||
- name: Setup proxy site for Dokuwiki
|
- name: Setup proxy site for Dokuwiki
|
||||||
include_role:
|
include_role:
|
||||||
|
@ -162,4 +162,4 @@
|
||||||
restart_policy: unless-stopped
|
restart_policy: unless-stopped
|
||||||
detach: yes
|
detach: yes
|
||||||
ports:
|
ports:
|
||||||
- "53:53/udp"
|
- "53:53/udp"
|
||||||
|
|
12
unicorn.yml
12
unicorn.yml
|
@ -22,12 +22,12 @@
|
||||||
# These fixed ports are needed.
|
# These fixed ports are needed.
|
||||||
# https://help.ui.com/hc/en-us/articles/218506997-UniFi-Ports-Used
|
# https://help.ui.com/hc/en-us/articles/218506997-UniFi-Ports-Used
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080/tcp" # Device command/control
|
- "8080:8080/tcp" # Device command/control
|
||||||
- "8443:8443/tcp" # Web interface + API
|
- "8443:8443/tcp" # Web interface + API
|
||||||
- "8843:8843/tcp" # HTTPS portal
|
- "8843:8843/tcp" # HTTPS portal
|
||||||
- "8880:8880/tcp" # HTTP portal
|
- "8880:8880/tcp" # HTTP portal
|
||||||
- "3478:3478/udp" # STUN service
|
- "3478:3478/udp" # STUN service
|
||||||
- "6789:6789/tcp" # Speed Test (unifi5 only)
|
- "6789:6789/tcp" # Speed Test (unifi5 only)
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ data_dir }}/unifi-controller/data:/unifi/data"
|
- "{{ data_dir }}/unifi-controller/data:/unifi/data"
|
||||||
- "{{ data_dir }}/unifi-controller/log:/unifi/log"
|
- "{{ data_dir }}/unifi-controller/log:/unifi/log"
|
||||||
|
|
Loading…
Reference in a new issue