committing changes in /etc after emerge run

Package changes:
+mail-mta/nullmailer-1.13-r5

diff --git a/.etckeeper b/.etckeeper
index 49cbbcf411d3b5bdcc53a634a762183660f11d53..2ac131a02102b19024a6b319a400b4805e0472d8 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -306,6 +306,7 @@ maybe chmod 0755 'init.d/mount-ro'
 maybe chmod 0755 'init.d/net-online'
 maybe chmod 0755 'init.d/net.lo'
 maybe chmod 0755 'init.d/netmount'
+maybe chmod 0755 'init.d/nullmailer'
 maybe chmod 0755 'init.d/numlock'
 maybe chmod 0755 'init.d/osclock'
 maybe chmod 0755 'init.d/pciparm'
@@ -404,6 +405,9 @@ maybe chmod 0644 'nail.rc'
 maybe chmod 0644 'nanorc'
 maybe chmod 0644 'networks'
 maybe chmod 0644 'nsswitch.conf'
+maybe chmod 0755 'nullmailer'
+maybe chgrp 'nullmail' 'nullmailer/remotes'
+maybe chmod 0640 'nullmailer/remotes'
 maybe chmod 0755 'openldap'
 maybe chmod 0600 'openldap/DB_CONFIG.example'
 maybe chmod 0644 'openldap/ldap.conf'

diff --git a/group b/group
index 8d4b697c324673d19adcfd327bd7bad56d50387a..257f2cbf0a5f5144aa4c3d99d421f48f8368c8b3 100644 (file)
--- a/group
+++ b/group
@@ -43,3 +43,4 @@ dialout:x:999:
 lock:x:998:
 ldap:x:439:
 apache:x:81:
+nullmail:x:88:

diff --git a/group- b/group-
index 05a219731483d920e88c3c4ccc79374187fdd4f6..8d4b697c324673d19adcfd327bd7bad56d50387a 100644 (file)
--- a/group-
+++ b/group-
@@ -42,3 +42,4 @@ locate:x:238:
 dialout:x:999:
 lock:x:998:
 ldap:x:439:
+apache:x:81:

diff --git a/gshadow b/gshadow
index 39414dca50658ca7bdebbbb08c3ce123b7755f49..13116f91708807439792c91c463ec8bf39bc0fbd 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -43,3 +43,4 @@ dialout:!!::
 lock:!!::
 ldap:!::
 apache:!::
+nullmail:!::

diff --git a/gshadow- b/gshadow-
index 6580fc1d5cb4a1ed2154591e49c3599fa5aea0f3..39414dca50658ca7bdebbbb08c3ce123b7755f49 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -42,3 +42,4 @@ locate:!::
 dialout:!!::
 lock:!!::
 ldap:!::
+apache:!::

diff --git a/init.d/nullmailer b/init.d/nullmailer
new file mode 100755 (executable)
index 0000000..264f2d6
--- /dev/null
+++ b/init.d/nullmailer
@@ -0,0 +1,51 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+command="/usr/sbin/nullmailer-send"
+
+start_stop_daemon_args="--chdir /var/nullmailer --user nullmail:nullmail"
+
+required_dirs="/var/nullmailer"
+pidfile="/run/nullmailer.pid"
+command_background="true"
+command_args="-s"
+
+depend() {
+       use net logger
+}
+
+checkconfig() {
+       local error=0
+       local f=/etc/nullmailer/me
+       if [ ! -s ${f} ]; then
+               eerror "${f} does not exist"
+               error=1
+       fi
+       f=/etc/nullmailer/defaultdomain
+       if [ ! -s ${f} ]; then
+               eerror "${f} does not exist"
+               error=1
+       fi
+       if [ ${error} -eq 1 ]; then
+               einfo "You need to run 'emerge --config nullmailer'!"
+       fi
+       if [ -e /service/nullmailer ]; then
+               eerror "Nullmailer is already running under svscan!"
+               error=2
+       fi
+       if [ ${error} -ne 0 ]; then
+               return 1
+       else
+               return 0
+       fi
+}
+
+start_pre() {
+       checkconfig
+}
+
+stop_pre() {
+       checkconfig # to avoid init.d stopping svscan instance
+}

diff --git a/nullmailer/remotes b/nullmailer/remotes
new file mode 100644 (file)
index 0000000..d04aee2
--- /dev/null
+++ b/nullmailer/remotes
@@ -0,0 +1,29 @@
+# Format is: HOST PROTOCOL [OPTIONS]
+# HOST = IP or DNS
+# PROTOCOL = smtp | qmtp
+# OPTIONS = [--port=NUMBER] [--user] [--pass] [--starttls | --ssl [--insecure] ]
+#
+# Examples:
+# A standard SMTP server:
+# somesendmailserver.domain.com smtp
+#
+# A qmail server with QMQP setup:
+# someqmailserver.domain.com qmqp
+#
+# A nonstandard SMTP server setup:
+# someotherserver.domain.com smtp --port=2525
+#
+# SMTP server supporting AUTH PLAIN
+# mailserver smtp --user=<user> --pass=<pass>
+#
+# SMTP server supporting AUTH LOGIN 
+# mailserver smtp --user=<user> --pass=<pass> --auth-login
+#
+# SMTP server with smtps (legacy - use starttls instead)
+# mailserver smtp --user=<user> --pass=<pass> --port=465 --ssl
+#
+# SMTP server on submission port with starttls
+# mailserver smtp --user=<user> --pass=<pass> --port=587 --starttls
+#
+# SMTP server on submission port with starttls and self-signed certificate
+# mailserver smtp --user=<user> --pass=<pass> --port=587 --starttls --insecure

diff --git a/passwd b/passwd
index 076ead54e5a398d91458b38b6cb665417f2ad436..be1565344e95da01be501d87a28b70bdbabd5e6c 100644 (file)
--- a/passwd
+++ b/passwd
@@ -24,3 +24,4 @@ messagebus:x:108:240:added by portage for dbus:/dev/null:/sbin/nologin
 cron:x:16:16:added by portage for cronbase:/var/spool/cron:/sbin/nologin
 ldap:x:439:439:added by portage for openldap:/usr/lib64/openldap:/sbin/nologin
 apache:x:81:81:added by portage for apache:/var/www:/sbin/nologin
+nullmail:x:88:88:added by portage for nullmailer:/var/nullmailer:/sbin/nologin

diff --git a/passwd- b/passwd-
index ac728c116df93d5d64b96bea9ed1fd3e3c9c9c9a..076ead54e5a398d91458b38b6cb665417f2ad436 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -23,3 +23,4 @@ sshd:x:22:22:added by portage for openssh:/var/empty:/sbin/nologin
 messagebus:x:108:240:added by portage for dbus:/dev/null:/sbin/nologin
 cron:x:16:16:added by portage for cronbase:/var/spool/cron:/sbin/nologin
 ldap:x:439:439:added by portage for openldap:/usr/lib64/openldap:/sbin/nologin
+apache:x:81:81:added by portage for apache:/var/www:/sbin/nologin

diff --git a/shadow b/shadow
index bf70d4ff57410335c5c5c66cfb99773581b4bfb2..7facdcd3621d9367bd0e0d4af7d880e3fdcbb2ca 100644 (file)
--- a/shadow
+++ b/shadow
@@ -23,3 +23,4 @@ messagebus:!:17148::::::
 cron:!:17154::::::
 ldap:!:17155::::::
 apache:!:17155::::::
+nullmail:!:17155::::::

diff --git a/shadow- b/shadow-
index 9a3316f73ca353b8450ba4826a8e0be9c3b54e75..bf70d4ff57410335c5c5c66cfb99773581b4bfb2 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -22,3 +22,4 @@ sshd:!:17148::::::
 messagebus:!:17148::::::
 cron:!:17154::::::
 ldap:!:17155::::::
+apache:!:17155::::::