Merge pull request 'Migrate Passit to docker_service & set correct volume folder path' (#54) from passit-cleanup into master

Reviewed-on: data.coop/ansible#54
This commit is contained in:
valberg 2021-01-31 10:30:23 +00:00
commit fbebeef57b
2 changed files with 41 additions and 39 deletions

View file

@ -19,6 +19,7 @@ gitea:
passit: passit:
domain: "passit.{{ base_domain }}" domain: "passit.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/passit"
fider: fider:
domain: "feedback.{{ base_domain }}" domain: "feedback.{{ base_domain }}"

View file

@ -1,45 +1,46 @@
--- ---
- name: passit network - docker_service:
docker_network: project_name: "passit"
name: passit pull: "yes"
definition:
version: "3.6"
services:
- name: passit database volume passit_db:
docker_volume: image: "postgres:10"
name: passit_db restart: "always"
- name: passit database container
docker_container:
name: passit_db
image: postgres:10
state: started
restart_policy: always
networks: networks:
- name: passit - "passit"
volumes: volumes:
- passit_db:/var/lib/postgresql/data - "{{ passit.volume_folder }}/data:/var/lib/postgresql/data"
env: environment:
POSTGRES_USER: passit POSTGRES_USER: "passit"
POSTGRES_PASSWORD: "{{ postgres_passwords.passit }}" POSTGRES_PASSWORD: "{{ postgres_passwords.passit }}"
- name: passit app container passit_app:
docker_container: image: "passit/passit:stable"
name: passit command: "bin/start.sh"
image: passit/passit:stable restart: "always"
command: bin/start.sh
restart_policy: always
networks: networks:
- name: passit - "passit"
- name: postfix - "postfix"
- name: external_services - "external_services"
env: environment:
DATABASE_URL: "postgres://passit:{{ postgres_passwords.passit }}@passit_db:5432/passit" DATABASE_URL: "postgres://passit:{{ postgres_passwords.passit }}@passit_db:5432/passit"
SECRET_KEY: "{{ passit_secret_key }}" SECRET_KEY: "{{ passit_secret_key }}"
IS_DEBUG: 'False' IS_DEBUG: 'False'
EMAIL_URL: smtp://noop@{{ smtp_host }}:{{ smtp_port }} EMAIL_URL: "smtp://noop@{{ smtp_host }}:{{ smtp_port }}"
DEFAULT_FROM_EMAIL: "noreply@{{ passit.domain }}" DEFAULT_FROM_EMAIL: "noreply@{{ passit.domain }}"
EMAIL_CONFIRMATION_HOST: "https://{{ passit.domain }}" EMAIL_CONFIRMATION_HOST: "https://{{ passit.domain }}"
VIRTUAL_HOST: "{{ passit.domain }}" VIRTUAL_HOST: "{{ passit.domain }}"
LETSENCRYPT_HOST: "{{ passit.domain }}" LETSENCRYPT_HOST: "{{ passit.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
networks:
passit:
postfix:
external: true
external_services:
external: true