diff --git a/Dockerfile b/Dockerfile index c00f945c..daab0601 100755 --- a/Dockerfile +++ b/Dockerfile @@ -11,11 +11,10 @@ RUN apt-get update \ msmtp \ unzip \ git \ - ssl-cert \ locales \ --no-install-recommends \ && 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 autoremove -y \ && rm -r /var/lib/apt/lists/* diff --git a/docker/apache.conf b/docker/apache.conf index 9b5036c3..dee4e775 100755 --- a/docker/apache.conf +++ b/docker/apache.conf @@ -19,28 +19,3 @@ ServerTokens Prod CustomLog /var/log/apache2/vhost-access.log combined - - - 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 - - - Options -Indexes +FollowSymLinks +MultiViews - AllowOverride All - Order deny,allow - Allow from all - - - ErrorLog /var/log/apache2/ssl-vhost-error.log - CustomLog /var/log/apache2/ssl-vhost-access.log combined - - -