mirrors/roundcubemail-docker
1
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail-docker.git synced 2026-02-20 22:01:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #321 from roundcube/public_html

Browse Source 
Make HTTP daemons use public_html/ as document root
This commit is contained in:
Pablo Zmdl 2025-02-25 12:25:08 +01:00 committed by GitHub
commit 98688cfe81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache/Dockerfile
View File

@ -8,7 +8,13 @@ LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemai
RUN apt-get update && apt-get -y upgrade && apt-get clean
RUN set -ex; \
if [ "apache" = "apache" ]; then a2enmod rewrite; fi; \
if [ "apache" = "apache" ]; then \
a2enmod rewrite; \
# Make Apache use public_html/ as document root to protect files outside of it \
# against unauthorized access. \
# This is possible and recommended since a while, and will be required for Roundcubemail v1.7. \
sed -i -e 's|\(DocumentRoot /var/www/html\)$|\1/public_html|' /etc/apache2/sites-available/000-default.conf; \
fi; \
apt-get update; \
\
savedAptMark="$(apt-mark showmanual)"; \

2
examples/nginx/templates/default.conf.template
View File

@ -3,7 +3,7 @@ server {
server_name php-docker.local;
error_log /var/log/nginx/error.log;
access_log /var/log/nginx/access.log;
root /var/www/html;
root /var/www/html/public_html;
location ~ /(temp|logs)/ {
deny all;

8
fpm/Dockerfile
View File

@ -8,7 +8,13 @@ LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemai
RUN apt-get update && apt-get -y upgrade && apt-get clean
RUN set -ex; \
if [ "fpm" = "apache" ]; then a2enmod rewrite; fi; \
if [ "fpm" = "apache" ]; then \
a2enmod rewrite; \
# Make Apache use public_html/ as document root to protect files outside of it \
# against unauthorized access. \
# This is possible and recommended since a while, and will be required for Roundcubemail v1.7. \
sed -i -e 's|\(DocumentRoot /var/www/html\)$|\1/public_html|' /etc/apache2/sites-available/000-default.conf; \
fi; \
apt-get update; \
\
savedAptMark="$(apt-mark showmanual)"; \

3
nightly/Dockerfile
View File

@ -12,7 +12,8 @@ RUN set -ex; \
rm roundcubemail.tar.gz; \
mv /usr/src/roundcubemail-master /usr/src/roundcubemail; \
cd /usr/src/roundcubemail; \
rm -rf installer tests public_html .ci .github .gitignore .editorconfig .tx .travis.yml; \
rm -rf installer tests .ci .github .gitignore .editorconfig .tx .travis.yml; \
[ -f public_html/installer.php ] && rm -f public_html/installer.php; \
make css-elastic; \
composer require kolab/net_ldap3 --no-install; \
composer require bjeavons/zxcvbn-php --no-install; \

8
templates/Dockerfile-debian.templ
View File

@ -8,7 +8,13 @@ LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemai
RUN apt-get update && apt-get -y upgrade && apt-get clean
RUN set -ex; \
if [ "%%VARIANT%%" = "apache" ]; then a2enmod rewrite; fi; \
if [ "%%VARIANT%%" = "apache" ]; then \
a2enmod rewrite; \
# Make Apache use public_html/ as document root to protect files outside of it \
# against unauthorized access. \
# This is possible and recommended since a while, and will be required for Roundcubemail v1.7. \
sed -i -e 's|\(DocumentRoot /var/www/html\)$|\1/public_html|' /etc/apache2/sites-available/000-default.conf; \
fi; \
apt-get update; \
\
savedAptMark="$(apt-mark showmanual)"; \