Revert "Make quotations consistent"

This reverts commit 231af48a40.
This commit is contained in:
Sam A. 2023-01-14 17:22:47 +01:00
parent 2f1c1887ba
commit 9733794292
Signed by untrusted user: samsapti
GPG key ID: CBBBE7371E81C4EA

View file

@ -9,59 +9,59 @@ services:
file: postfix.yml file: postfix.yml
domain: "smtp.{{ base_domain }}" domain: "smtp.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/postfix" volume_folder: "{{ volume_root_folder }}/postfix"
version: v3.5.1-alpine version: "v3.5.1-alpine"
nginx_proxy: nginx_proxy:
file: nginx_proxy.yml file: nginx_proxy.yml
version: 1.0-alpine version: "1.0-alpine"
volume_folder: "{{ volume_root_folder }}/nginx" volume_folder: "{{ volume_root_folder }}/nginx"
nginx_acme_companion: nginx_acme_companion:
version: 2.2 version: "2.2"
openldap: openldap:
file: openldap.yml file: openldap.yml
domain: "ldap.{{ base_domain }}" domain: "ldap.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/openldap" volume_folder: "{{ volume_root_folder }}/openldap"
version: 1.5.0 version: "1.5.0"
phpldapadmin: phpldapadmin:
version: 0.9.0 version: "0.9.0"
netdata: netdata:
file: netdata.yml file: netdata.yml
domain: "netdata.{{ base_domain }}" domain: "netdata.{{ base_domain }}"
version: v1 version: "v1"
portainer: portainer:
file: portainer.yml file: portainer.yml
domain: "portainer.{{ base_domain }}" domain: "portainer.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/portainer" volume_folder: "{{ volume_root_folder }}/portainer"
version: 2.16.2 version: "2.16.2"
keycloak: keycloak:
file: keycloak.yml file: keycloak.yml
domain: sso.{{ base_domain }} domain: sso.{{ base_domain }}
volume_folder: "{{ volume_root_folder }}/keycloak" volume_folder: "{{ volume_root_folder }}/keycloak"
version: 20.0 version: "20.0"
postgres_version: 10 postgres_version: 10
allowed_sender_domain: true allowed_sender_domain: true
restic: restic:
file: restic_backup.yml file: restic_backup.yml
user: datacoop user: "datacoop"
domain: restic.cannedtuna.org domain: "restic.cannedtuna.org"
repository: datacoop-hevonen repository: "datacoop-hevonen"
version: 1.6.0 version: "1.6.0"
disabled_in_vagrant: true disabled_in_vagrant: true
docker_registry: docker_registry:
file: docker_registry.yml file: docker_registry.yml
domain: "docker.{{ base_domain }}" domain: "docker.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/docker-registry" volume_folder: "{{ volume_root_folder }}/docker-registry"
username: docker username: "docker"
password: "{{ docker_password }}" password: "{{ docker_password }}"
version: 2 version: "2"
### External services ### ### External services ###
@ -141,21 +141,21 @@ services:
cryptohagen_website: cryptohagen_website:
file: websites/cryptohagen.dk.yml file: websites/cryptohagen.dk.yml
domains: domains:
- cryptohagen.dk - "cryptohagen.dk"
- www.cryptohagen.dk - "www.cryptohagen.dk"
ulovliglogning_website: ulovliglogning_website:
file: websites/ulovliglogning.dk.yml file: websites/ulovliglogning.dk.yml
domains: domains:
- ulovliglogning.dk - "ulovliglogning.dk"
- www.ulovliglogning.dk - "www.ulovliglogning.dk"
- ulovlig-logning.dk - "ulovlig-logning.dk"
cryptoaarhus_website: cryptoaarhus_website:
file: websites/cryptoaarhus.dk.yml file: websites/cryptoaarhus.dk.yml
domains: domains:
- cryptoaarhus.dk - "cryptoaarhus.dk"
- www.cryptoaarhus.dk - "www.cryptoaarhus.dk"
drone: drone:
file: drone.yml file: drone.yml
@ -184,12 +184,8 @@ services:
file: rallly.yml file: rallly.yml
domain: "when.{{ base_domain }}" domain: "when.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/rallly" volume_folder: "{{ volume_root_folder }}/rallly"
<<<<<<< HEAD
version: ac55701890cd866ee946deb25e2b2839fb14900e
postgres_version: 14-alpine
=======
version: e4482a1edb2fb56292d07ee8811a24f2a0d6b114 version: e4482a1edb2fb56292d07ee8811a24f2a0d6b114
>>>>>>> main postgres_version: 14-alpine
allowed_sender_domain: true allowed_sender_domain: true
pinafore: pinafore:
@ -200,7 +196,7 @@ services:
membersystem: membersystem:
file: membersystem.yml file: membersystem.yml
domain: "member.{{ base_domain }}" domain: "member.{{ base_domain }}"
django_admins: Vidir:valberg@orn.li django_admins: "Vidir:valberg@orn.li"
version: latest version: latest
postgres_version: 13-alpine postgres_version: 13-alpine
allowed_sender_domain: true allowed_sender_domain: true