Merge branch 'master' of xayide.jones.dk:/srv/git/source.redpill.dk/features

3 files changed, 8 insertions, 14 deletions

diff --git a/.mrconfig b/.mrconfig
index b32175d..5f1120e 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -17,6 +17,12 @@ checkout = git clone 'git://source.redpill.dk/chat-matrix.git' 'chat'
 [source/event]
 checkout = git clone 'git://source.redpill.dk/event.git' 'event'
 
+[source/mail]
+checkout = git clone 'git://source.redpill.dk/mail.git' 'mail'
+
+[source/about]
+checkout = git clone 'git://source.redpill.dk/org.git' 'about'
+
 [source/source]
 checkout = git clone 'git://source.redpill.dk/source.git' 'source'
 
@@ -28,6 +34,3 @@ checkout = git clone 'git://source.redpill.dk/system-desktop.git' 'system-deskto
 
 [source/system-gateway]
 checkout = git clone 'git://source.redpill.dk/system-gateway.git' 'system-gateway'
-
-[source/about]
-checkout = git clone 'git://source.redpill.dk/org.git' 'about'
diff --git a/Makefile b/Makefile
index 90ccc60..8a69b7e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,16 +2,6 @@
 
 -include site.mk
 
-domain ?= example.org
-eventhost ?= event.$(domain)
-shellhost ?= shell.$(domain)
-githost ?= source.$(domain)
-gitshellhost ?= $(shellhost)
-matrixhost ?= matrix.$(domain)
-organisation ?= Example orga
-contact_sysadmins ?= contact sysadmins
-VARIABLES = domain eventhost shellhost githost gitshellhost matrixhost organisation contact_sysadmins
-
 MKDOCS_PREP ?= bin/mkdocs-prep.pl
 
 all: doc
@@ -43,7 +33,6 @@ docs/%: source
 
 init:
 	mr update
-	$(if $(wildcard site.mk),,$(foreach v,$(VARIABLES),echo $v = $($v) >> site.mk;))
 
 clean:
 	rm -rf site
diff --git a/mkdocs.yml b/mkdocs.yml
index fac566d..ce0d91f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -13,6 +13,7 @@ nav:
     - Accounting: 'accounting/index.md'
     - Calendar events: 'event/index.md'
     - Chat: 'chat/index.md'
+    - Mail: 'mail/index.md'
     - System: 'system/index.md'
     - 'System desktop': 'system/desktop/index.md'
     - 'System gateway': 'system/gateway/index.md'
@@ -25,6 +26,7 @@ nav:
     - Accounting: 'accounting/use.md'
     - Calendaring events: 'event/use.md'
     - Chat: 'chat/use.md'
+    - Mail: 'mail/use.md'
     - Source: 'source/use.md'
 - Administration:
 #    - Introduction: 'admin.md'