Mercurial > sat_docs
changeset 94:eeff161a19e8
docker (base): add dokuwiki module for dokuwiki importer + fixed /etc/hosts for subdomains
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Wed, 24 Feb 2016 20:21:34 +0100 |
| parents | 70f65a6b3392 |
| children | 33f9610480ea |
| files | docker/base/Dockerfile |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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