commit 9077ca204ec49589158ac6d9c2e29e3e5dcccfef
parent 95ae3abf6acedfa30537b67003735c1c180485b1
author: nathanael <nathanael@dalliard.ch>
date: Wed, 22 Oct 2025 11:58:11 +0000
s1: update aliases
diffstat:
4 files changed, 15 insertions(+), 104 deletions(-)
diff --git a/s1/makefile b/s1/makefile
@@ -1,7 +1,7 @@
HOST != hostname
EXP = s1.dalliard.ch
-deploy: dots sys cron pkg
+deploy: dots sys cron mail pkg
host:
@[ "$(HOST)" = "$(EXP)" ]
@@ -15,5 +15,8 @@ sys: host
cron: host
@./scripts/cronjobs.sh
+mail: host
+ @./scripts/aliases.sh
+
pkg: host
@doas pkg_add -l packages >/dev/null
diff --git a/s1/scripts/aliases.sh b/s1/scripts/aliases.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+add() {
+ grep -q "^$1:" /etc/mail/aliases || \
+ echo "$1: $2" | doas tee -a /etc/mail/aliases >/dev/null
+}
+
+add "josia" "josiadalliard@gmail.com"
+add "tabea" "tabeadalliard9@gmail.com"
+
+doas newaliases
diff --git a/s1/scripts/sysfiles.sh b/s1/scripts/sysfiles.sh
@@ -9,7 +9,6 @@ doas install -o root -g wheel -m 600 "$src/pf.conf" "/etc/pf.conf"
doas install -o root -g wheel -m 600 "$src/relayd.conf" "/etc/relayd.conf"
doas install -o root -g wheel -m 640 "$src/doas.conf" "/etc/doas.conf"
doas install -o root -g wheel -m 644 "$src/acme-client.conf" "/etc/acme-client.conf"
-doas install -o root -g wheel -m 644 "$src/aliases" "/etc/mail/aliases"
doas install -o root -g wheel -m 644 "$src/daily.local" "/etc/daily.local"
doas install -o root -g wheel -m 644 "$src/dovecot.conf" "/etc/dovecot/local.conf"
doas install -o root -g wheel -m 644 "$src/httpd.conf" "/etc/httpd.conf"
diff --git a/s1/sysfiles/aliases b/s1/sysfiles/aliases
@@ -1,102 +0,0 @@
-#
-# $OpenBSD: aliases,v 1.70 2022/06/28 18:46:01 claudio 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
-
-# Redirections for pseudo accounts that should not receive mail
-_bgpd: /dev/null
-_bgplgd: /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
-_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: nathanael
-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
-
-josia: josiadalliard@gmail.com
-tabea: tabeadalliard9@gmail.com
