Update dockerfile to remove forced HTTPS because we'll always run this behind a reverse proxy
This commit is contained in:
+1
-2
@@ -11,11 +11,10 @@ RUN apt-get update \
|
|||||||
msmtp \
|
msmtp \
|
||||||
unzip \
|
unzip \
|
||||||
git \
|
git \
|
||||||
ssl-cert \
|
|
||||||
locales \
|
locales \
|
||||||
--no-install-recommends \
|
--no-install-recommends \
|
||||||
&& docker-php-ext-install pdo pdo_mysql mysqli xsl xml zip opcache \
|
&& docker-php-ext-install pdo pdo_mysql mysqli xsl xml zip opcache \
|
||||||
&& a2enmod rewrite ssl proxy proxy_http headers \
|
&& a2enmod rewrite proxy proxy_http headers \
|
||||||
&& apt-get purge -y g++ \
|
&& apt-get purge -y g++ \
|
||||||
&& apt-get autoremove -y \
|
&& apt-get autoremove -y \
|
||||||
&& rm -r /var/lib/apt/lists/*
|
&& rm -r /var/lib/apt/lists/*
|
||||||
|
|||||||
@@ -19,28 +19,3 @@ ServerTokens Prod
|
|||||||
CustomLog /var/log/apache2/vhost-access.log combined
|
CustomLog /var/log/apache2/vhost-access.log combined
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
<IfModule mod_ssl.c>
|
|
||||||
<VirtualHost *:443>
|
|
||||||
ServerName localhost
|
|
||||||
ServerAdmin support@websight.nl
|
|
||||||
DocumentRoot /var/www/html
|
|
||||||
|
|
||||||
SSLEngine on
|
|
||||||
SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
|
|
||||||
SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
|
|
||||||
SSLCompression off
|
|
||||||
SSLProtocol All -SSLv2 -SSLv3
|
|
||||||
SSLCipherSuite EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH
|
|
||||||
|
|
||||||
<Directory /var/www/html/>
|
|
||||||
Options -Indexes +FollowSymLinks +MultiViews
|
|
||||||
AllowOverride All
|
|
||||||
Order deny,allow
|
|
||||||
Allow from all
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
ErrorLog /var/log/apache2/ssl-vhost-error.log
|
|
||||||
CustomLog /var/log/apache2/ssl-vhost-access.log combined
|
|
||||||
|
|
||||||
</VirtualHost>
|
|
||||||
</IfModule>
|
|
||||||
|
|||||||
Reference in New Issue
Block a user