diff --git a/docker-compose/lldap/docker-compose.yml.j2 b/docker-compose/lldap/docker-compose.yml.j2 index 60d9494d..7b780ac7 100644 --- a/docker-compose/lldap/docker-compose.yml.j2 +++ b/docker-compose/lldap/docker-compose.yml.j2 @@ -23,13 +23,13 @@ services: GID: 1000 LLDAP_HTTP_PORT: 17170 LLDAP_HTTP_URL: http://docker10.grote.lan:17170 - LLDAP_KEY_SEED: ganz_lang + LLDAP_KEY_SEED: "{{ lookup('keepass', 'lldap_key_seed', 'password') }}" LLDAP_VERBOSE: true - LLDAP_JWT_SECRET: jwt_secret + LLDAP_JWT_SECRET: "{{ lookup('keepass', 'lldap_jwt_secret', 'password') }}" LLDAP_LDAP_BASE_DN: dc=grote,dc=lan LLDAP_USER_DN: admin - LLDAP_LDAP_USER_PASS: user_pass_geheim - LLDAP_DATABASE_URL: mysql://lldap-db-user:mysql_password@lldap-db/lldap + LLDAP_LDAP_USER_PASS: "{{ lookup('keepass', 'lldap_ldap_user_pass', 'password') }}" + LLDAP_DATABASE_URL: mysql://lldap-db-user:"{{ lookup('keepass', 'lldap_mysql_password', 'password') }}"@lldap-db/lldap LLDAP_SMTP_OPTIONS__ENABLE_PASSWORD_reset: true LLDAP_SMTP_OPTIONS__FROM: "LLDAP Admin " LLDAP_SMTP_OPTIONS__REPLY_TO: "Do not reply " @@ -48,8 +48,8 @@ services: - /etc/timezone:/etc/timezone:ro - db:/var/lib/mysql environment: - - MYSQL_ROOT_PASSWORD=mysql_root_password - - MYSQL_PASSWORD=mysql_password + - MYSQL_ROOT_PASSWORD="{{ lookup('keepass', 'lldap_mysql_root_password', 'password') }}" + - MYSQL_PASSWORD="{{ lookup('keepass', 'lldap_mysql_password', 'password') }}" - MYSQL_DATABASE=lldap - MYSQL_USER=lldap-db-user - MYSQL_INITDB_SKIP_TZINFO=1 diff --git a/host_vars/docker10.mgrote.net.yml b/host_vars/docker10.mgrote.net.yml index 6bf0a30b..a8b71a9c 100644 --- a/host_vars/docker10.mgrote.net.yml +++ b/host_vars/docker10.mgrote.net.yml @@ -15,11 +15,11 @@ lvm_groups: manage_lvm: true pvresize_to_max: true -### mgrote_mount_cifs +### mgrote_mount_cifs # löschen cifs_mounts: - name: bilder type: cifs - state: present + state: absent dest: /mnt/fileserver3_photoprism_bilder_ro src: //fileserver3.mgrote.net/bilder user: photoprism diff --git a/keepass_db.kdbx b/keepass_db.kdbx index 5f7b6982..d6ed24a3 100644 Binary files a/keepass_db.kdbx and b/keepass_db.kdbx differ