summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/Makefile2
-rw-r--r--etc/aliases64
-rwxr-xr-xetc/periodic/daily/210.backup-aliases10
-rw-r--r--share/man/man5/periodic.conf.52
-rw-r--r--share/man/man8/adding_user.82
-rw-r--r--usr.bin/mail/mail.12
-rw-r--r--usr.bin/msgs/msgs.12
-rw-r--r--usr.sbin/adduser/adduser.82
-rw-r--r--usr.sbin/ctm/ctm_rmail/ctm_rmail.12
9 files changed, 12 insertions, 76 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 495df28..1fdaa28 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -3,7 +3,7 @@
SUBDIR= sendmail
-BIN1= aliases amd.map apmd.conf auth.conf \
+BIN1= amd.map apmd.conf auth.conf \
crontab csh.cshrc csh.login csh.logout \
dhclient.conf dm.conf fbtab ftpusers gettytab group \
hosts hosts.allow host.conf hosts.equiv hosts.lpd \
diff --git a/etc/aliases b/etc/aliases
deleted file mode 100644
index 3ecde87..0000000
--- a/etc/aliases
+++ /dev/null
@@ -1,64 +0,0 @@
-# $FreeBSD$
-# @(#)aliases 5.3 (Berkeley) 5/24/90
-#
-# Aliases in this file will NOT be expanded in the header from
-# Mail, but WILL be visible over networks.
-#
-# >>>>>>>>>> The program "newaliases" must be run after
-# >> NOTE >> this file is updated for any changes to
-# >>>>>>>>>> show through to sendmail.
-#
-#
-# See also RFC 2142, `MAILBOX NAMES FOR COMMON SERVICES, ROLES
-# AND FUNCTIONS', May 1997
-
-# Pretty much everything else in this file points to "root", so
-# you would do well in either reading roots mailbox or forwarding
-# roots email from here.
-
-# root: me@my.domain
-
-# Basic system aliases -- these MUST be present
-MAILER-DAEMON: postmaster
-postmaster: root
-
-# General redirections for pseudo accounts
-bin: root
-daemon: root
-games: root
-man: root
-news: root
-nobody: root
-operator: root
-pop: root
-system: root
-toor: root
-usenet: news
-uucp: root
-xten: root
-
-# Well-known aliases -- these should be filled in!
-# manager:
-# dumper:
-
-# BUSINESS-RELATED MAILBOX NAMES
-# info:
-# marketing:
-# sales:
-# support:
-
-# NETWORK OPERATIONS MAILBOX NAMES
-abuse: root
-# noc: root
-security: root
-
-# SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES
-ftp: root
-ftp-bugs: ftp
-# hostmaster: root
-# webmaster: root
-# www: webmaster
-
-# msgs: "| /usr/bin/msgs -s"
-# bit-bucket: /dev/null
-# dev-null: bit-bucket
diff --git a/etc/periodic/daily/210.backup-aliases b/etc/periodic/daily/210.backup-aliases
index 8122b4c3..0b5206e 100755
--- a/etc/periodic/daily/210.backup-aliases
+++ b/etc/periodic/daily/210.backup-aliases
@@ -13,7 +13,7 @@ fi
case "$daily_backup_aliases_enable" in
[Yy][Ee][Ss])
- if [ -f /etc/aliases ]
+ if [ -f /etc/mail/aliases ]
then
bak=/var/backups
@@ -23,15 +23,15 @@ case "$daily_backup_aliases_enable" in
if [ ! -f $bak/aliases.bak ]
then
echo "no $bak/aliases.bak"
- cp -p /etc/aliases $bak/aliases.bak
+ cp -p /etc/mail/aliases $bak/aliases.bak
fi
- if ! cmp -s $bak/aliases.bak /etc/aliases
+ if ! cmp -s $bak/aliases.bak /etc/mail/aliases
then
echo "$host aliases diffs:"
- diff -u $bak/aliases.bak /etc/aliases
+ diff -u $bak/aliases.bak /etc/mail/aliases
mv $bak/aliases.bak $bak/aliases.bak2
- cp -p /etc/aliases $bak/aliases.bak
+ cp -p /etc/mail/aliases $bak/aliases.bak
fi
fi;;
esac
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index 6e4b6c2..3b3219d 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -170,7 +170,7 @@ file.
(bool) Set to
.Dq YES
if you want the
-.Pa /etc/aliases
+.Pa /etc/mail/aliases
file backed up and modifications to be displayed in your daily output.
.It Ar daily_backup_distfile_enable
(bool) Set to
diff --git a/share/man/man8/adding_user.8 b/share/man/man8/adding_user.8
index d52f385..eed945b 100644
--- a/share/man/man8/adding_user.8
+++ b/share/man/man8/adding_user.8
@@ -42,7 +42,7 @@
A new user must choose a login name, which must not already appear in
.Pa /etc/passwd
or
-.Pa /etc/aliases .
+.Pa /etc/mail/aliases .
It must also not begin with the hyphen
.Ql Fl
character.
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 5768456..cefda61 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -270,7 +270,7 @@ The current list of such aliases can be displayed with the
command in
.Nm mail .
System wide distribution lists can be created by editing
-.Pa /etc/aliases ,
+.Pa /etc/mail/aliases ,
see
.Xr aliases 5
and
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index eea9e20..4a1adb5 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -137,7 +137,7 @@ option is used for setting up the posting of messages. The line
.Dl msgs: \&"\&| /usr/bin/msgs \-s\&"
.Pp
should be included in
-.Pa /etc/aliases
+.Pa /etc/mail/aliases
(see
.Xr newaliases 1 )
to enable posting of messages.
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 758c5b8..5911aa2 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -89,7 +89,7 @@ name limit and NIS.
The NIS protocol mandates an 8-character username.
If you need a longer login name for e-mail addresses,
you can define an alias in
-.Pa /etc/aliases .
+.Pa /etc/mail/aliases .
.It Sy fullname
Firstname and surname.
The
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index df50f30..db892db 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -301,7 +301,7 @@ To create a mail alias called
.Em receiver-dude
that will automatically decode and assemble deltas, but not apply them,
you could put the following lines in your
-.Pa /etc/aliases
+.Pa /etc/mail/aliases
file (assuming the
.Pa /ctm/tmp
and
OpenPOWER on IntegriCloud