From 5f2668d6e94da47a873987d89c984241246cc9d5 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 15 Apr 2022 16:35:20 +0100 Subject: rexification of more --- openbsd/frontends/Rexfile | 48 ++++++++++ openbsd/frontends/etc/mail/aliases | 103 +++++++++++++++++++++ openbsd/frontends/etc/mail/smtpd.conf.tpl | 23 +++++ openbsd/frontends/etc/mail/virtualdomains | 11 +++ openbsd/frontends/etc/mail/virtualusers | 2 + openbsd/frontends/etc/mail:blowfish/aliases | 103 --------------------- openbsd/frontends/etc/mail:blowfish/smtpd.conf | 23 ----- openbsd/frontends/etc/mail:blowfish/virtualdomains | 11 --- openbsd/frontends/etc/mail:blowfish/virtualusers | 2 - openbsd/frontends/etc/mail:twofish/aliases | 103 --------------------- openbsd/frontends/etc/mail:twofish/smtpd.conf | 23 ----- openbsd/frontends/etc/mail:twofish/virtualdomains | 11 --- openbsd/frontends/etc/mail:twofish/virtualusers | 2 - 13 files changed, 187 insertions(+), 278 deletions(-) create mode 100644 openbsd/frontends/etc/mail/aliases create mode 100644 openbsd/frontends/etc/mail/smtpd.conf.tpl create mode 100644 openbsd/frontends/etc/mail/virtualdomains create mode 100644 openbsd/frontends/etc/mail/virtualusers delete mode 100644 openbsd/frontends/etc/mail:blowfish/aliases delete mode 100644 openbsd/frontends/etc/mail:blowfish/smtpd.conf delete mode 100644 openbsd/frontends/etc/mail:blowfish/virtualdomains delete mode 100644 openbsd/frontends/etc/mail:blowfish/virtualusers delete mode 100644 openbsd/frontends/etc/mail:twofish/aliases delete mode 100644 openbsd/frontends/etc/mail:twofish/smtpd.conf delete mode 100644 openbsd/frontends/etc/mail:twofish/virtualdomains delete mode 100644 openbsd/frontends/etc/mail:twofish/virtualusers 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/aliases b/openbsd/frontends/etc/mail/aliases new file mode 100644 index 0000000..91bf1d0 --- /dev/null +++ b/openbsd/frontends/etc/mail/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/smtpd.conf.tpl b/openbsd/frontends/etc/mail/smtpd.conf.tpl new file mode 100644 index 0000000..2fb68e3 --- /dev/null +++ b/openbsd/frontends/etc/mail/smtpd.conf.tpl @@ -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 "<%= $mail_hostname->($hostname) %>" +#listen on all + +action localmail mbox alias +action receive mbox virtual +action outbound relay + +match from any for domain action receive +match from local for local action localmail +match from local for any action outbound diff --git a/openbsd/frontends/etc/mail/virtualdomains b/openbsd/frontends/etc/mail/virtualdomains new file mode 100644 index 0000000..9bdd68a --- /dev/null +++ b/openbsd/frontends/etc/mail/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/virtualusers b/openbsd/frontends/etc/mail/virtualusers new file mode 100644 index 0000000..5ae0b24 --- /dev/null +++ b/openbsd/frontends/etc/mail/virtualusers @@ -0,0 +1,2 @@ +albena@buetow.org albena.buetow@protonmail.com +@ paul.buetow@protonmail.com diff --git a/openbsd/frontends/etc/mail:blowfish/aliases b/openbsd/frontends/etc/mail:blowfish/aliases deleted file mode 100644 index 91bf1d0..0000000 --- a/openbsd/frontends/etc/mail:blowfish/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: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 -action receive mbox virtual -action outbound relay - -match from any for domain action receive -match from local for local action localmail -match from local for any action outbound diff --git a/openbsd/frontends/etc/mail:blowfish/virtualdomains b/openbsd/frontends/etc/mail:blowfish/virtualdomains deleted file mode 100644 index 9bdd68a..0000000 --- a/openbsd/frontends/etc/mail:blowfish/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:blowfish/virtualusers b/openbsd/frontends/etc/mail:blowfish/virtualusers deleted file mode 100644 index 5ae0b24..0000000 --- a/openbsd/frontends/etc/mail:blowfish/virtualusers +++ /dev/null @@ -1,2 +0,0 @@ -albena@buetow.org albena.buetow@protonmail.com -@ paul.buetow@protonmail.com 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/smtpd.conf b/openbsd/frontends/etc/mail:twofish/smtpd.conf deleted file mode 100644 index 630b9d0..0000000 --- a/openbsd/frontends/etc/mail:twofish/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 "www.buetow.org" -#listen on all - -action localmail mbox alias -action receive mbox virtual -action outbound relay - -match from any for domain 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 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 -- cgit v1.2.3