rexification of more

9 files changed, 49 insertions, 140 deletions

diff --git a/openbsd/frontends/Rexfile b/openbsd/frontends/Rexfile
index 0d16905..cd5a6eb 100644
--- a/openbsd/frontends/Rexfile
+++ b/openbsd/frontends/Rexfile
@@ -72,6 +72,53 @@ task 'relayd', group => 'frontends',
     service 'relayd', ensure => 'started';
   };
 
+desc 'Setup OpenSMTPD';
+task 'smtpd', group => 'frontends',
+  sub {
+    file '/etc/mail/aliases',
+      source => './etc/mail/aliases',
+      owner => 'root',
+      group => 'wheel',
+      mode => '644',
+      on_change => sub {
+        say run 'newaliases';
+      };
+
+    file '/etc/mail/virtualdomains',
+      source => './etc/mail/virtualdomains',
+      owner => 'root',
+      group => 'wheel',
+      mode => '644',
+      on_change => sub {
+        service 'smtpd' => 'restart';
+      };
+
+    file '/etc/mail/virtualusers',
+      source => './etc/mail/virtualusers',
+      owner => 'root',
+      group => 'wheel',
+      mode => '644',
+      on_change => sub {
+        service 'smtpd' => 'restart';
+      };
+
+    file '/etc/mail/smtpd.conf',
+      content => template('./etc/mail/smtpd.conf.tpl', mail_hostname => sub {
+          my $hostname = shift;
+          return 'buetow.org' if $hostname eq 'blowfish';
+          return 'www.buetow.org' if $hostname eq 'twofish';
+          return 'buetow.org';
+        }),
+      owner => 'root',
+      group => 'wheel',
+      mode => '644',
+      on_change => sub {
+        service 'smtpd' => 'restart';
+      };
+
+    service 'smtpd', ensure => 'started';
+  };
+
 desc 'Setup HA';
 task 'ha', group => 'frontends',
   sub {
@@ -96,6 +143,7 @@ task 'frontend', group => 'frontends',
     httpd();
     inetd();
     relayd();
+    smtpd();
     ha();
   };
 
diff --git a/openbsd/frontends/etc/mail:blowfish/aliases b/openbsd/frontends/etc/mail/aliases
index 91bf1d0..91bf1d0 100644
--- a/openbsd/frontends/etc/mail:blowfish/aliases
+++ b/openbsd/frontends/etc/mail/aliases
diff --git a/openbsd/frontends/etc/mail:twofish/smtpd.conf b/openbsd/frontends/etc/mail/smtpd.conf.tpl
index 630b9d0..2fb68e3 100644
--- a/openbsd/frontends/etc/mail:twofish/smtpd.conf
+++ b/openbsd/frontends/etc/mail/smtpd.conf.tpl
@@ -11,7 +11,7 @@ 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 tls pki "buetow_org_tls" hostname "<%= $mail_hostname->($hostname) %>"
 #listen on all
 
 action localmail mbox alias <aliases>
diff --git a/openbsd/frontends/etc/mail:blowfish/virtualdomains b/openbsd/frontends/etc/mail/virtualdomains
index 9bdd68a..9bdd68a 100644
--- a/openbsd/frontends/etc/mail:blowfish/virtualdomains
+++ b/openbsd/frontends/etc/mail/virtualdomains
diff --git a/openbsd/frontends/etc/mail:blowfish/virtualusers b/openbsd/frontends/etc/mail/virtualusers
index 5ae0b24..5ae0b24 100644
--- a/openbsd/frontends/etc/mail:blowfish/virtualusers
+++ b/openbsd/frontends/etc/mail/virtualusers
diff --git a/openbsd/frontends/etc/mail:blowfish/smtpd.conf b/openbsd/frontends/etc/mail:blowfish/smtpd.conf
deleted file mode 100644
index 552d186..0000000
--- a/openbsd/frontends/etc/mail:blowfish/smtpd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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 "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/aliases b/openbsd/frontends/etc/mail:twofish/aliases
deleted file mode 100644
index 91bf1d0..0000000
--- a/openbsd/frontends/etc/mail:twofish/aliases
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-#	$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/virtualdomains b/openbsd/frontends/etc/mail:twofish/virtualdomains
deleted file mode 100644
index 9bdd68a..0000000
--- a/openbsd/frontends/etc/mail:twofish/virtualdomains
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 5ae0b24..0000000
--- a/openbsd/frontends/etc/mail:twofish/virtualusers
+++ /dev/null
@@ -1,2 +0,0 @@
-albena@buetow.org albena.buetow@protonmail.com
-@ paul.buetow@protonmail.com