CCCHH/ansible-infra
CCCHH/ansible-infra
3
0
Fork 0
Code Issues 5 Pull requests Wiki Activity

Use new secrets path for z9 vm-secrets

Browse source
This commit is contained in:
June 2023-08-04 13:53:22 +02:00 committed by julian
parent 3d238d9f63
commit 2825c5089f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inventories/z9/host_vars/zigbee2mqtt.yaml
View file

@ -1,5 +1,5 @@
zigbee2mqtt__version: "1.32.1" zigbee2mqtt__version: "1.32.1"
zigbee2mqtt__network_key: "{{ lookup('community.general.passwordstore', 'noc/vm-secrets/zigbee2mqtt/network_key', create=false, missing='error') }}" zigbee2mqtt__network_key: "{{ lookup('community.general.passwordstore', 'noc/vm-secrets/z9/zigbee2mqtt/network_key', create=false, missing='error') }}"
zigbee2mqtt__initial_config: "{{ lookup('ansible.builtin.template', 'z9/configs/zigbee2mqtt/zigbee2mqtt/configuration.yaml.j2') }}" zigbee2mqtt__initial_config: "{{ lookup('ansible.builtin.template', 'z9/configs/zigbee2mqtt/zigbee2mqtt/configuration.yaml.j2') }}"
certbot__version_spec: "" certbot__version_spec: ""

2
playbooks/templates/z9/configs/engelsystem/compose.yaml.j2
View file

@ -22,7 +22,7 @@ services:
MAIL_PORT: 465 MAIL_PORT: 465
MAIL_ENCRYPTION: tls MAIL_ENCRYPTION: tls
MAIL_USERNAME: aes MAIL_USERNAME: aes
MAIL_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/engelsystem/MAIL_PASSWORD", create=false, missing="error") }} MAIL_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/z9/engelsystem/MAIL_PASSWORD", create=false, missing="error") }}
ports: ports:
- "5080:80" - "5080:80"
networks: networks:

6
playbooks/templates/z9/configs/keycloak/compose.yaml.j2
View file

@ -46,11 +46,11 @@ services:
- keycloak - keycloak
environment: environment:
KEYCLOAK_ADMIN: admin KEYCLOAK_ADMIN: admin
KEYCLOAK_ADMIN_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/keycloak/KEYCLOAK_ADMIN_PASSWORD", create=false, missing="error") }} KEYCLOAK_ADMIN_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/z9/keycloak/KEYCLOAK_ADMIN_PASSWORD", create=false, missing="error") }}
KC_DB: postgres KC_DB: postgres
KC_DB_URL_HOST: db KC_DB_URL_HOST: db
KC_DB_USERNAME: keycloak KC_DB_USERNAME: keycloak
KC_DB_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/keycloak/KC_DB_PASSWORD", create=false, missing="error") }} KC_DB_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/z9/keycloak/KC_DB_PASSWORD", create=false, missing="error") }}
KC_HOSTNAME: id.ccchh.net KC_HOSTNAME: id.ccchh.net
KC_HOSTNAME_STRICT_BACKCHANNEL: true KC_HOSTNAME_STRICT_BACKCHANNEL: true
KC_HOSTNAME_ADMIN: keycloak-admin.ccchh.net KC_HOSTNAME_ADMIN: keycloak-admin.ccchh.net
@ -67,7 +67,7 @@ services:
- "./database:/var/lib/postgresql/data" - "./database:/var/lib/postgresql/data"
environment: environment:
POSTGRES_USER: keycloak POSTGRES_USER: keycloak
POSTGRES_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/keycloak/POSTGRES_PASSWORD", create=false, missing="error") }} POSTGRES_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/z9/keycloak/POSTGRES_PASSWORD", create=false, missing="error") }}
POSTGRES_DB: keycloak POSTGRES_DB: keycloak
networks: networks: