# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1456341694 -3600
# Node ID eeff161a19e88d74f0b8c1bfa68beb88492d173e
# Parent  70f65a6b339293b4adea5623406a7b23d441a54a
docker (base): add dokuwiki module for dokuwiki importer + fixed /etc/hosts for subdomains

diff -r 70f65a6b3392 -r eeff161a19e8 docker/base/Dockerfile
--- a/docker/base/Dockerfile	Wed Feb 24 15:42:48 2016 +0100
+++ b/docker/base/Dockerfile	Wed Feb 24 20:21:34 2016 +0100
@@ -21,6 +21,9 @@
 RUN apt-get install -y --no-install-recommends locales dbus-x11 python python-gobject-2 python-dbus python-lxml python-mutagen python-pil python-crypto python-feed python-potr python-twisted-core python-twisted-mail python-twisted-web python-twisted-words python-wokkel python-xdg python-xe python-zope.interface python-gi python-urwid python-markdown python-html2text mercurial python-pip
 RUN apt-get clean
 
+# dokuwiki module is needed for the blog importer
+RUN pip install dokuwiki
+
 # we need UTF-8 locale
 RUN sed -i "s/# en_US.UTF-8/en_US.UTF-8/" /etc/locale.gen
 RUN locale-gen
@@ -116,6 +119,8 @@
     config.set(SECTION, OPTION, domain)\n\
     config.write(open(CONFIG_PATH, "w"))\n\
 subprocess.call(["add_host", domain, "prosody"])\n\
+for subdomain in ("chat", "proxy", "upload", "pubsub", "salut"):\n\
+    subprocess.call(["add_host", "{}.{}".format(subdomain, domain), "prosody"])\n\
 ' > /usr/local/bin/set_account_domain && chmod 0555 /usr/local/bin/set_account_domain
 
 # account domain is set, then sat is launched with D-Bus activated