1
0
Fork 0

Update matrix

This commit is contained in:
florian 2022-12-01 19:42:17 +01:00
parent 07c8d94957
commit f214d4f4c1
12 changed files with 21084 additions and 2093 deletions

View file

@ -27,6 +27,7 @@ services:
- nextcloud:/var/www/html - nextcloud:/var/www/html
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.middlewares.nextcloud-compress.compress=true"
- "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.permanent=true" - "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.permanent=true"
- "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.regex=https://(.*)/.well-known/(card|cal)dav" - "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.regex=https://(.*)/.well-known/(card|cal)dav"
- "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.replacement=https://$$1/remote.php/dav/" - "traefik.http.middlewares.nextcloud-regex-redirect.redirectregex.replacement=https://$$1/remote.php/dav/"
@ -45,7 +46,7 @@ services:
- "traefik.http.routers.nextcloud-secure.rule=Host(`mycld.mrdev023.fr`)" - "traefik.http.routers.nextcloud-secure.rule=Host(`mycld.mrdev023.fr`)"
- "traefik.http.routers.nextcloud-secure.tls=true" - "traefik.http.routers.nextcloud-secure.tls=true"
- "traefik.http.routers.nextcloud-secure.tls.certresolver=sslResolver" - "traefik.http.routers.nextcloud-secure.tls.certresolver=sslResolver"
- "traefik.http.routers.nextcloud-secure.middlewares=nextcloud-regex-redirect,nextcloud-headers" - "traefik.http.routers.nextcloud-secure.middlewares=nextcloud-compress,nextcloud-regex-redirect,nextcloud-headers"
# - "traefik.http.routers.nextcloud-secure.service=nextcloud" # - "traefik.http.routers.nextcloud-secure.service=nextcloud"
# - "traefik.http.services.nextcloud.loadbalancer.server.port=9002" # - "traefik.http.services.nextcloud.loadbalancer.server.port=9002"
- "traefik.docker.network=proxy" - "traefik.docker.network=proxy"

View file

@ -41,12 +41,9 @@ certificatesResolvers:
sslResolver: sslResolver:
acme: acme:
email: florian.richer.97@outlook.com email: florian.richer.97@outlook.com
tlschallenge: true tlschallenge: {}
storage: acme.json storage: acme.json
keyType: RSA4096 keyType: RSA4096
#caServer: "https://acme-staging-v02.api.letsencrypt.org/directory" #caServer: "https://acme-staging-v02.api.letsencrypt.org/directory"
dnsChallenge:
delayBeforeCheck: 15
resolvers: 1.1.1.1:53,1.0.0.1:53
httpChallenge: httpChallenge:
entryPoint: http entryPoint: http

View file

@ -54,6 +54,10 @@ iptables -A OUTPUT -p udp --dport 123 -j ACCEPT
iptables -A INPUT -p tcp --dport 80 -j ACCEPT iptables -A INPUT -p tcp --dport 80 -j ACCEPT
iptables -A OUTPUT -p tcp --dport 80 -j ACCEPT iptables -A OUTPUT -p tcp --dport 80 -j ACCEPT
# HTTP MATRIX FEDERATION (8448)
iptables -A INPUT -p tcp --dport 8448 -j ACCEPT
iptables -A OUTPUT -p tcp --dport 8448 -j ACCEPT
# HTTPS (443) # HTTPS (443)
iptables -A INPUT -p tcp --dport 443 -j ACCEPT iptables -A INPUT -p tcp --dport 443 -j ACCEPT
iptables -A OUTPUT -p tcp --dport 443 -j ACCEPT iptables -A OUTPUT -p tcp --dport 443 -j ACCEPT

View file

@ -17,6 +17,8 @@ services:
synapse: synapse:
image: matrixdotorg/synapse:latest image: matrixdotorg/synapse:latest
restart: unless-stopped restart: unless-stopped
ports:
- 8448:8448
networks: networks:
- internal - internal
- proxy - proxy

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load diff

View file

@ -1 +1 @@
a8f36004fbc1b224c3e3423cb7a799ae5e8997a9 /etc/pihole/list.1.raw.githubusercontent.com.domains d49d3d16bdf769beac4cc5e82ed05ca0ef7d76a6 /etc/pihole/list.1.raw.githubusercontent.com.domains

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1 @@
1caf2c98a1a2a147544eb5e023679eb0beed8f2a /etc/pihole/list.2.raw.githubusercontent.com.domains

Binary file not shown.

View file

@ -5,7 +5,7 @@ CORE_VERSION=v5.13-0-g17779ba
WEB_VERSION=v5.16-0-gc2afe42 WEB_VERSION=v5.16-0-gc2afe42
FTL_VERSION=v5.18.2 FTL_VERSION=v5.18.2
DOCKER_VERSION=2022.10 DOCKER_VERSION=2022.10
GITHUB_CORE_VERSION=v5.13 GITHUB_CORE_VERSION=v5.14.2
GITHUB_WEB_VERSION=v5.16 GITHUB_WEB_VERSION=v5.17
GITHUB_FTL_VERSION=v5.18.2 GITHUB_FTL_VERSION=v5.19.2
GITHUB_DOCKER_VERSION=2022.10 GITHUB_DOCKER_VERSION=2022.11.2