Fix CodiMD vars

This commit is contained in:
Sam A. 2022-12-04 19:32:36 +01:00
parent 9d08ae2ff1
commit 49908b833f
Signed by: samsapti
GPG key ID: CBBBE7371E81C4EA
2 changed files with 6 additions and 9 deletions

View file

@ -11,7 +11,7 @@ usage () {
BASE_CMD="ansible-playbook playbook.yml --ask-vault-pass" BASE_CMD="ansible-playbook playbook.yml --ask-vault-pass"
if [ "$1" = "--vagrant" ]; then if [ "$1" = "--vagrant" ]; then
BASE_CMD="$BASE_CMD --inventory=vagrant_host" BASE_CMD="$BASE_CMD --verbose --inventory=vagrant_host"
shift shift
fi fi

View file

@ -1,17 +1,15 @@
--- ---
- name: codimd network - name: codimd network
docker_network: docker_network:
name: codimd name: codimd
- name: create codimd volume folders - name: create codimd volume folders
file: file:
name: "{{ codimd.volume_folder }}/{{ volume }}" name: "{{ services.codimd.volume_folder }}/{{ volume }}"
state: directory state: directory
loop: loop:
- "db" - "db"
- "codimd/uploads" - "codimd/uploads"
loop_control: loop_control:
loop_var: volume loop_var: volume
@ -24,7 +22,7 @@
networks: networks:
- name: codimd - name: codimd
volumes: volumes:
- "{{ codimd.volume_folder }}/db:/var/lib/postgresql/data" - "{{ services.codimd.volume_folder }}/db:/var/lib/postgresql/data"
env: env:
POSTGRES_USER: "codimd" POSTGRES_USER: "codimd"
POSTGRES_PASSWORD: "{{ postgres_passwords.codimd }}" POSTGRES_PASSWORD: "{{ postgres_passwords.codimd }}"
@ -39,8 +37,7 @@
- name: ldap - name: ldap
- name: external_services - name: external_services
volumes: volumes:
- "{{ codimd.volume_folder }}/codimd/uploads:/codimd/public/uploads" - "{{ services.codimd.volume_folder }}/codimd/uploads:/codimd/public/uploads"
env: env:
CMD_DB_URL: "postgres://codimd:{{ postgres_passwords.codimd }}@codimd_db:5432/codimd" CMD_DB_URL: "postgres://codimd:{{ postgres_passwords.codimd }}@codimd_db:5432/codimd"
CMD_ALLOW_EMAIL_REGISTER: "False" CMD_ALLOW_EMAIL_REGISTER: "False"
@ -52,6 +49,6 @@
CMD_LDAP_SEARCHBASE: "dc=data,dc=coop" CMD_LDAP_SEARCHBASE: "dc=data,dc=coop"
CMD_LDAP_SEARCHFILTER: "(&(uid={{ '{{username}}' }})(objectClass=inetOrgPerson))" CMD_LDAP_SEARCHFILTER: "(&(uid={{ '{{username}}' }})(objectClass=inetOrgPerson))"
CMD_USECDN: "false" CMD_USECDN: "false"
VIRTUAL_HOST: "{{ codimd.domain }}" VIRTUAL_HOST: "{{ services.codimd.domain }}"
LETSENCRYPT_HOST: "{{ codimd.domain }}" LETSENCRYPT_HOST: "{{ services.codimd.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"