committing changes in /etc after emerge run

Package changes:
+app-admin/puppet-4.8.1

diff --git a/.etckeeper b/.etckeeper
index 82d7ff0b7d1820747c8ed3eb61e1eaac92addebf..402359de62e03ecf57c636e35770fbb4614eed83 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -125,6 +125,7 @@ maybe chmod 0644 'conf.d/net-online'
 maybe chmod 0644 'conf.d/netmount'
 maybe chmod 0644 'conf.d/pciparm'
 maybe chmod 0644 'conf.d/php-fpm'
+maybe chmod 0644 'conf.d/puppetmaster'
 maybe chmod 0644 'conf.d/pydoc-2.7'
 maybe chmod 0644 'conf.d/pydoc-3.4'
 maybe chmod 0644 'conf.d/rarpd'
@@ -404,6 +405,8 @@ maybe chmod 0755 'init.d/osclock'
 maybe chmod 0755 'init.d/pciparm'
 maybe chmod 0755 'init.d/php-fpm'
 maybe chmod 0755 'init.d/procfs'
+maybe chmod 0755 'init.d/puppet'
+maybe chmod 0755 'init.d/puppetmaster'
 maybe chmod 0755 'init.d/pwcheck'
 maybe chmod 0755 'init.d/pydoc-2.7'
 maybe chmod 0755 'init.d/pydoc-3.4'
@@ -548,6 +551,7 @@ maybe chmod 0444 'openldap/schema/pmi.ldif'
 maybe chmod 0444 'openldap/schema/pmi.schema'
 maybe chmod 0444 'openldap/schema/ppolicy.ldif'
 maybe chmod 0444 'openldap/schema/ppolicy.schema'
+maybe chmod 0644 'openldap/schema/puppet.schema'
 maybe chmod 0644 'openldap/schema/rfc2307bis.schema'
 maybe chgrp 'ldap' 'openldap/slapd.conf'
 maybe chmod 0640 'openldap/slapd.conf'
@@ -656,6 +660,14 @@ maybe chmod 0644 'profile.d/.keep'
 maybe chmod 0644 'profile.d/Z97-byobu.sh'
 maybe chmod 0644 'profile.env'
 maybe chmod 0644 'protocols'
+maybe chgrp 'puppet' 'puppetlabs'
+maybe chmod 0750 'puppetlabs'
+maybe chgrp 'puppet' 'puppetlabs/puppet'
+maybe chmod 0750 'puppetlabs/puppet'
+maybe chgrp 'puppet' 'puppetlabs/puppet/ssl'
+maybe chmod 0750 'puppetlabs/puppet/ssl'
+maybe chgrp 'puppet' 'puppetlabs/puppet/ssl/.keep_app-admin_puppet-0'
+maybe chmod 0644 'puppetlabs/puppet/ssl/.keep_app-admin_puppet-0'
 maybe chmod 0644 'rc.conf'
 maybe chmod 0644 'resolv.conf'
 maybe chmod 0644 'resolv.conf.bak'

diff --git a/conf.d/puppetmaster b/conf.d/puppetmaster
new file mode 100644 (file)
index 0000000..afecf47
--- /dev/null
+++ b/conf.d/puppetmaster
@@ -0,0 +1,18 @@
+# Location of PID files
+PUPPETMASTER_PID_DIR="/var/run/puppet"
+
+# Where to log general messages to.
+# Specify syslog to send log messages to the system log.
+#PUPPETMASTER_LOG="syslog"
+
+# You may specify other parameters to the puppetmaster here
+#PUPPETMASTER_EXTRA_OPTS="--noca"
+
+# You may specify an alternate port on which puppetmaster should listen.
+# Default is: 8140
+#PUPPETMASTER_PORT="8140"
+
+# To start multiple servers:
+# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141
+# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141
+# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT)

diff --git a/group b/group
index 6e76bc8d8b47009d9f7707875d3b8b1ca6531607..881f935ba3cb8744d7d325d169357cc1a756f017 100644 (file)
--- a/group
+++ b/group
@@ -49,3 +49,4 @@ postmaster:x:237:
 ssmtp:x:236:
 postgres:x:70:
 mysql:x:60:
+puppet:x:235:

diff --git a/group- b/group-
index 6e994c8b3d0849f7800825d14b4b75c3073298ca..6e76bc8d8b47009d9f7707875d3b8b1ca6531607 100644 (file)
--- a/group-
+++ b/group-
@@ -48,3 +48,4 @@ mail:x:12:
 postmaster:x:237:
 ssmtp:x:236:
 postgres:x:70:
+mysql:x:60:

diff --git a/gshadow b/gshadow
index bd33a5f8b6af51837bac79acd6ebab569906a72c..16c32d0b96abe6bcd238800613cee5d52cd11471 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -49,3 +49,4 @@ postmaster:!::
 ssmtp:!::
 postgres:!::
 mysql:!::
+puppet:!::

diff --git a/gshadow- b/gshadow-
index b9d95ffa724501697aed494b6830d10c7a216b0f..bd33a5f8b6af51837bac79acd6ebab569906a72c 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -48,3 +48,4 @@ mail:!::
 postmaster:!::
 ssmtp:!::
 postgres:!::
+mysql:!::

diff --git a/init.d/puppet b/init.d/puppet
new file mode 100755 (executable)
index 0000000..f7106e6
--- /dev/null
+++ b/init.d/puppet
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
+
+pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
+
+depend() {
+       need localmount
+       use dns logger puppetmaster netmount nfsmount
+}
+
+start_pre() {
+       checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+       checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+}
+
+reload() {
+    ebegin "Reloading $RC_SVCNAME"
+    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+    eend $?
+}

diff --git a/init.d/puppetmaster b/init.d/puppetmaster
new file mode 100755 (executable)
index 0000000..286f7e6
--- /dev/null
+++ b/init.d/puppetmaster
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "puppetmaster" ] ; then
+       PUPPETMASTER_PID="master"
+else
+       PUPPETMASTER_PID="${SVCNAME#*.}"
+fi
+PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
+pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command_args="master --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPETMASTER_EXTRA_OPTS}"
+if [ -n "${PUPPETMASTER_PORT}" ] ; then
+       command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
+fi
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+depend() {
+       need localmount
+       use dns logger slapd netmount nfsmount
+}
+
+start_pre() {
+       checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+       checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+       checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
+}
+
+reload() {
+    ebegin "Reloading $RC_SVCNAME"
+    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+    eend $?
+}

diff --git a/openldap/schema/puppet.schema b/openldap/schema/puppet.schema
new file mode 100644 (file)
index 0000000..e5561f2
--- /dev/null
+++ b/openldap/schema/puppet.schema
@@ -0,0 +1,24 @@
+attributetype (  1.3.6.1.4.1.34380.1.1.3.10 NAME 'puppetClass'
+       DESC 'Puppet Node Class'
+       EQUALITY caseIgnoreIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.34380.1.1.3.9 NAME 'parentNode'
+       DESC 'Puppet Parent Node'
+       EQUALITY caseIgnoreIA5Match
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+        SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.34380.1.1.3.11 NAME 'environment'
+       DESC 'Puppet Node Environment'
+       EQUALITY caseIgnoreIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.34380.1.1.3.12 NAME 'puppetVar'
+       DESC 'A variable setting for puppet'
+       EQUALITY caseIgnoreIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+objectclass ( 1.3.6.1.4.1.34380.1.1.1.2 NAME 'puppetClient' SUP top AUXILIARY
+       DESC 'Puppet Client objectclass'
+       MAY ( puppetclass $ parentnode $ environment $ puppetvar ))

diff --git a/passwd b/passwd
index 603e8386c0b1cfbd86573c8f004fbb7a5d21d996..fc1d4fe88439bfb5b7826dda344547a0b44d9009 100644 (file)
--- a/passwd
+++ b/passwd
@@ -29,3 +29,4 @@ mail:x:8:12:added by portage for mailbase:/var/spool/mail:/sbin/nologin
 postmaster:x:14:237:added by portage for mailbase:/var/spool/mail:/sbin/nologin
 postgres:x:70:70:added by portage for postgresql:/var/lib/postgresql:/bin/sh
 mysql:x:60:60:added by portage for mariadb:/dev/null:/sbin/nologin
+puppet:x:109:235:added by portage for puppet:/var/lib/puppet:/sbin/nologin

diff --git a/passwd- b/passwd-
index 6d6f22bfe42840840e3832625bd9bf1840e73934..603e8386c0b1cfbd86573c8f004fbb7a5d21d996 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -28,3 +28,4 @@ nullmail:x:88:88:added by portage for nullmailer:/var/nullmailer:/sbin/nologin
 mail:x:8:12:added by portage for mailbase:/var/spool/mail:/sbin/nologin
 postmaster:x:14:237:added by portage for mailbase:/var/spool/mail:/sbin/nologin
 postgres:x:70:70:added by portage for postgresql:/var/lib/postgresql:/bin/sh
+mysql:x:60:60:added by portage for mariadb:/dev/null:/sbin/nologin

diff --git a/puppetlabs/puppet/ssl/.keep_app-admin_puppet-0 b/puppetlabs/puppet/ssl/.keep_app-admin_puppet-0
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/shadow b/shadow
index 5ae633f17e8e14277213f4746b8d99ff8a6db332..42de3541197866faf3ebf6c7d1c6409c57478ffe 100644 (file)
--- a/shadow
+++ b/shadow
@@ -28,3 +28,4 @@ mail:!:17155::::::
 postmaster:!:17155::::::
 postgres:!:17156::::::
 mysql:!:17156::::::
+puppet:!:17156::::::

diff --git a/shadow- b/shadow-
index 1df8e0ac0edac71560760a4521828d2dde949c1c..5ae633f17e8e14277213f4746b8d99ff8a6db332 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -27,3 +27,4 @@ nullmail:!:17155::::::
 mail:!:17155::::::
 postmaster:!:17155::::::
 postgres:!:17156::::::
+mysql:!:17156::::::