Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix permissions on mounted settings #28

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix permissions on mounted settings #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ RUN chmod +x /tmp/pre-env.sh && \
service apache2 stop && \
echo "Listen 8080" > /etc/apache2/ports.conf

RUN chown www-data:www-data /var/www/agendav/web/config/settings.php
RUN chown www-data:www-data ${PHP_INI_DIR}/php.ini

RUN ln -sf /dev/stdout ${APACHE_LOG_DIR}/access.log \
&& ln -sf /dev/stderr ${APACHE_LOG_DIR}/error.log \
&& ln -sf /dev/stderr ${APACHE_LOG_DIR}/davi-error.log
Expand Down
14 changes: 12 additions & 2 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/bin/bash
set -e
CONFIG_FILE="/var/www/agendav/web/config/settings.php"
CONFIG_FILE="/var/www/agendav/web/config/settings.php.tmp"
CONFIG_FILE_REAL="/var/www/agendav/web/config/settings.php"

cp $CONFIG_FILE_REAL $CONFIG_FILE
sed -i -e "s/AGENDAV_TITLE/$( echo "${AGENDAV_TITLE}" | sed -e 's/[\/}]/\\&/g')/" ${CONFIG_FILE}
sed -i -e "s/AGENDAV_FOOTER/$( echo "${AGENDAV_FOOTER}" | sed -e 's/[\/}]/\\&/g')/" ${CONFIG_FILE}
sed -i -e "s/AGENDAV_ENC_KEY/$( echo "${AGENDAV_ENC_KEY}" | sed -e 's/[\/}]/\\&/g')/" ${CONFIG_FILE}
Expand All @@ -9,8 +12,15 @@ sed -i -e "s/AGENDAV_CALDAV_PUBLIC_URL/$( echo "${AGENDAV_CALDAV_PUBLIC_URL:-$AG
sed -i -e "s/UTC/$( echo "${AGENDAV_TIMEZONE}" | sed -e 's/[\/}]/\\&/g')/" ${CONFIG_FILE}
sed -i -e "s/AGENDAV_LANG/$( echo "${AGENDAV_LANG}" | sed -e 's/[\/}]/\\&/g')/" ${CONFIG_FILE}
sed -i -e "s/AGENDAV_LOG_DIR/$( echo "${AGENDAV_LOG_DIR}" | sed -e 's/[\/}]/\\&/g')/" ${CONFIG_FILE}
CONFIG_FILE="${PHP_INI_DIR}/php.ini"
cat $CONFIG_FILE > $CONFIG_FILE_REAL

CONFIG_FILE="${PHP_INI_DIR}/php.ini.tmp"
CONFIG_FILE_REAL="${PHP_INI_DIR}/php.ini"

cp $CONFIG_FILE_REAL $CONFIG_FILE
sed -i -e "s/UTC/$( echo "${AGENDAV_TIMEZONE}" | sed -e 's/[\/}]/\\&/g')/" ${CONFIG_FILE}
cat $CONFIG_FILE > $CONFIG_FILE_REAL


if [ "x$1" = 'xapache2' ]; then
echo "Start webserver"
Expand Down