data.coop
/
ansible
8
3
Fork 7
Code Issues 44 Pull Requests 7 Projects 1 Releases Wiki Activity

Merge branch 'main' into watchtower

This commit is contained in:
Sam A. 2023-01-21 17:33:45 +01:00
parent 58f3df7ed0 209ccf9916
commit 7ca168ae03
Signed by: samsapti
GPG Key ID: CBBBE7371E81C4EA
10 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
roles/docker/defaults/main.yml
View File

@ -44,6 +44,7 @@ services:
domain: sso.{{ base_domain }}
volume_folder: "{{ volume_root_folder }}/keycloak"
version: "20.0"
postgres_version: "10"
allowed_sender_domain: true
restic:
@ -69,6 +70,8 @@ services:
domain: "cloud.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/nextcloud"
version: 25-apache
postgres_version: "10"
redis_version: 7-alpine
allowed_sender_domain: true
gitea:
@ -83,6 +86,7 @@ services:
domain: "passit.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/passit"
version: stable
postgres_version: "10"
allowed_sender_domain: true
matrix:
@ -90,6 +94,7 @@ services:
domain: "matrix.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/matrix"
version: v1.63.1
postgres_version: "10"
allowed_sender_domain: true
riot:
@ -115,12 +120,13 @@ services:
domain: "pad.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/hedgedoc"
version: 1
postgres_version: 10-alpine
data_coop_website:
file: websites/data.coop.yml
domains:
- "{{ base_domain }}"
- "www.{{ base_domain }}"
- "{{ base_domain }}"
- "www.{{ base_domain }}"
new_data_coop_website:
file: websites/new.data.coop.yml
@ -135,21 +141,21 @@ services:
cryptohagen_website:
file: websites/cryptohagen.dk.yml
domains:
- "cryptohagen.dk"
- "www.cryptohagen.dk"
- "cryptohagen.dk"
- "www.cryptohagen.dk"
ulovliglogning_website:
file: websites/ulovliglogning.dk.yml
domains:
- "ulovliglogning.dk"
- "www.ulovliglogning.dk"
- "ulovlig-logning.dk"
- "ulovliglogning.dk"
- "www.ulovliglogning.dk"
- "ulovlig-logning.dk"
cryptoaarhus_website:
file: websites/cryptoaarhus.dk.yml
domains:
- "cryptoaarhus.dk"
- "www.cryptoaarhus.dk"
- "cryptoaarhus.dk"
- "www.cryptoaarhus.dk"
drone:
file: drone.yml
@ -170,6 +176,8 @@ services:
domain: "social.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/mastodon"
version: v4.0.2
postgres_version: 14-alpine
redis_version: 6-alpine
allowed_sender_domain: true
rallly:
@ -177,6 +185,7 @@ services:
domain: "when.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/rallly"
version: e4482a1edb2fb56292d07ee8811a24f2a0d6b114
postgres_version: 14-alpine
allowed_sender_domain: true
pinafore:
@ -188,6 +197,8 @@ services:
file: membersystem.yml
domain: "member.{{ base_domain }}"
django_admins: "Vidir:valberg@orn.li"
version: latest
postgres_version: 13-alpine
allowed_sender_domain: true
watchtower:

4
roles/docker/tasks/services/drone.yml
View File

@ -9,7 +9,7 @@
services:
drone:
container_name: "drone"
image: drone/drone:1
image: "drone/drone:{{ services.drone.version }}"
restart: unless-stopped
networks:
- external_services
@ -49,4 +49,4 @@
drone:
external_services:
external:
name: external_services
name: external_services

4
roles/docker/tasks/services/hedgedoc.yml
View File

@ -23,7 +23,7 @@
definition:
services:
database:
image: "postgres:10-alpine"
image: "postgres:{{ services.hedgedoc.postgres_version }}"
environment:
POSTGRES_USER: "codimd"
POSTGRES_PASSWORD: "{{ postgres_passwords.hedgedoc }}"
@ -35,7 +35,7 @@
- "{{ services.hedgedoc.volume_folder }}/db:/var/lib/postgresql/data"
app:
image: quay.io/hedgedoc/hedgedoc:{{ services.hedgedoc.version }}
image: "quay.io/hedgedoc/hedgedoc:{{ services.hedgedoc.version }}"
environment:
CMD_DB_URL: "postgres://codimd:{{ postgres_passwords.hedgedoc }}@hedgedoc_database_1:5432/codimd"
CMD_DOMAIN: "{{ services.hedgedoc.domain }}"

3
roles/docker/tasks/services/keycloak.yml
View File

@ -7,9 +7,8 @@
definition:
version: "3.6"
services:
postgres:
image: "postgres:10"
image: "postgres:{{ services.keycloak.postgres_version }}"
restart: "unless-stopped"
networks:
- "keycloak"

4
roles/docker/tasks/services/mastodon.yml
View File

@ -57,7 +57,7 @@
services:
db:
restart: always
image: postgres:14-alpine
image: "postgres:{{ services.mastodon.postgres_version }}"
shm_size: 256mb
networks:
- internal_network
@ -72,7 +72,7 @@
redis:
restart: always
image: redis:6-alpine
image: "redis:{{ services.mastodon.redis_version }}"
networks:
- internal_network
healthcheck:

6
roles/docker/tasks/services/matrix_riot.yml
View File

@ -67,7 +67,7 @@
services:
matrix_db:
container_name: matrix_db
image: postgres:10
image: "postgres:{{ services.matrix.postgres_version }}"
restart: unless-stopped
networks:
- matrix
@ -79,7 +79,7 @@
matrix_app:
container_name: matrix
image: matrixdotorg/synapse:{{ services.matrix.version }}
image: "matrixdotorg/synapse:{{ services.matrix.version }}"
restart: unless-stopped
networks:
- matrix
@ -97,7 +97,7 @@
riot:
container_name: riot_app
image: avhost/docker-matrix-riot:{{ services.riot.version }}
image: "avhost/docker-matrix-riot:{{ services.riot.version }}"
restart: unless-stopped
networks:
- matrix

4
roles/docker/tasks/services/membersystem.yml
View File

@ -8,7 +8,7 @@
version: "3"
services:
backend:
image: docker.data.coop/membersystem:latest
image: "docker.data.coop/membersystem:{{ services.membersystem.version }}"
restart: always
user: $UID:$GID
tty: true
@ -35,7 +35,7 @@
DEFAULT_FROM_EMAIL: "noreply@{{ services.membersystem.domain }}"
postgres:
image: postgres:13-alpine
image: "postgres:{{ services.membersystem.postgres_version }}"
restart: always
volumes:
- "{{ volume_root_folder }}/membersystem/postgres/data:/var/lib/postgresql/data"

4
roles/docker/tasks/services/nextcloud.yml
View File

@ -13,7 +13,7 @@
definition:
services:
postgres:
image: "postgres:10"
image: "postgres:{{ services.nextcloud.postgres_version }}"
restart: "unless-stopped"
networks:
- "nextcloud"
@ -25,7 +25,7 @@
POSTGRES_USER: "nextcloud"
redis:
image: "redis:7-alpine"
image: "redis:{{ services.nextcloud.redis_version }}"
restart: "unless-stopped"
command: "redis-server --requirepass {{ nextcloud_secrets.redis_password }}"
tmpfs:

2
roles/docker/tasks/services/passit.yml
View File

@ -8,7 +8,7 @@
version: "3.6"
services:
passit_db:
image: "postgres:10"
image: "postgres:{{ services.passit.postgres_version }}"
restart: "always"
networks:
- "passit"

2
roles/docker/tasks/services/rallly.yml
View File

@ -18,7 +18,7 @@
version: "3.8"
services:
rallly_db:
image: "postgres:14-alpine"
image: "postgres:{{ services.rallly.postgres_version }}"
restart: "always"
shm_size: "256mb"
networks: