kompetenzinventar/ki-ansible
4
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into patch-2

Browse Source
This commit is contained in:
Brain 2021-12-06 16:53:18 +01:00
commit 18f869b0bd
Signed by: Brain
GPG Key ID: 9CF47083EE57670D
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasks/main.yml
View File

@ -25,6 +25,7 @@
- docker-compose.yml - docker-compose.yml
- name: be sure the ki services are running - name: be sure the ki services are running
become: true
community.docker.docker_compose: community.docker.docker_compose:
project_src: /var/docker/ki project_src: /var/docker/ki
pull: yes pull: yes

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

@ -18,7 +18,7 @@ services:
SQLALCHEMY_DATABASE_URI: "mariadb+pymysql://ki:{{ ki_db_password }}@ki_db:3306/ki" SQLALCHEMY_DATABASE_URI: "mariadb+pymysql://ki:{{ ki_db_password }}@ki_db:3306/ki"
FLASK_ENV: "{{ ki_flask_env }}" FLASK_ENV: "{{ ki_flask_env }}"
KI_LOGLEVEL: "{{ ki_loglevel }}" KI_LOGLEVEL: "{{ ki_loglevel }}"
KI_AUTH: "ldap" KI_AUTH: "{{ ki_auth }}"
KI_LDAP_URL: "{{ ki_ldap_url }}" KI_LDAP_URL: "{{ ki_ldap_url }}"
KI_LDAP_AUTH_USER: "{{ ki_ldap_auth_user }}" KI_LDAP_AUTH_USER: "{{ ki_ldap_auth_user }}"
KI_LDAP_AUTH_PASSWORD: "{{ ki_ldap_auth_password }}" KI_LDAP_AUTH_PASSWORD: "{{ ki_ldap_auth_password }}"