mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-05-13 16:54:57 +02:00
Solved variable naming bugs, which exist because of big refactoring on friday
This commit is contained in:
parent
1e9a1a6564
commit
72baa9ea28
@ -58,7 +58,7 @@ ldap:
|
|||||||
# Attribut to identify the user
|
# Attribut to identify the user
|
||||||
user_id: "uid"
|
user_id: "uid"
|
||||||
# Password to access dn.bind
|
# Password to access dn.bind
|
||||||
bind_credential: "{{applications.ldap.administrator_database_password}}"
|
bind_credential: "{{applications.ldap.credentials.administrator_database_password}}"
|
||||||
server:
|
server:
|
||||||
domain: "{{applications.ldap.hostname if applications.ldap.network.docker | bool else domains.ldap}}" # Mapping for public or locale access
|
domain: "{{applications.ldap.hostname if applications.ldap.network.docker | bool else domains.ldap}}" # Mapping for public or locale access
|
||||||
port: "{{_ldap_server_port}}"
|
port: "{{_ldap_server_port}}"
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
---
|
---
|
||||||
application_id: "attendize"
|
application_id: "attendize"
|
||||||
database_type: "mariadb"
|
database_type: "mariadb"
|
||||||
database_password: "{{applications[application_id].credentials.database_password}}"
|
|
||||||
docker_repository_address: "https://github.com/Attendize/Attendize.git"
|
docker_repository_address: "https://github.com/Attendize/Attendize.git"
|
@ -1,3 +1,2 @@
|
|||||||
application_id: "coturn"
|
application_id: "coturn"
|
||||||
#database_password: "{{applications[application_id].credentials.database_password}}"
|
|
||||||
#database_type: "mariadb"
|
#database_type: "mariadb"
|
@ -1,4 +1,3 @@
|
|||||||
application_id: "friendica"
|
application_id: "friendica"
|
||||||
database_password: "{{ applications[application_id].credentials.database_password }}"
|
|
||||||
database_type: "mariadb"
|
database_type: "mariadb"
|
||||||
no_validation: "{{ applications[application_id].features.oidc }}" # Email validation is not neccessary if OIDC is active
|
no_validation: "{{ applications[application_id].features.oidc }}" # Email validation is not neccessary if OIDC is active
|
@ -2,7 +2,7 @@
|
|||||||
# https://github.com/LDAPAccountManager/lam/blob/develop/lam-packaging/docker/.env
|
# https://github.com/LDAPAccountManager/lam/blob/develop/lam-packaging/docker/.env
|
||||||
|
|
||||||
# Basic Configuration
|
# Basic Configuration
|
||||||
LAM_PASSWORD= {{applications[application_id].administrator_password}} # LAM configuration master password and password for server profile "lam
|
LAM_PASSWORD= {{applications[application_id].credentials.administrator_password}} # LAM configuration master password and password for server profile "lam
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
LAM_CONFIGURATION_DATABASE= files # configuration database (files or mysql) @todo implement mariadb
|
LAM_CONFIGURATION_DATABASE= files # configuration database (files or mysql) @todo implement mariadb
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# https://github.com/LDAPAccountManager/lam/blob/develop/lam-packaging/docker/.env
|
# https://github.com/LDAPAccountManager/lam/blob/develop/lam-packaging/docker/.env
|
||||||
|
|
||||||
# Basic Configuration
|
# Basic Configuration
|
||||||
LAM_PASSWORD= {{applications[application_id].administrator_password}} # LAM configuration master password and password for server profile "lam
|
LAM_PASSWORD= {{applications[application_id].credentials.administrator_password}} # LAM configuration master password and password for server profile "lam
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
LAM_CONFIGURATION_DATABASE= files # configuration database (files or mysql) @todo implement mariadb
|
LAM_CONFIGURATION_DATABASE= files # configuration database (files or mysql) @todo implement mariadb
|
||||||
|
@ -8,13 +8,13 @@
|
|||||||
src: "nginx.stream.conf.j2"
|
src: "nginx.stream.conf.j2"
|
||||||
dest: "{{nginx.directories.streams}}{{domains[application_id]}}.conf"
|
dest: "{{nginx.directories.streams}}{{domains[application_id]}}.conf"
|
||||||
notify: restart nginx
|
notify: restart nginx
|
||||||
when: applications.ldap.network.public | bool
|
when: applications[application_id].network.public | bool
|
||||||
|
|
||||||
- name: Remove {{domains[application_id]}}.conf if LDAP is not exposed to internet
|
- name: Remove {{domains[application_id]}}.conf if LDAP is not exposed to internet
|
||||||
file:
|
file:
|
||||||
path: "{{ nginx.directories.streams }}{{ domains[application_id] }}.conf"
|
path: "{{ nginx.directories.streams }}{{ domains[application_id] }}.conf"
|
||||||
state: absent
|
state: absent
|
||||||
when: not applications.ldap.network.public | bool
|
when: not applications[application_id].network.public | bool
|
||||||
|
|
||||||
- name: create docker network for LDAP, so that other applications can access it
|
- name: create docker network for LDAP, so that other applications can access it
|
||||||
docker_network:
|
docker_network:
|
||||||
@ -53,8 +53,8 @@
|
|||||||
include_tasks: create_nextcloud_schema.yml
|
include_tasks: create_nextcloud_schema.yml
|
||||||
vars:
|
vars:
|
||||||
ldap_server_uri: "ldap://127.0.0.1:{{ ports.localhost.ldap.ldap }}"
|
ldap_server_uri: "ldap://127.0.0.1:{{ ports.localhost.ldap.ldap }}"
|
||||||
ldap_bind_dn: "cn={{ applications.ldap.users.administrator.username }},cn=config"
|
ldap_bind_dn: "cn={{ applications[application_id].users.administrator.username }},cn=config"
|
||||||
ldap_bind_pw: "{{ applications.ldap.administrator_password }}"
|
ldap_bind_pw: "{{ applications[application_id].credentials.administrator_password }}"
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# 1) Create the LDAP entry if it does not yet exist
|
# 1) Create the LDAP entry if it does not yet exist
|
||||||
|
@ -9,7 +9,5 @@ users:
|
|||||||
administrator:
|
administrator:
|
||||||
username: "{{users.administrator.username}}" # Administrator username
|
username: "{{users.administrator.username}}" # Administrator username
|
||||||
credentials:
|
credentials:
|
||||||
# administrator_password: # CHANGE for security reasons in inventory file
|
|
||||||
# administrator_database_password: # CHANGE for security reasons in inventory file
|
|
||||||
features:
|
features:
|
||||||
ldap: true
|
ldap: true
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
---
|
---
|
||||||
application_id: "moodle"
|
application_id: "moodle"
|
||||||
database_password: "{{applications[application_id].credentials.database_password}}"
|
|
||||||
database_type: "mariadb"
|
database_type: "mariadb"
|
Loading…
x
Reference in New Issue
Block a user