diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2021-09-22 21:01:11 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2021-09-22 21:01:11 +0200 |
| commit | bb691beafb500b78a03cf0c36527c355a15828f0 (patch) | |
| tree | 631b9d48719a58192889d45ec54ccf9c0de7de65 | |
| parent | bfce3570786a37cf49d38ba0573929d673772cbf (diff) | |
| parent | 36fb7d1f162cf8203135c4f799ef692ab42c3e46 (diff) | |
Merge branch 'master' of xayide.jones.dk:/srv/git/source.redpill.dk/features
| -rw-r--r-- | .mrconfig | 9 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | mkdocs.yml | 2 |
3 files changed, 8 insertions, 14 deletions
@@ -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' @@ -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 @@ -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' |