improve docs

11 files changed, 144 insertions, 3 deletions

diff --git a/openbsd/frontends/etc/mail/aliases b/openbsd/frontends/etc/mail:blowfish/aliases
index 91bf1d0..91bf1d0 100644
--- a/openbsd/frontends/etc/mail/aliases
+++ b/openbsd/frontends/etc/mail:blowfish/aliases
diff --git a/openbsd/frontends/etc/mail/smtpd.conf b/openbsd/frontends/etc/mail:blowfish/smtpd.conf
index 552d186..552d186 100644
--- a/openbsd/frontends/etc/mail/smtpd.conf
+++ b/openbsd/frontends/etc/mail:blowfish/smtpd.conf
diff --git a/openbsd/frontends/etc/mail/virtualdomains b/openbsd/frontends/etc/mail:blowfish/virtualdomains
index 9bdd68a..9bdd68a 100644
--- a/openbsd/frontends/etc/mail/virtualdomains
+++ b/openbsd/frontends/etc/mail:blowfish/virtualdomains
diff --git a/openbsd/frontends/etc/mail/virtualusers b/openbsd/frontends/etc/mail:blowfish/virtualusers
index 5ae0b24..5ae0b24 100644
--- a/openbsd/frontends/etc/mail/virtualusers
+++ b/openbsd/frontends/etc/mail:blowfish/virtualusers
diff --git a/openbsd/frontends/etc/mail:twofish/aliases b/openbsd/frontends/etc/mail:twofish/aliases
new file mode 100644
index 0000000..91bf1d0
--- /dev/null
+++ b/openbsd/frontends/etc/mail:twofish/aliases
@@ -0,0 +1,103 @@
+#
+#	$OpenBSD: aliases,v 1.68 2020/01/24 06:17:37 tedu Exp $
+#
+#  Aliases in this file will NOT be expanded in the header from
+#  Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
+#
+#	>>>>>>>>>>	The program "newaliases" must be run after
+#	>> NOTE >>	this file is updated for any changes to
+#	>>>>>>>>>>	show through to smtpd.
+#
+
+# Basic system aliases -- these MUST be present
+MAILER-DAEMON: postmaster
+postmaster: root
+
+# General redirections for important pseudo accounts
+daemon:	root
+ftp-bugs: root
+operator: root
+www:	root
+admin:	root
+
+# Redirections for pseudo accounts that should not receive mail
+_bgpd: /dev/null
+_dhcp: /dev/null
+_dpb: /dev/null
+_dvmrpd: /dev/null
+_eigrpd: /dev/null
+_file: /dev/null
+_fingerd: /dev/null
+_ftp: /dev/null
+_hostapd: /dev/null
+_identd: /dev/null
+_iked: /dev/null
+_isakmpd: /dev/null
+_iscsid: /dev/null
+_ldapd: /dev/null
+_ldpd: /dev/null
+_mopd: /dev/null
+_nsd: /dev/null
+_ntp: /dev/null
+_ospfd: /dev/null
+_ospf6d: /dev/null
+_pbuild: /dev/null
+_pfetch: /dev/null
+_pflogd: /dev/null
+_ping: /dev/null
+_pkgfetch: /dev/null
+_pkguntar: /dev/null
+_portmap: /dev/null
+_ppp: /dev/null
+_rad: /dev/null
+_radiusd: /dev/null
+_rbootd: /dev/null
+_relayd: /dev/null
+_ripd: /dev/null
+_rstatd: /dev/null
+_rusersd: /dev/null
+_rwalld: /dev/null
+_smtpd: /dev/null
+_smtpq: /dev/null
+_sndio: /dev/null
+_snmpd: /dev/null
+_spamd: /dev/null
+_switchd: /dev/null
+_syslogd: /dev/null
+_tcpdump: /dev/null
+_traceroute: /dev/null
+_tftpd: /dev/null
+_unbound: /dev/null
+_unwind: /dev/null
+_vmd: /dev/null
+_x11:   /dev/null
+_ypldap: /dev/null
+bin:	/dev/null
+build:	/dev/null
+nobody:	/dev/null
+_tftp_proxy: /dev/null
+_ftp_proxy: /dev/null
+_sndiop: /dev/null
+_syspatch: /dev/null
+_slaacd: /dev/null
+sshd:   /dev/null
+
+# Well-known aliases -- these should be filled in!
+root: paul
+manager: root
+dumper: root
+
+# RFC 2142: NETWORK OPERATIONS MAILBOX NAMES
+abuse:		root
+noc:		root
+security:	root
+
+# RFC 2142: SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES
+hostmaster:	root
+# usenet:	root
+# news:		usenet
+webmaster:	root
+# ftp:		root
+
+paul: paul.buetow@protonmail.com
+albena: albena.buetow@protonmail.com
diff --git a/openbsd/frontends/etc/mail:twofish/smtpd.conf b/openbsd/frontends/etc/mail:twofish/smtpd.conf
new file mode 100644
index 0000000..630b9d0
--- /dev/null
+++ b/openbsd/frontends/etc/mail:twofish/smtpd.conf
@@ -0,0 +1,23 @@
+# This is the smtpd server system-wide configuration file.
+# See smtpd.conf(5) for more information.
+
+# I used https://www.checktls.com/TestReceiver for testing.
+
+pki "buetow_org_tls" cert "/etc/ssl/buetow.org.fullchain.pem"
+pki "buetow_org_tls" key "/etc/ssl/private/buetow.org.key"
+
+table aliases file:/etc/mail/aliases
+table virtualdomains file:/etc/mail/virtualdomains
+table virtualusers file:/etc/mail/virtualusers
+
+listen on socket
+listen on all tls pki "buetow_org_tls" hostname "www.buetow.org"
+#listen on all
+
+action localmail mbox alias <aliases>
+action receive mbox virtual <virtualusers>
+action outbound relay
+
+match from any for domain <virtualdomains> action receive
+match from local for local action localmail
+match from local for any action outbound
diff --git a/openbsd/frontends/etc/mail:twofish/virtualdomains b/openbsd/frontends/etc/mail:twofish/virtualdomains
new file mode 100644
index 0000000..9bdd68a
--- /dev/null
+++ b/openbsd/frontends/etc/mail:twofish/virtualdomains
@@ -0,0 +1,11 @@
+buetow.org
+paul.buetow.org
+mx.buetow.org
+de.buetow.org
+bg.buetow.org
+uk.buetow.org
+us.buetow.org
+es.buetow.org
+dev.buetow.org
+snonux.de
+dtail.dev
diff --git a/openbsd/frontends/etc/mail:twofish/virtualusers b/openbsd/frontends/etc/mail:twofish/virtualusers
new file mode 100644
index 0000000..5ae0b24
--- /dev/null
+++ b/openbsd/frontends/etc/mail:twofish/virtualusers
@@ -0,0 +1,2 @@
+albena@buetow.org albena.buetow@protonmail.com
+@ paul.buetow@protonmail.com
diff --git a/openbsd/frontends/etc/myname b/openbsd/frontends/etc/myname:blowfish
index 66796b2..66796b2 100644
--- a/openbsd/frontends/etc/myname
+++ b/openbsd/frontends/etc/myname:blowfish
diff --git a/openbsd/frontends/etc/myname:twofish b/openbsd/frontends/etc/myname:twofish
new file mode 100644
index 0000000..86c707c
--- /dev/null
+++ b/openbsd/frontends/etc/myname:twofish
@@ -0,0 +1 @@
+twofish.buetow.org
diff --git a/openbsd/frontends/opt/src/gemini/README.md b/openbsd/frontends/opt/src/gemini/README.md
index b056838..01a48f5 100644
--- a/openbsd/frontends/opt/src/gemini/README.md
+++ b/openbsd/frontends/opt/src/gemini/README.md
@@ -2,9 +2,10 @@ Custom gemini server configuration
 =================================
 
 ```
-git clone https://github.com/a-h/gemini
-cp -Rpv ./myserver ./gemini/myserver
-cd ./gemini/myserver
+doas pkg_add go
+git clone https://github.com/a-h/gemini ~/git/gemini
+cp -Rpv ./myserver ~/git/gemini/myserver
+cd ~/git/gemini/myserver
 go build main.go
 doas cp -p ./main /usr/local/bin/geminid
 ```