nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-10-03 03:56:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix starting of apache

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2023-07-13 15:18:32 +02:00
parent b1b96a5d8c
commit 8bf8e3f562
4 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Containers/apache/Dockerfile
View file

@ -22,9 +22,6 @@ RUN set -ex; \
\ \
mkdir -p /mnt/data; \ mkdir -p /mnt/data; \
chown -R www-data:www-data /mnt/data; \ chown -R www-data:www-data /mnt/data; \
mkdir /caddy; \
chown -R 777 /caddy; \
chown -R www-data:www-data /caddy; \
chown -R 777 /tmp; \ chown -R 777 /tmp; \
\ \
apk add --no-cache \ apk add --no-cache \

10
Containers/apache/start.sh
View file

@ -35,18 +35,18 @@ if [ "$APACHE_PORT" != '443' ]; then
else else
CADDYFILE="$(sed 's|auto_https.*|auto_https disable_redirects|' /Caddyfile)" CADDYFILE="$(sed 's|auto_https.*|auto_https disable_redirects|' /Caddyfile)"
fi fi
echo "$CADDYFILE" > /caddy/Caddyfile echo "$CADDYFILE" > /tmp/Caddyfile
# Change the trusted_proxies in case of reverse proxies # Change the trusted_proxies in case of reverse proxies
if [ "$APACHE_PORT" != '443' ]; then if [ "$APACHE_PORT" != '443' ]; then
CADDYFILE="$(sed 's|# trusted_proxies placeholder|trusted_proxies static private_ranges|' /caddy/Caddyfile)" CADDYFILE="$(sed 's|# trusted_proxies placeholder|trusted_proxies static private_ranges|' /tmp/Caddyfile)"
else else
CADDYFILE="$(sed 's|trusted_proxies.*private_ranges|# trusted_proxies placeholder|' /caddy/Caddyfile)" CADDYFILE="$(sed 's|trusted_proxies.*private_ranges|# trusted_proxies placeholder|' /tmp/Caddyfile)"
fi fi
echo "$CADDYFILE" > /caddy/Caddyfile echo "$CADDYFILE" > /tmp/Caddyfile
# Fix the Caddyfile format # Fix the Caddyfile format
caddy fmt --overwrite /caddy/Caddyfile caddy fmt --overwrite /tmp/Caddyfile
# Add caddy path # Add caddy path
mkdir -p /mnt/data/caddy/ mkdir -p /mnt/data/caddy/

2
Containers/apache/supervisord.conf
View file

@ -20,4 +20,4 @@ stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
command=/usr/bin/caddy run --config /caddy/Caddyfile command=/usr/bin/caddy run --config /tmp/Caddyfile

1
php/containers.json
View file

@ -61,7 +61,6 @@
"/var/log/supervisord", "/var/log/supervisord",
"/var/run/supervisord", "/var/run/supervisord",
"/usr/local/apache2/logs", "/usr/local/apache2/logs",
"/caddy",
"/tmp" "/tmp"
] ]
}, },