Merge branch 'main' into use_sudo
This commit is contained in:
commit
bb6e550fea
|
@ -1,3 +1,4 @@
|
||||||
[defaults]
|
[defaults]
|
||||||
remote_user = REMOTE_USER
|
remote_user = REMOTE_USER
|
||||||
inventory = datacoop_hosts
|
inventory = datacoop_hosts
|
||||||
|
use_persistent_connections = True
|
||||||
|
|
|
@ -200,11 +200,6 @@ services:
|
||||||
postgres_version: 14-alpine
|
postgres_version: 14-alpine
|
||||||
allowed_sender_domain: true
|
allowed_sender_domain: true
|
||||||
|
|
||||||
pinafore:
|
|
||||||
file: pinafore.yml
|
|
||||||
domain: "pinafore.{{ base_domain }}"
|
|
||||||
version: v2.5.0
|
|
||||||
|
|
||||||
membersystem:
|
membersystem:
|
||||||
file: membersystem.yml
|
file: membersystem.yml
|
||||||
domain: "member.{{ base_domain }}"
|
domain: "member.{{ base_domain }}"
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
# vim: ft=yaml.ansible
|
|
||||||
---
|
|
||||||
- name: Set up Pinafore
|
|
||||||
docker_container:
|
|
||||||
name: pinafore
|
|
||||||
image: "docker.data.coop/pinafore:{{ services.pinafore.version }}"
|
|
||||||
restart_policy: unless-stopped
|
|
||||||
networks:
|
|
||||||
- name: external_services
|
|
||||||
env:
|
|
||||||
VIRTUAL_HOST: "{{ services.pinafore.domain }}"
|
|
||||||
VIRTUAL_PORT: "4002"
|
|
||||||
LETSENCRYPT_HOST: "{{ services.pinafore.domain }}"
|
|
||||||
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
|
|
Loading…
Reference in a new issue