updated demo

README.md

@@ -148,7 +148,7 @@ This repository contains a [demo](demo) directory which hold the [docker-compose
 make init
 ```
 
-Then you can assess WebApp on the URL [`http://localhost:8080`](http://localhost:8080) and log in with the user name `demo` and password `demo` . You can send a test email by typing:
+Then you can assess WebApp on the URL [`http://localhost:8080`](http://localhost:8080) and log in with the user name `demo` and password `demo` . You can send yourself a test email by typing:
 
 ```bash
 make test

ROADMAP.md

@@ -4,6 +4,17 @@
 
 See: https://github.com/phusion/baseimage-docker/issues/271
 
+We now use:
+```bash
+apache2ctl -D FOREGROUND -k start"
+```
+
+try:
+```bash
+source /etc/apache2/envvars
+exec /usr/sbin/apache2 -DFOREGROUND
+```
+
 ## Improve healthcheck
 Verify the user anonymously.
 ```bash

demo/Makefile

@@ -34,7 +34,7 @@ auth-up:
 	docker-compose up -d auth
 
 auth-down:
-	docker-compose down auth
+	docker-compose rm -s auth
 
 auth-cmd:
 	docker-compose exec auth /bin/sh
@@ -50,32 +50,35 @@ auth-show_user:
 
 auth-add_user:
 	printf "dn: ou=$(LDAP_USEROU),$(LDAP_BASE)\nchangetype: add\nobjectClass: organizationalUnit\nobjectClass: top\nou: $(LDAP_USEROU)\n\ndn: ou=$(LDAP_GROUPOU),$(LDAP_BASE)\nchangetype: add\nobjectClass: organizationalUnit\nobjectClass: top\nou: $(LDAP_GROUPOU)\n\ndn: uid=$(LDAP_TEST_USER),ou=$(LDAP_USEROU),$(LDAP_BASE)\nchangetype: add\nobjectClass: top\nobjectClass: inetOrgPerson\nobjectClass: $(LDAP_USEROBJ)\ncn: $(LDAP_TEST_USER)\nsn: $(LDAP_TEST_USER)\nuid: $(LDAP_TEST_USER)\nmail: $(LDAP_TEST_USER)@$(MAIL_DOMAIN)\nuidNumber: 1234\ngidNumber: 1234\nhomeDirectory: /home/$(LDAP_TEST_USER)\nuserPassword: $(LDAP_TEST_PASSWD)\n" \
-	| tee /dev/tty | docker-compose exec -T auth ldap modify
+	| docker-compose exec -T auth ldap modify
 
 mail-mta-up:
 	docker-compose up -d mail-mta
 
 mail-mta-down:
-	docker-compose down mail-mta
+	docker-compose rm -s mail-mta
 
 mail-mta-cmd:
-	docker-compose exec mail-mta /bin/bash
+	docker-compose exec mail-mta /bin/sh
 
 mail-mta-logs:
 	docker container logs $(COMPOSE_PROJECT_NAME)_mail-mta_1
 
 mail-mta-bayes:
-	docker-compose exec mail-mta sh -c 'rm -f bayesian.database.gz && wget http://artinvoice.hu/spams/bayesian.database.gz && gunzip bayesian.database.gz && sa-learn --restore bayesian.database && chown -R amavis: /var/amavis && rm -rf bayesian.database'
+	docker-compose exec mail-mta sh -c 'rm -f bayesian.database.gz && wget http://artinvoice.hu/spams/bayesian.database.gz && gunzip bayesian.database.gz && sa-learn --restore bayesian.database && chown -R amavis: /var/amavis/.spamassassin && rm -rf bayesian.database'
 
 mail-mta-test:
-	printf "EHLO mx\nMAIL FROM: <test@$(MAIL_DOMAIN).com>\nRCPT TO: <$(LDAP_TEST_USER)@$(MAIL_DOMAIN)>\nDATA\nFrom: A tester <test@$(MAIL_DOMAIN)>\nTo: <$(LDAP_TEST_USER)@$(MAIL_DOMAIN)>\nDate: $$(date)\nSubject: A test message\n\nGreat news! You can receive email.\n.\nQUIT\n" \
+	printf "EHLO mx\nMAIL FROM: <test@example.biz>\nRCPT TO: <$(LDAP_TEST_USER)@$(MAIL_DOMAIN)>\nDATA\nFrom: A tester <test@example.biz>\nTo: <$(LDAP_TEST_USER)@$(MAIL_DOMAIN)>\nDate: $$(date)\nSubject: A test message\n\nGreat news! You can receive email.\n.\nQUIT\n" \
 	| nc -C localhost 25
 
+mail-mta-razor:
+	docker-compose exec mail-mta conf cntcfg_razor_register
+
 mail-db-up:
 	docker-compose up -d mail-db
 
 mail-db-down:
-	docker-compose down mail-db
+	docker-compose rm -s mail-db
 
 mail-db-cmd:
 	docker-compose exec mail-db /bin/bash
@@ -90,7 +93,7 @@ mail-app-up:
 	docker-compose up -d mail-app
 
 mail-app-down:
-	docker-compose down mail-app
+	docker-compose rm -s mail-app
 
 mail-app-cmd:
 	docker-compose exec mail-app /bin/bash

demo/docker-compose.yml

@@ -49,7 +49,7 @@ services:
       - DKIM_SELECTOR=${DKIM_SELECTOR-default}
       - SYSLOG_LEVEL=4
     volumes:
-      - mail-mta:/var
+      - mail-mta:/srv
 
   mail-db:
     image: mariadb