Re: /usr/src/etc/mail/aliases formatting
I wasn't sure when I first read this diff in private mail, but... On 2013/06/23 10:40, Michał Markowski wrote: > Now, this file is mix of spaces and tabs: > $ vis -t /cvs/src/etc/mail/aliases ...I didn't look too hard at the existing file to see how it looked. vis -t makes it clear that it's an inconsistent mess and needs tidying one way or another, and this seems as good as any other way to me. In a nutshell, the diff applies the formatting of the RFC2142 sections from the bottom of the file consistently throughout the rest of the file.. sysmerge isn't really a problem, it's not too hard to merge, and people can always hit 'd' if they don't want to deal with it. > This diff provides more consistent formatting with tabs throughout the > file (sorry for link, but gmail would probably spoil this): > http://mspanc.one.pl/etc_mail_aliases.diff ok with me.
Re: /usr/src/etc/mail/aliases formatting
On Sun, Jun 23, 2013 at 08:26:02PM +0200, Michał Markowski wrote: > 2013/6/23 Nick Holland : > > I do believe this would be an annoyance for upgraders who have local > > entries in this file, as sysmerge would detect lots of changes, plus the > > local changes. I'm not sure what the benefit would be to those people. > > Those people can just keep installed version when sysmerge ask them > what to do (hit "d" if I recall correctly). I have no opinion about the original diff but changes should never be prevented because of sysmerge(8). sysmerge(8) allows you to merge changes later on and can even run non interactively if you have a big amount of machines to handle -- if anything sysmerge(8) could be improved to ease things for the admin but I will repeat it again, in no case, it should be taken into consideration when wanting to modify something. -- Antoine
Re: /usr/src/etc/mail/aliases formatting
2013/6/23 Nick Holland : > I do believe this would be an annoyance for upgraders who have local > entries in this file, as sysmerge would detect lots of changes, plus the > local changes. I'm not sure what the benefit would be to those people. Those people can just keep installed version when sysmerge ask them what to do (hit "d" if I recall correctly). -- Michał Markowski
Re: /usr/src/etc/mail/aliases formatting
On Sun, Jun 23, 2013 at 10:56:08AM -0400, Nick Holland wrote: > On 06/23/13 04:39, Michał Markowski wrote: > > Now, this file is mix of spaces and tabs: > > > > $ vis -t /cvs/src/etc/mail/aliases > > # > > #\^I$OpenBSD: aliases,v 1.37 2012/10/13 07:42:39 dcoppa Exp $ > ... > > This diff provides more consistent formatting with tabs throughout the > > file (sorry for link, but gmail would probably spoil this): > > http://mspanc.one.pl/etc_mail_aliases.diff > > > > P.S. > > 2013/6/20 Stuart Henderson : > >> this type of diff is highly subject to bikeshedding ;) > > :) > > I do believe this would be an annoyance for upgraders who have local > entries in this file, as sysmerge would detect lots of changes, plus the > local changes. I'm not sure what the benefit would be to those people. > > Not saying no...but something to be aware of. > > Nick. > This change really would be annoying only once. Since I upgrade regularly, I have learned to stick my local changes at the bottom of the different files. Makes using sysmerge simple. But if someone has added a lot of entries in between, that would be a little more difficult, but not a lot. Chris Bennett
Re: /usr/src/etc/mail/aliases formatting
On 06/23/13 04:39, Michał Markowski wrote: > Now, this file is mix of spaces and tabs: > > $ vis -t /cvs/src/etc/mail/aliases > # > #\^I$OpenBSD: aliases,v 1.37 2012/10/13 07:42:39 dcoppa Exp $ ... > This diff provides more consistent formatting with tabs throughout the > file (sorry for link, but gmail would probably spoil this): > http://mspanc.one.pl/etc_mail_aliases.diff > > P.S. > 2013/6/20 Stuart Henderson : >> this type of diff is highly subject to bikeshedding ;) > :) I do believe this would be an annoyance for upgraders who have local entries in this file, as sysmerge would detect lots of changes, plus the local changes. I'm not sure what the benefit would be to those people. Not saying no...but something to be aware of. Nick.
/usr/src/etc/mail/aliases formatting
Now, this file is mix of spaces and tabs: $ vis -t /cvs/src/etc/mail/aliases # #\^I$OpenBSD: aliases,v 1.37 2012/10/13 07:42:39 dcoppa 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. # #\^I>>\^IThe program "newaliases" must be run after #\^I>> NOTE >>\^Ithis file is updated for any changes to #\^I>>\^Ishow through to sendmail. # # Basic system aliases -- these MUST be present MAILER-DAEMON: postmaster postmaster: root # General redirections for important pseudo accounts daemon:\^Iroot ftp-bugs: root operator: root uucp:\^Iroot www:\^Iroot # Redirections for pseudo accounts that should not receive mail _afs: /dev/null _bgpd: /dev/null _btd: /dev/null _dhcp: /dev/null _dvmrpd: /dev/null _fingerd: /dev/null _ftp: /dev/null _hostapd: /dev/null _identd: /dev/null _iked: /dev/null _isakmpd: /dev/null _iscsid: /dev/null _kadmin: /dev/null _kdc: /dev/null _ldapd: /dev/null _ldpd: /dev/null _mopd: /dev/null _nsd: /dev/null _ntp: /dev/null _ospfd: /dev/null _ospf6d: /dev/null _pflogd: /dev/null _portmap: /dev/null _ppp: /dev/null _rbootd: /dev/null _relayd: /dev/null _ripd: /dev/null _rstatd: /dev/null _rtadvd: /dev/null _rusersd: /dev/null _rwalld: /dev/null _smtpd: /dev/null _sndio: /dev/null _snmpd: /dev/null _spamd: /dev/null _syslogd: /dev/null _tcpdump: /dev/null _tftpd: /dev/null _x11: /dev/null _ypldap: /dev/null bin:\^I/dev/null named:\^I/dev/null nobody:\^I/dev/null popa3d: /dev/null proxy: /dev/null smmsp: /dev/null sshd: /dev/null # Well-known aliases -- these should be filled in! # root: # manager: # dumper: # RFC 2142: NETWORK OPERATIONS MAILBOX NAMES abuse:\^I\^Iroot # noc:\^I\^Iroot security:\^Iroot # RFC 2142: SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES # hostmaster:\^Iroot # usenet:\^Iroot # news:\^I\^Iusenet # webmaster:\^Iroot # ftp:\^I\^Iroot This diff provides more consistent formatting with tabs throughout the file (sorry for link, but gmail would probably spoil this): http://mspanc.one.pl/etc_mail_aliases.diff P.S. 2013/6/20 Stuart Henderson : > this type of diff is highly subject to bikeshedding ;) :) -- Michał Markowski
