nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-02-27 15:25:40 +08:00
Code Issues Projects Releases Packages 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
commit 8764824870
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats 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 / COPY supervisord.conf /
RUN chmod +x /usr/bin/start.sh; \ RUN chmod +x /usr/bin/start.sh; \
chmod +r /supervisord.conf; \ chmod +r /supervisord.conf; \
chmod a+w /Caddyfile; \ chown www-data:www-data /Caddyfile; \
chmod 777 /; \
chmod +r -R /etc/apache2 chmod +r -R /etc/apache2
# Give root a random password # 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" export APACHE_PORT="443"
fi fi
# Change the Caddyfile
if [ "$APACHE_PORT" != '443' ]; then if [ "$APACHE_PORT" != '443' ]; then
export PROTOCOL="http" export PROTOCOL="http"
export NC_DOMAIN="" export NC_DOMAIN=""
sed -i 's|auto_https.*|auto_https off|' /Caddyfile CADDYFILE="$(sed 's|auto_https.*|auto_https off|' /Caddyfile)"
else else
export PROTOCOL="https" export PROTOCOL="https"
sed -i 's|auto_https.*|auto_https disable_redirects|' /Caddyfile CADDYFILE="$(sed 's|auto_https.*|auto_https disable_redirects|' /Caddyfile)"
fi fi
echo "$CADDYFILE" > /Caddyfile
# Add caddy path # Add caddy path
mkdir -p /mnt/data/caddy/ mkdir -p /mnt/data/caddy/