daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-05-30 15:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #758 from nextcloud/fix/750/caddyfile-permissions

Browse Source 
fix writing to the caddyfile
This commit is contained in:
Simon L
2022-06-06 22:31:10 +02:00
committed by GitHub
parent 703bfa9335 1f6b8d48a9
commit 8764824870
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Containers/apache/Dockerfile
View File

@@ -65,8 +65,7 @@ COPY start.sh /usr/bin/
COPY supervisord.conf /
RUN chmod +x /usr/bin/start.sh; \
chmod +r /supervisord.conf; \
chmod a+w /Caddyfile; \
chmod 777 /; \
chown www-data:www-data /Caddyfile; \
chmod +r -R /etc/apache2
# Give root a random password

6
Containers/apache/start.sh
View File

@@ -21,14 +21,16 @@ if [ -z "$APACHE_PORT" ]; then
export APACHE_PORT="443"
fi
# Change the Caddyfile
if [ "$APACHE_PORT" != '443' ]; then
export PROTOCOL="http"
export NC_DOMAIN=""
sed -i 's|auto_https.*|auto_https off|' /Caddyfile
CADDYFILE="$(sed 's|auto_https.*|auto_https off|' /Caddyfile)"
else
export PROTOCOL="https"
sed -i 's|auto_https.*|auto_https disable_redirects|' /Caddyfile
CADDYFILE="$(sed 's|auto_https.*|auto_https disable_redirects|' /Caddyfile)"
fi
echo "$CADDYFILE" > /Caddyfile
# Add caddy path
mkdir -p /mnt/data/caddy/