docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move the webmail to /webmail, fixes #82

Browse Source
This commit is contained in:
Pierre Jaury
2016-10-30 11:33:29 +01:00
parent 013286b8e1
commit 6c800e8b63
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nginx/nginx.conf
View File

@@ -48,6 +48,16 @@ http {
# Actual logic # Actual logic
location / { location / {
if ($webmail != none) {
return 301 $scheme://$host/webmail/;
}
if ($webmail = none) {
return 403;
}
}
location /webmail {
if ($webmail != none) { if ($webmail != none) {
proxy_pass http://webmail; proxy_pass http://webmail;
} }

7
rainloop/Dockerfile
View File

@@ -7,8 +7,9 @@ ENV RAINLOOP_URL https://github.com/RainLoop/rainloop-webmail/releases/download/
RUN echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini RUN echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini
RUN cd /var/www/html \ RUN rm -rf /var/www/html/ \
&& rm -rf ./* \ && mkdir -p /var/www/html/webmail \
&& cd /var/www/html/webmail \
&& curl -L -O ${RAINLOOP_URL} \ && curl -L -O ${RAINLOOP_URL} \
&& unzip *.zip \ && unzip *.zip \
&& rm -f *.zip \ && rm -f *.zip \
@@ -17,7 +18,7 @@ RUN cd /var/www/html \
&& find . -type f -exec chmod 644 {} \; \ && find . -type f -exec chmod 644 {} \; \
&& chown -R www-data: * && chown -R www-data: *
COPY include.php /var/www/html/include.php COPY include.php /var/www/html/webmail/include.php
COPY config.ini /config.ini COPY config.ini /config.ini
COPY default.ini /default.ini COPY default.ini /default.ini

11
roundcube/Dockerfile
View File

@@ -11,17 +11,18 @@ ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1
RUN echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini RUN echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini
RUN cd /tmp \ RUN rm -rf /var/www/html/ \
&& mkdir /var/www/html \
&& cd /var/www/html \
&& curl -L -O ${ROUNDCUBE_URL} \ && curl -L -O ${ROUNDCUBE_URL} \
&& tar -xf *.tar.gz \ && tar -xf *.tar.gz \
&& rm -f *.tar.gz \ && rm -f *.tar.gz \
&& rm -rf /var/www/html \ && mv roundcubemail-* webmail \
&& mv roundcubemail-* /var/www/html \ && cd webmail \
&& cd /var/www/html \
&& rm -rf CHANGELOG INSTALL LICENSE README.md UPGRADING composer.json-dist installer \ && rm -rf CHANGELOG INSTALL LICENSE README.md UPGRADING composer.json-dist installer \
&& chown -R www-data: logs && chown -R www-data: logs
COPY config.inc.php /var/www/html/config/ COPY config.inc.php /var/www/html/webmail/config/
COPY start.sh /start.sh COPY start.sh /start.sh