From 44523806c85e3b3ec765c3da69772fa079da56d0 Mon Sep 17 00:00:00 2001 From: Adrian Malacoda Date: Sat, 29 Nov 2014 02:45:39 -0600 Subject: [PATCH] Add apache config for short url support. --- 000-default.conf | 34 ++++++++++++++++++++++++++++++++++ Dockerfile | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 000-default.conf diff --git a/000-default.conf b/000-default.conf new file mode 100644 index 0000000..6a1ea49 --- /dev/null +++ b/000-default.conf @@ -0,0 +1,34 @@ + + # The ServerName directive sets the request scheme, hostname and port that + # the server uses to identify itself. This is used when creating + # redirection URLs. In the context of virtual hosts, the ServerName + # specifies what hostname must appear in the request's Host: header to + # match this virtual host. For the default virtual host (this file) this + # value is not decisive as it is used as a last resort host regardless. + # However, you must set it for any further virtual host explicitly. + #ServerName www.example.com + + ServerAdmin webmaster@localhost + DocumentRoot /var/www/html + + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + + # MediaWiki Short URL + Alias /wiki /var/www/html/index.php + + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/Dockerfile b/Dockerfile index e5f4620..144f027 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,5 +39,7 @@ RUN ln -s /var/lib/mediawiki/LocalSettings.php /app/LocalSettings.php ADD setup.sh /setup.sh RUN chmod +x setup.sh +ADD 000-default.conf /etc/apache2/sites-available/000-default.conf + EXPOSE 80 CMD ./setup.sh && ./run.sh