Resolve "/wp-admin redirects to :8080"

Closes #117 (closed)

wp-docker/Dockerfile

@@ -23,15 +23,15 @@ ENV PORT 8080
 ENV TLS_PORT 8443
 ENV TRUSTED_PROXY_IP 10.0.0.0/8
 
-RUN sed -i "s/\<80\>/$PORT/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf
-RUN sed -i "s/\<443\>/$TLS_PORT/g" /etc/apache2/sites-available/default-ssl.conf /etc/apache2/ports.conf
+RUN sed -i "s/\<:80\>/:$PORT/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf
+RUN sed -i "s/#ServerName www.example.com/ServerName https:\/\/localhost:80/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf
+RUN sed -i "s/\<:443\>/:$TLS_PORT/g" /etc/apache2/sites-available/default-ssl.conf /etc/apache2/ports.conf
 RUN sed "s/\tCustomLog \${APACHE_LOG_DIR}\/access.log combined/\tCustomLog \${APACHE_LOG_DIR}\/access.log remoteip/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/default-ssl.conf
 
 RUN echo "RemoteIPTrustedProxy $TRUSTED_PROXY_IP" >> /etc/apache2/apache2.conf
 RUN echo "RemoteIPHeader X-Forwarded-For" >> /etc/apache2/apache2.conf
 # Add custom log format called "remoteip" that uses remoteip module
 RUN echo "LogFormat \"%a %l %u %t \\\"%r\\\" %>s %O\" remoteip" >> /etc/apache2/apache2.conf
-RUN echo "UseCanonicalPhysicalPort Off" >> /etc/apache2/apache2.conf
-RUN echo "UseCanonicalName Off" >> /etc/apache2/apache2.conf
-
-# RUN echo "ServerName wordpress.stackspin.maartendewaard.nl" >> /etc/apache2/apache2.conf
+# Make sure there is no new request for directories, because those lead to
+# redirects to the wrong port
+# RUN echo "DirectorySlash Off" >> /etc/apache2/apache2.conf