kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-08-29 15:06:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Solved different bugs

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-07-09 11:51:42 +02:00
parent a026681553
commit e7322a239e
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/docker-compose/templates/networks.yml.j2
View File

@@ -4,7 +4,7 @@ networks:
central_{{ database_type }}:
external: true
{% endif %}
{% if applications[application_id].get('features', {}).get('ldap', false) and applications.ldap.network.docker | bool %}
{% if applications[application_id].get('features', {}).get('ldap', false) and applications.openldap.network.docker | bool %}
central_ldap:
external: true
{% endif %}

2
roles/docker-container/templates/networks.yml.j2
View File

@@ -3,7 +3,7 @@
{% if applications | is_feature_enabled('central_database',application_id) | bool and database_type is defined %}
central_{{ database_type }}:
{% endif %}
{% if applications[application_id].get('features', {}).get('ldap', false) | bool and applications.ldap.network.docker|bool %}
{% if applications[application_id].get('features', {}).get('ldap', false) | bool and applications.openldap.network.docker|bool %}
central_ldap:
{% endif %}
default:

2
roles/svc-openldap/templates/docker-compose.yml.j2
View File

@@ -6,7 +6,7 @@
{% include 'roles/docker-container/templates/base.yml.j2' %}
{% if applications[application_id].network.public | bool or applications[application_id].network.local | bool %}
ports:
- 127.0.0.1:{{ports.localhost.ldap.ldap}}:{{ldap_docker_port}}
- 127.0.0.1:{{ports.localhost.ldap.openldap}}:{{ldap_docker_port}}
{% endif %}
volumes:
- 'data:/bitnami/openldap'

2
roles/svc-openldap/templates/nginx.stream.conf.j2
View File

@@ -1,6 +1,6 @@
server {
listen {{ports.public.ldaps.ldap}}ssl;
proxy_pass 127.0.0.1:{{ports.localhost.ldap.ldap}};
proxy_pass 127.0.0.1:{{ports.localhost.ldap.openldap}};
{% include 'roles/net-letsencrypt/templates/ssl_credentials.j2' %}
}

2
roles/svc-openldap/vars/main.yml
View File

@@ -3,7 +3,7 @@ application_id: "openldap"
# LDAP Variables
ldaps_docker_port: 636
ldap_docker_port: 389
ldap_server_uri: "ldap://127.0.0.1:{{ ports.localhost.ldap.ldap }}"
ldap_server_uri: "ldap://127.0.0.1:{{ ports.localhost.ldap.openldap }}"
ldap_hostname: "{{ applications[application_id].hostname }}"
ldap_bind_dn: "{{ ldap.dn.administrator.configuration }}"
ldap_bind_pw: "{{ applications[application_id].credentials.administrator_password }}"

2
roles/web-app-akaunting/tasks/main.yml
View File

@@ -11,7 +11,7 @@
http_port: "{{ ports.localhost.http[application_id] }}"
- name: "include tasks update-repository-with-files.yml"
include_tasks: update-repository-with-files.yml
include_tasks: utils/update-repository-with-files.yml
vars:
detached_files:
- "docker-compose.yml"

2
roles/web-app-attendize/tasks/main.yml
View File

@@ -20,7 +20,7 @@
notify: restart nginx
- name: "include tasks update-repository-with-files.yml"
include_tasks: update-repository-with-files.yml
include_tasks: utils/update-repository-with-files.yml
vars:
detached_files:
- "docker-compose.yml"

2
roles/web-app-nextcloud/vars/plugins/user_ldap.yml
View File

@@ -27,7 +27,7 @@ plugin_configuration:
-
appid: "user_ldap"
configkey: "s01ldap_backup_port"
configvalue: "{{ ports.localhost.ldap.ldap }}" # This is just optimized for local port @todo implement for external ports as well
configvalue: "{{ ports.localhost.ldap.openldap }}" # This is just optimized for local port @todo implement for external ports as well
-
appid: "user_ldap"