42 files changed, 840 insertions, 1852 deletions

diff --git a/.gitignore b/.gitignore
index d8249a5..28da172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-.emacs.desktop
-settings.py
+.emacs*
+.env
+local.yml
 *~
-tmp/
+\#*
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..60a9a90
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "dicodock"]
+        path = dicodock
+        url = ssh://gray@git.gnu.org.ua/dico/dicodock.git
diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index 2df5844..0000000
--- a/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-Options All -Indexes
-<Files ~ "^\.emacs">
-    Order allow,deny
-    Deny from all
-    Satisfy All
-</Files>
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 0000000..e5e91b5
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,35 @@
+PROJECT = gcidedock
+command = docker compose -p $(PROJECT) \
+             -f dicodock/docker-compose.yml \
+             -f docker-compose.override.yml
+ifneq (,$(wildcard local.yml))
+  command += -f local.yml
+endif
+ifneq (,$(wildcard .env))
+  command += --env-file .env
+  include .env
+  ifneq (,$(PROFILE))
+    command += --profile $(PROFILE)
+  endif
+endif
+
+
+define goal =
+$(1):
+        $$(command) $(1)$(if $(filter-out up, $(1)),, -d)
+endef
+
+all: build
+
+build_dicoweb_orig:
+        docker compose -f dicodock/docker-compose.yml build dicoweb
+
+build: build_dicoweb_orig
+
+$(foreach verb, build config up down restart ps, $(eval $(call goal, $(verb))))
+
+bootstrap:
+        git submodule update --init --recursive
+
+
+
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index ee9a98b..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,79 +0,0 @@
-GNU Dico - Dicoweb INSTALL
-Copyright (C) 2008-2010, 2012 Wojciech Polak
-
-* Dicoweb requirements
-======================
-
-- Django 1.0+ -- a Python Web framework (http://www.djangoproject.com/)
-- Wit -- a wiki translator distributed within GNU Dico.
-  (http://puszcza.gnu.org.ua/projects/wit/)
-
-* Installation instructions
-===========================
-
-Rename 'settings-sample.py' to 'settings.py' and edit your
-local Dicoweb site configuration.
-
-
-** The development/test server
-------------------------------
-
-Change the current working directory into the `dicoweb' directory
-and run the command `python manage.py runserver'. You will see
-the following output:
-
- Validating models...
- 0 errors found.
-
- Django version 1.0, using settings 'dicoweb.settings'
- Development server is running at http://127.0.0.1:8000/
- Quit the server with CONTROL-C.
-
-** Production server with mod_wsgi
-----------------------------------
-
-Apache configuration:
-
-  LoadModule wsgi_module modules/mod_wsgi.so
-  WSGIScriptAlias / /usr/local/django/dicoweb/dicoweb.wsgi
-  Alias /static "/usr/local/django/dicoweb/static"
-
-More detailed information is available at:
-http://code.google.com/p/modwsgi/wiki/IntegrationWithDjango
-
-** Production server with mod_python
-------------------------------------
-
-Apache configuration:
-
- LoadModule python_module modules/mod_python.so
- <Location "/">
-   SetHandler python-program
-   PythonHandler django.core.handlers.modpython
-   PythonPath "sys.path + ['/usr/local/django', '/usr/local/django/dicoweb']"
-   SetEnv DJANGO_SETTINGS_MODULE dicoweb.settings
-   PythonInterpreter dicoweb
-   PythonDebug Off
- </Location>
-
- <Location "/static">
-   SetHandler None
- </Location>
- <Location "/favicon.ico">
-   SetHandler None
- </Location>
-
- <Directory "/usr/local/django/dicoweb/">
-   AllowOverride All
-   Options None
-   Order allow,deny
-   Allow from all
- </Directory>
-
-
-
-Local Variables:
-mode: outline
-paragraph-separate: "[  ]*$"
-version-control: never
-End:
diff --git a/README b/README
new file mode 100644
index 0000000..b94672c
--- /dev/null
+++ b/README
@@ -0,0 +1,70 @@
+* Overview
+
+This file describes docker-based setup for the gcide web site.
+
+* Installation
+
+1. make bootstrap
+
+This will prepare GNU dico sources for building.
+
+2. make build
+
+This will build the docker images.
+
+3. Edit the .env file.  It should contain the following variables:
+
+  PROFILE
+    Optional.  Defines the kind of http server to use for serving
+    static data.  Allowed values are: lighttpd or nginx.  If empty,
+    the http server on host server must be configured to serve static
+    data.
+  DICOWEB_NAME
+    Domain name of the server.
+  DICOWEB_PORT
+    Port the dicoweb container is listening on.
+  DICOWEB_ADMIN
+    Email address of the administrator.
+  DICT_SERVER
+    IP address or hostname of the dict server to use.  The server must
+    offer the gcide database.
+  PIES_SYSLOG_SERVER
+    IP address and port number of the syslog server.
+
+4. Configure your syslog server to receive and route log messages from
+   gcideweb.
+
+5. make up
+
+This will start the system.
+
+* Maintenance
+
+Most commands are performed by invoking `make' with the corresponding
+command verb:
+
+** make config
+
+   Inspect the resulting docker-compose.yml.
+   
+** make build