From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 22 May 2017 12:52:58 +0000 (+0200)
Subject: committing changes in /etc after emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=38a19a6a9d6bce19127bd914c55ba2e235f6b3e2;p=config%2Fberta%2Fetc.git

committing changes in /etc after emerge run

Package changes:
---

diff --git a/.etckeeper b/.etckeeper
index a81bf23..588e17a 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -460,9 +460,7 @@ maybe chmod 0755 'init.d/pciparm'
 maybe chmod 0755 'init.d/php-fpm'
 maybe chmod 0755 'init.d/postgresql-9.5'
 maybe chmod 0755 'init.d/procfs'
-maybe chmod 0755 'init.d/puppet'
 maybe chmod 0755 'init.d/puppetdb'
-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'
@@ -627,7 +625,6 @@ 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 chmod 0644 'openldap/schema/sudo.schema'
 maybe chgrp 'ldap' 'openldap/slapd.conf'
@@ -1835,8 +1832,6 @@ maybe chmod 0400 'puppetlabs/puppet/secure/keys/public_key.pkcs7.pem'
 maybe chown 'puppet' 'puppetlabs/puppet/ssl'
 maybe chgrp 'puppet' 'puppetlabs/puppet/ssl'
 maybe chmod 0771 '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 chown 'puppet' 'puppetlabs/puppet/ssl/ca'
 maybe chgrp 'puppet' 'puppetlabs/puppet/ssl/ca'
 maybe chmod 0755 'puppetlabs/puppet/ssl/ca'
diff --git a/init.d/puppet b/init.d/puppet
deleted file mode 100755
index f7106e6..0000000
--- a/init.d/puppet
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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
deleted file mode 100755
index 286f7e6..0000000
--- a/init.d/puppetmaster
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/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
deleted file mode 100644
index e5561f2..0000000
--- a/openldap/schema/puppet.schema
+++ /dev/null
@@ -1,24 +0,0 @@
-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/puppetlabs/puppet/ssl/.keep_app-admin_puppet-0 b/puppetlabs/puppet/ssl/.keep_app-admin_puppet-0
deleted file mode 100644
index e69de29..0000000