committed to wrong branch #9

Merged
pim merged 6 commits from dns into master 2023-06-15 11:18:34 +00:00
4 changed files with 41 additions and 16 deletions
Showing only changes of commit 32c090eed7 - Show all commits

View file

@ -3,7 +3,13 @@ git_ssh_port: 56287
nfs_shares: nfs_shares:
- name: nextcloud_data - name: nextcloud_data
path: "/mnt/data/nextcloud/data" path: /mnt/data/nextcloud/data
- name: radicale
path: /mnt/data/radicale
- name: freshrss_data
path: /mnt/data/freshrss/data
- name: freshrss_extensions
path: /mnt/data/freshrss/extensions
database_passwords: database_passwords:
nextcloud: !vault | nextcloud: !vault |

View file

@ -5,18 +5,34 @@ networks:
traefik: traefik:
external: true external: true
volumes:
data:
driver_opts:
type: "nfs"
o: "addr=192.168.30.10,nolock,soft,rw"
device: ":/mnt/data/freshrss/data"
extensions:
driver_opts:
type: "nfs"
o: "addr=192.168.30.10,nolock,soft,rw"
device: ":/mnt/data/freshrss/extensions"
services: services:
freshrss: freshrss:
image: freshrss/freshrss:edge image: freshrss/freshrss:edge
networks: networks:
- traefik - traefik
volumes: volumes:
- type: bind - type: volume
source: /mnt/data/freshrss/data source: data
target: /var/www/FreshRSS/data target: /var/www/FreshRSS/data
- type: bind volume:
source: /mnt/data/freshrss/extensions nocopy: true
- type: volume
source: extensions
target: /var/www/FreshRSS/extensions target: /var/www/FreshRSS/extensions
volume:
nocopy: true
environment: environment:
TZ: Europe/Amsterdam TZ: Europe/Amsterdam
CRON_MIN: '2,32' CRON_MIN: '2,32'
@ -25,13 +41,10 @@ services:
ADMIN_API_PASSWORD: {{ admin_password }} ADMIN_API_PASSWORD: {{ admin_password }}
PUBLISHED_PORT: 443 PUBLISHED_PORT: 443
deploy: deploy:
placement:
constraints:
- "node.labels.freshrss == true"
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.routers.freshrss.entrypoints=websecure - traefik.http.routers.freshrss.entrypoints=websecure
- traefik.http.routers.freshrss.rule=Host(`rss.pim.kunis.nl`) - traefik.http.routers.freshrss.rule=Host(`rss.kun.is`)
- traefik.http.routers.freshrss.tls=true - traefik.http.routers.freshrss.tls=true
- traefik.http.routers.freshrss.tls.certresolver=letsencrypt - traefik.http.routers.freshrss.tls.certresolver=letsencrypt
- traefik.http.routers.freshrss.service=freshrss - traefik.http.routers.freshrss.service=freshrss

View file

@ -32,7 +32,7 @@ services:
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.routers.nextcloud.entrypoints=websecure - traefik.http.routers.nextcloud.entrypoints=websecure
- traefik.http.routers.nextcloud.rule=Host(`cloud.pim.kunis.nl`) - traefik.http.routers.nextcloud.rule=Host(`cloud.kun.is`)
- traefik.http.routers.nextcloud.tls=true - traefik.http.routers.nextcloud.tls=true
- traefik.http.routers.nextcloud.tls.certresolver=letsencrypt - traefik.http.routers.nextcloud.tls.certresolver=letsencrypt
- traefik.http.routers.nextcloud.service=nextcloud - traefik.http.routers.nextcloud.service=nextcloud

View file

@ -13,6 +13,13 @@ configs:
external: true external: true
name: "{{ users.config_name }}" name: "{{ users.config_name }}"
volumes:
data:
driver_opts:
type: "nfs"
o: "addr=192.168.30.10,nolock,soft,rw"
device: ":/mnt/data/radicale"
services: services:
radicale: radicale:
image: tomsquest/docker-radicale image: tomsquest/docker-radicale
@ -30,19 +37,18 @@ services:
interval: 30s interval: 30s
retries: 3 retries: 3
volumes: volumes:
- type: bind - type: volume
source: /mnt/data/radicale source: data
target: /data target: /data
volume:
nocopy: true
networks: networks:
- traefik - traefik
deploy: deploy:
placement:
constraints:
- "node.labels.radicale == true"
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.routers.radicale.entrypoints=websecure - traefik.http.routers.radicale.entrypoints=websecure
- traefik.http.routers.radicale.rule=Host(`dav.pim.kunis.nl`) - traefik.http.routers.radicale.rule=Host(`dav.kun.is`)
- traefik.http.routers.radicale.tls=true - traefik.http.routers.radicale.tls=true
- traefik.http.routers.radicale.tls.certresolver=letsencrypt - traefik.http.routers.radicale.tls.certresolver=letsencrypt
- traefik.http.routers.radicale.service=radicale - traefik.http.routers.radicale.service=radicale