From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names

---
 Dockerfile |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e1d4b6e..c8ef799 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,12 +7,20 @@
 RUN apt-get install -qq apache2-mpm-event
 
 RUN sed -e 's|/var/www|&/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/default 
+RUN a2ensite default
+
+RUN sed -e 's|/var/www|&/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/default-ssl
+RUN sed -e '/SSLCertificateKeyFile/s|ssl-cert-snakeoil.key|ssl-cert.key|' -e '/SSLCertificateFile/s|ssl-cert-snakeoil.pem|ssl-cert.pem|' -i /etc/apache2/sites-available/default-ssl
+RUN ln -snf ssl-cert-snakeoil.pem /etc/ssl/certs/ssl-cert.pem
+RUN ln -snf ssl-cert-snakeoil.key /etc/ssl/private/ssl-cert.key
+RUN a2ensite default-ssl
 
 RUN a2enmod expires
 RUN a2enmod headers
+RUN a2enmod ssl
 
 RUN apt-get install -qq php5 php-pear php5-mysql php5-pgsql php5-sqlite
-RUN pear install mail_mime mail_mimedecode net_smtp2-beta net_idna2-beta auth_sasl2-beta net_sieve crypt_gpg
+RUN pear install mail_mime mail_mimedecode net_smtp net_idna2-beta auth_sasl net_sieve crypt_gpg
 
 RUN rm -rf /var/www
 ADD . /var/www

--
Gitblit v1.9.1