Merge pull request #283 from alunduil/fix-dockerfile

Thomas B.

2015-06-18 c7df0d9e906f5abf7b38a2e584c36ff542763c1d

Merge pull request #283 from alunduil/fix-dockerfile

drop /html from DocumentRoot

 Dockerfile

@@ -6,10 +6,10 @@
RUN apt-get -qq update
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/000-default.conf
RUN sed -e 's|/var/www/html|/var/www/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/000-default.conf
RUN a2ensite 000-default

RUN sed -e 's|/var/www|&/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/default-ssl.conf
RUN sed -e 's|/var/www/html|/var/www/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/default-ssl.conf
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.conf
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