eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix caddy config

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2023-05-19 16:06:22 +02:00
parent 08ff51c482
commit 1dedc5f282
4 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Containers/apache/Caddyfile
View file

@ -22,9 +22,6 @@
# Others # Others
import /mnt/data/caddy-imports/* import /mnt/data/caddy-imports/*
# Nextcloud
import /mnt/data/nextcloud
# TLS options # TLS options
tls { tls {
issuer acme { issuer acme {

2
Containers/apache/Dockerfile
View file

@ -5,7 +5,7 @@ FROM httpd:2.4.57-alpine3.17
COPY --from=caddy /usr/bin/caddy /usr/bin/caddy COPY --from=caddy /usr/bin/caddy /usr/bin/caddy
COPY --chown=www-data:www-data Caddyfile /Caddyfile COPY --chown=33:33 Caddyfile /Caddyfile
COPY --chmod=664 nextcloud.conf /usr/local/apache2/conf/nextcloud.conf COPY --chmod=664 nextcloud.conf /usr/local/apache2/conf/nextcloud.conf
COPY --chmod=664 nextcloud /nextcloud COPY --chmod=664 nextcloud /nextcloud
COPY --chmod=664 caddy-imports/* /caddy-imports/ COPY --chmod=664 caddy-imports/* /caddy-imports/

2
Containers/apache/nextcloud
View file

@ -1,5 +1,5 @@
# Nextcloud # Nextcloud
route { route /* {
rewrite /.well-known/carddav /remote.php/dav rewrite /.well-known/carddav /remote.php/dav
rewrite /.well-known/caldav /remote.php/dav rewrite /.well-known/caldav /remote.php/dav
header Strict-Transport-Security max-age=31536000; header Strict-Transport-Security max-age=31536000;

2
Containers/apache/start.sh
View file

@ -46,7 +46,7 @@ fi
echo "$CADDYFILE" > /Caddyfile echo "$CADDYFILE" > /Caddyfile
# Overwrite nextcloud conf # Overwrite nextcloud conf
cat /nextcloud > /mnt/data/nextcloud cat /nextcloud > /mnt/data/caddy-imports/nextcloud
# Fix the Caddyfile format # Fix the Caddyfile format
caddy fmt --overwrite /Caddyfile caddy fmt --overwrite /Caddyfile