Merge branch 'master' into master
This commit is contained in:
commit
ddd033c14a
15 changed files with 40 additions and 39 deletions
|
@ -2,6 +2,7 @@
|
||||||
extends: default
|
extends: default
|
||||||
|
|
||||||
rules:
|
rules:
|
||||||
|
comments-indentation: disable
|
||||||
line-length: disable
|
line-length: disable
|
||||||
truthy:
|
truthy:
|
||||||
allowed-values:
|
allowed-values:
|
||||||
|
|
|
@ -22,6 +22,6 @@
|
||||||
ansible.builtin.lineinfile:
|
ansible.builtin.lineinfile:
|
||||||
path: /etc/pve/user.cfg
|
path: /etc/pve/user.cfg
|
||||||
regexp: "^group:Admins:"
|
regexp: "^group:Admins:"
|
||||||
line: "group:Admins:{{ users | map(attribute = 'logname') | join(\"@pam,\") }}@pam::"
|
line: "group:Admins:{{ users | map(attribute='logname') | join(\"@pam,\") }}@pam::"
|
||||||
|
|
||||||
handlers:
|
handlers:
|
||||||
|
|
|
@ -98,9 +98,9 @@
|
||||||
rule: allow
|
rule: allow
|
||||||
port: '389'
|
port: '389'
|
||||||
proto: tcp
|
proto: tcp
|
||||||
from: "{{ item }}"
|
from: "{{ item }}"
|
||||||
comment: LDAP Docker Access
|
comment: LDAP Docker Access
|
||||||
loop: "{{ docker_ip_ranges }}"
|
loop: "{{ docker_ip_ranges }}"
|
||||||
|
|
||||||
- name: Allow access to openLDAP from local docker container [2/2]
|
- name: Allow access to openLDAP from local docker container [2/2]
|
||||||
become: true
|
become: true
|
||||||
|
@ -108,9 +108,9 @@
|
||||||
rule: allow
|
rule: allow
|
||||||
port: '636'
|
port: '636'
|
||||||
proto: tcp
|
proto: tcp
|
||||||
from: "{{ item }}"
|
from: "{{ item }}"
|
||||||
comment: LDAP Docker Access
|
comment: LDAP Docker Access
|
||||||
loop: "{{ docker_ip_ranges }}"
|
loop: "{{ docker_ip_ranges }}"
|
||||||
|
|
||||||
|
|
||||||
- name: Ensure container for entities validation service is running
|
- name: Ensure container for entities validation service is running
|
||||||
|
|
|
@ -141,7 +141,7 @@
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
register: wiringPi_copy
|
register: wiringPi_copy
|
||||||
|
|
||||||
- name: Install wiringPi library # noqa 503
|
- name: Install wiringPi library # noqa: no-handler
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
state: present
|
state: present
|
||||||
deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb"
|
deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb"
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
nodered_image: nodered/node-red:3.0.1-1-18
|
nodered_image: nodered/node-red:3.0.1-1-18
|
||||||
nodered_data: "{{ data_dir }}/nodered"
|
nodered_data: "{{ data_dir }}/nodered"
|
||||||
|
|
||||||
rabbitmq_image: bitnami/rabbitmq:4.0.5
|
rabbitmq_image: bitnami/rabbitmq:4.0.6
|
||||||
rabbitmq_data: "{{ data_dir }}/rabbitmq"
|
rabbitmq_data: "{{ data_dir }}/rabbitmq"
|
||||||
|
|
||||||
pwr_meter_pulse_gw_image: netz39/power-meter-pulse-gateway:0.3.0
|
pwr_meter_pulse_gw_image: netz39/power-meter-pulse-gateway:0.3.0
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
- name: Setup the docker container for unifi-controller
|
- name: Setup the docker container for unifi-controller
|
||||||
docker_container:
|
docker_container:
|
||||||
name: unifi-controller
|
name: unifi-controller
|
||||||
image: jacobalberty/unifi:v9.0.108
|
image: jacobalberty/unifi:v9.0.114
|
||||||
state: started
|
state: started
|
||||||
restart_policy: unless-stopped
|
restart_policy: unless-stopped
|
||||||
container_default_behavior: no_defaults
|
container_default_behavior: no_defaults
|
||||||
|
@ -22,13 +22,13 @@
|
||||||
# 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)
|
||||||
- "10001:10001/udp" # Used for device discovery.
|
- "10001:10001/udp" # Used for device discovery.
|
||||||
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"
|
||||||
|
|
|
@ -94,7 +94,7 @@
|
||||||
force: no
|
force: no
|
||||||
register: wiringPi_download
|
register: wiringPi_download
|
||||||
|
|
||||||
- name: Install wiringPi library # noqa 503
|
- name: Install wiringPi library # noqa: no-handler
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
state: present
|
state: present
|
||||||
deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb"
|
deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb"
|
||||||
|
@ -140,13 +140,13 @@
|
||||||
detach: yes
|
detach: yes
|
||||||
restart_policy: unless-stopped
|
restart_policy: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "0.0.0.0:{{ spaceapi_host_port }}:8080" # Must be reached by pottwal
|
- "0.0.0.0:{{ spaceapi_host_port }}:8080" # Must be reached by pottwal
|
||||||
# - "127.0.0.1:{{ spaceapi_host_port }}:8080"
|
# - "127.0.0.1:{{ spaceapi_host_port }}:8080"
|
||||||
env:
|
env:
|
||||||
TZ: "{{ timezone }}"
|
TZ: "{{ timezone }}"
|
||||||
MQTT_BROKER: "platon.n39.eu"
|
MQTT_BROKER: "platon.n39.eu"
|
||||||
MQTT_TOPIC_STATUS: "{{ spaceapi_topic_status }}"
|
MQTT_TOPIC_STATUS: "{{ spaceapi_topic_status }}"
|
||||||
MQTT_TOPIC_LASTCHANGE: "{{ spaceapi_topic_lastchange }}"
|
MQTT_TOPIC_LASTCHANGE: "{{ spaceapi_topic_lastchange }}"
|
||||||
tags:
|
tags:
|
||||||
- spaceapi
|
- spaceapi
|
||||||
|
|
||||||
|
|
|
@ -12,23 +12,23 @@ cleanuri_amqp_vhost: "/cleanuri"
|
||||||
forgejo_host_port: 9091
|
forgejo_host_port: 9091
|
||||||
forgejo_ssh_port: 2222
|
forgejo_ssh_port: 2222
|
||||||
forgejo_domain_name: git.n39.eu
|
forgejo_domain_name: git.n39.eu
|
||||||
forgejo_image: codeberg.org/forgejo/forgejo:10.0.0
|
forgejo_image: codeberg.org/forgejo/forgejo:10.0.1
|
||||||
|
|
||||||
shlink_host_port: 8083
|
shlink_host_port: 8083
|
||||||
shlink_domain_name: sl.n39.eu
|
shlink_domain_name: sl.n39.eu
|
||||||
shlink_image: shlinkio/shlink:4.4.0
|
shlink_image: shlinkio/shlink:4.4.4
|
||||||
shlink_initial_api_key: "{{ vault_shlink_initial_api_key }}"
|
shlink_initial_api_key: "{{ vault_shlink_initial_api_key }}"
|
||||||
shlink_postgres_password: "{{ vault_shlink_postgres_password }}"
|
shlink_postgres_password: "{{ vault_shlink_postgres_password }}"
|
||||||
|
|
||||||
hedgedoc_host_port: 8084
|
hedgedoc_host_port: 8084
|
||||||
hedgedoc_domain_name: pad.n39.eu
|
hedgedoc_domain_name: pad.n39.eu
|
||||||
hedgedoc_image: quay.io/hedgedoc/hedgedoc:1.10.0
|
hedgedoc_image: quay.io/hedgedoc/hedgedoc:1.10.2
|
||||||
hedgedoc_db_image: postgres:16.4-alpine
|
hedgedoc_db_image: postgres:16.4-alpine
|
||||||
hedgedoc_postgres_password: "{{ vault_hedgedoc_postgres_password }}"
|
hedgedoc_postgres_password: "{{ vault_hedgedoc_postgres_password }}"
|
||||||
|
|
||||||
redmine_host_port: 8087
|
redmine_host_port: 8087
|
||||||
redmine_domain_name: redmine.n39.eu
|
redmine_domain_name: redmine.n39.eu
|
||||||
redmine_image: redmine:6.0.2
|
redmine_image: redmine:6.0.3
|
||||||
redmine_mysql_image: mysql:8.4
|
redmine_mysql_image: mysql:8.4
|
||||||
redmine_database: redmine
|
redmine_database: redmine
|
||||||
redmine_database_password: "{{ vault_redmine_database_password }}"
|
redmine_database_password: "{{ vault_redmine_database_password }}"
|
||||||
|
@ -42,7 +42,7 @@ influxdb_init_password: "{{ vault_influxdb_init_password }}"
|
||||||
jabber_host_port: 8086
|
jabber_host_port: 8086
|
||||||
prosody_domain_name: jabber.n39.eu
|
prosody_domain_name: jabber.n39.eu
|
||||||
prosody_image: netz39/prosody:0.11
|
prosody_image: netz39/prosody:0.11
|
||||||
prosody_web_image: joseluisq/static-web-server:2.35
|
prosody_web_image: joseluisq/static-web-server:2.36
|
||||||
prosody_config_dir: "/etc/prosody"
|
prosody_config_dir: "/etc/prosody"
|
||||||
prosody_data_dir: "{{ data_dir }}/prosody"
|
prosody_data_dir: "{{ data_dir }}/prosody"
|
||||||
|
|
||||||
|
@ -52,14 +52,14 @@ uptimekuma_image: louislam/uptime-kuma:1.23.16
|
||||||
|
|
||||||
grafana_host_port: 8089
|
grafana_host_port: 8089
|
||||||
grafana_domain_name: grafana.n39.eu
|
grafana_domain_name: grafana.n39.eu
|
||||||
grafana_image: grafana/grafana:11.4.0
|
grafana_image: grafana/grafana:11.5.2
|
||||||
grafana_admin_password: "{{ vault_grafana_admin_password }}"
|
grafana_admin_password: "{{ vault_grafana_admin_password }}"
|
||||||
|
|
||||||
homebox_host_port: 8092
|
homebox_host_port: 8092
|
||||||
homebox_domain_name: inventory.n39.eu
|
homebox_domain_name: inventory.n39.eu
|
||||||
homebox_image: ghcr.io/hay-kot/homebox:v0.10.3
|
homebox_image: ghcr.io/hay-kot/homebox:v0.10.3
|
||||||
|
|
||||||
renovate_image: renovate/renovate:39.84.0
|
renovate_image: renovate/renovate:39.161.0
|
||||||
renovate_forgejo_pat: "{{ vault_renovate_forgejo_pat }}"
|
renovate_forgejo_pat: "{{ vault_renovate_forgejo_pat }}"
|
||||||
renovate_github_pat: "{{ vault_renovate_github_pat }}"
|
renovate_github_pat: "{{ vault_renovate_github_pat }}"
|
||||||
renovate_git_user: "Renovate Bot <accounts+renovatebot@netz39.de>"
|
renovate_git_user: "Renovate Bot <accounts+renovatebot@netz39.de>"
|
||||||
|
|
|
@ -11,4 +11,3 @@ kiosk_grafana_user: "{{ vault_kiosk_grafana_user }}"
|
||||||
kiosk_grafana_pass: "{{ vault_kiosk_grafana_pass }}"
|
kiosk_grafana_pass: "{{ vault_kiosk_grafana_pass }}"
|
||||||
kiosk_mqtt_host: "mqtt.n39.eu"
|
kiosk_mqtt_host: "mqtt.n39.eu"
|
||||||
kiosk_mqtt_topic: "Netz39/Things/HackingDashboard/Screenshot"
|
kiosk_mqtt_topic: "Netz39/Things/HackingDashboard/Screenshot"
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
---
|
||||||
server_admin: "admin+wittgenstein@netz39.de"
|
server_admin: "admin+wittgenstein@netz39.de"
|
||||||
mac: "b8:27:eb:48:f1:59"
|
mac: "b8:27:eb:48:f1:59"
|
||||||
ansible_python_interpreter: /usr/bin/python3
|
ansible_python_interpreter: /usr/bin/python3
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
env:
|
env:
|
||||||
TZ: "{{ timezone }}"
|
TZ: "{{ timezone }}"
|
||||||
AMQP_HOST: "{{ cleanuri_amqp_host }}"
|
AMQP_HOST: "{{ cleanuri_amqp_host }}"
|
||||||
AMQP_USER: "{{ cleanuri_amqp_user }}"
|
AMQP_USER: "{{ cleanuri_amqp_user }}"
|
||||||
AMQP_PASS: "{{ cleanuri_amqp_pass }}"
|
AMQP_PASS: "{{ cleanuri_amqp_pass }}"
|
||||||
AMQP_VHOST: "{{ cleanuri_amqp_vhost }}"
|
AMQP_VHOST: "{{ cleanuri_amqp_vhost }}"
|
||||||
GATEWAY_RESULT_QUEUE: "{{ cleanuri_amqp_results }}"
|
GATEWAY_RESULT_QUEUE: "{{ cleanuri_amqp_results }}"
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
env:
|
env:
|
||||||
TZ: "{{ timezone }}"
|
TZ: "{{ timezone }}"
|
||||||
AMQP_HOST: "{{ cleanuri_amqp_host }}"
|
AMQP_HOST: "{{ cleanuri_amqp_host }}"
|
||||||
AMQP_USER: "{{ cleanuri_amqp_user }}"
|
AMQP_USER: "{{ cleanuri_amqp_user }}"
|
||||||
AMQP_PASS: "{{ cleanuri_amqp_pass }}"
|
AMQP_PASS: "{{ cleanuri_amqp_pass }}"
|
||||||
AMQP_VHOST: "{{ cleanuri_amqp_vhost }}"
|
AMQP_VHOST: "{{ cleanuri_amqp_vhost }}"
|
||||||
CANONIZER_TASK_QUEUE: "{{ cleanuri_amqp_canonizer }}"
|
CANONIZER_TASK_QUEUE: "{{ cleanuri_amqp_canonizer }}"
|
||||||
|
@ -69,7 +69,7 @@
|
||||||
env:
|
env:
|
||||||
TZ: "{{ timezone }}"
|
TZ: "{{ timezone }}"
|
||||||
AMQP_HOST: "{{ cleanuri_amqp_host }}"
|
AMQP_HOST: "{{ cleanuri_amqp_host }}"
|
||||||
AMQP_USER: "{{ cleanuri_amqp_user }}"
|
AMQP_USER: "{{ cleanuri_amqp_user }}"
|
||||||
AMQP_PASS: "{{ cleanuri_amqp_pass }}"
|
AMQP_PASS: "{{ cleanuri_amqp_pass }}"
|
||||||
AMQP_VHOST: "{{ cleanuri_amqp_vhost }}"
|
AMQP_VHOST: "{{ cleanuri_amqp_vhost }}"
|
||||||
EXTRACTION_TASK_QUEUE: "{{ cleanuri_amqp_retrieval }}"
|
EXTRACTION_TASK_QUEUE: "{{ cleanuri_amqp_retrieval }}"
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
dest: /etc/apt/sources.list.d/docker.list
|
dest: /etc/apt/sources.list.d/docker.list
|
||||||
register: apt_repo
|
register: apt_repo
|
||||||
|
|
||||||
- name: Update package cache # noqa 503
|
- name: Update package cache # noqa: no-handler
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
update_cache: true
|
update_cache: true
|
||||||
when: apt_repo.changed
|
when: apt_repo.changed
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
state: present
|
state: present
|
||||||
name:
|
name:
|
||||||
- nfs-kernel-server
|
- nfs-kernel-server
|
||||||
- nfs-common
|
- nfs-common
|
||||||
- parted
|
- parted
|
||||||
|
|
||||||
- name: Create a new ext4 primary partition
|
- name: Create a new ext4 primary partition
|
||||||
community.general.parted:
|
community.general.parted:
|
||||||
|
|
|
@ -8,9 +8,9 @@
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
state: present
|
state: present
|
||||||
name:
|
name:
|
||||||
- apt-transport-https
|
- apt-transport-https
|
||||||
- ca-certificates
|
- ca-certificates
|
||||||
- gnupg2
|
- gnupg2
|
||||||
|
|
||||||
### Setup APT cache for the nginx repository
|
### Setup APT cache for the nginx repository
|
||||||
#
|
#
|
||||||
|
@ -33,7 +33,7 @@
|
||||||
src: files/apt-preference-99nginx
|
src: files/apt-preference-99nginx
|
||||||
dest: /etc/apt/preferences.d/99nginx
|
dest: /etc/apt/preferences.d/99nginx
|
||||||
|
|
||||||
- name: Update package cache # noqa 503
|
- name: Update package cache # noqa: no-handler
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
update_cache: true
|
update_cache: true
|
||||||
when: apt_repo.changed
|
when: apt_repo.changed
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
state: present
|
state: present
|
||||||
name:
|
name:
|
||||||
# This version of nginx comes with the ngx_stream_core_module module
|
# This version of nginx comes with the ngx_stream_core_module module
|
||||||
- nginx
|
- nginx
|
||||||
|
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|
Loading…
Add table
Reference in a new issue