From e89c553aedcd130cf97f05bbd58e958607222f4e Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 20 Sep 2021 14:58:19 +0200 Subject: sort mrconfig entries by soource name --- .mrconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.mrconfig b/.mrconfig index 80d5f7d..e383a9d 100644 --- a/.mrconfig +++ b/.mrconfig @@ -14,6 +14,9 @@ checkout = git clone 'git://source.redpill.dk/accounting.git' 'accounting' [source/chat] checkout = git clone 'git://source.redpill.dk/chat-matrix.git' 'chat' +[source/about] +checkout = git clone 'git://source.redpill.dk/org.git' 'about' + [source/source] checkout = git clone 'git://source.redpill.dk/source.git' 'source' @@ -25,6 +28,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' -- cgit v1.2.3 From 473799ef7656372dee11cfb0d61157d9f6255d10 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 20 Sep 2021 15:07:35 +0200 Subject: add feature mail --- .mrconfig | 3 +++ Makefile | 3 ++- mkdocs.yml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.mrconfig b/.mrconfig index e383a9d..6a7d518 100644 --- a/.mrconfig +++ b/.mrconfig @@ -14,6 +14,9 @@ checkout = git clone 'git://source.redpill.dk/accounting.git' 'accounting' [source/chat] checkout = git clone 'git://source.redpill.dk/chat-matrix.git' 'chat' +[source/mail] +checkout = git clone 'git://source.redpill.dk/mail.git' 'mail' + [source/about] checkout = git clone 'git://source.redpill.dk/org.git' 'about' diff --git a/Makefile b/Makefile index 90ccc60..60b6bca 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,11 @@ eventhost ?= event.$(domain) shellhost ?= shell.$(domain) githost ?= source.$(domain) gitshellhost ?= $(shellhost) +mailhost ?= mail.$(domain) matrixhost ?= matrix.$(domain) organisation ?= Example orga contact_sysadmins ?= contact sysadmins -VARIABLES = domain eventhost shellhost githost gitshellhost matrixhost organisation contact_sysadmins +VARIABLES = domain eventhost shellhost githost gitshellhost mailhost matrixhost organisation contact_sysadmins MKDOCS_PREP ?= bin/mkdocs-prep.pl diff --git a/mkdocs.yml b/mkdocs.yml index baf9b19..3ef6857 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -12,6 +12,7 @@ nav: - 'Account security': 'account/secure/index.md' - Accounting: 'accounting/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' @@ -23,6 +24,7 @@ nav: - 'Account security': 'account/secure/use.md' - Accounting: 'accounting/use.md' - Chat: 'chat/use.md' + - Mail: 'mail/use.md' - Source: 'source/use.md' - Administration: # - Introduction: 'admin.md' -- cgit v1.2.3 From 36fb7d1f162cf8203135c4f799ef692ab42c3e46 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 20 Sep 2021 17:14:03 +0200 Subject: stop generate default hints file (done with mkdocs-prep now) --- Makefile | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Makefile b/Makefile index 60b6bca..8a69b7e 100644 --- a/Makefile +++ b/Makefile @@ -2,17 +2,6 @@ -include site.mk -domain ?= example.org -eventhost ?= event.$(domain) -shellhost ?= shell.$(domain) -githost ?= source.$(domain) -gitshellhost ?= $(shellhost) -mailhost ?= mail.$(domain) -matrixhost ?= matrix.$(domain) -organisation ?= Example orga -contact_sysadmins ?= contact sysadmins -VARIABLES = domain eventhost shellhost githost gitshellhost mailhost matrixhost organisation contact_sysadmins - MKDOCS_PREP ?= bin/mkdocs-prep.pl all: doc @@ -44,7 +33,6 @@ docs/%: source init: mr update - $(if $(wildcard site.mk),,$(foreach v,$(VARIABLES),echo $v = $($v) >> site.mk;)) clean: rm -rf site -- cgit v1.2.3