diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-admin/puppet/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-admin/puppet/files')
-rw-r--r-- | app-admin/puppet/files/50puppet-mode-gentoo.el | 6 | ||||
-rw-r--r-- | app-admin/puppet/files/puppet-fix-tests-4.x.patch | 18 | ||||
-rw-r--r-- | app-admin/puppet/files/puppet-openrc-status-fix.patch | 15 | ||||
-rwxr-xr-x | app-admin/puppet/files/puppet.init | 40 | ||||
-rw-r--r-- | app-admin/puppet/files/puppet.init-4.x | 29 | ||||
-rw-r--r-- | app-admin/puppet/files/puppet.init-r1 | 24 | ||||
-rw-r--r-- | app-admin/puppet/files/puppetmaster.confd | 18 | ||||
-rwxr-xr-x | app-admin/puppet/files/puppetmaster.init | 37 | ||||
-rw-r--r-- | app-admin/puppet/files/puppetmaster.init-4.x | 37 | ||||
-rw-r--r-- | app-admin/puppet/files/puppetmaster.init-r1 | 30 | ||||
-rw-r--r-- | app-admin/puppet/files/tmpfiles.d | 1 |
11 files changed, 255 insertions, 0 deletions
diff --git a/app-admin/puppet/files/50puppet-mode-gentoo.el b/app-admin/puppet/files/50puppet-mode-gentoo.el new file mode 100644 index 000000000000..64c38ae5a31d --- /dev/null +++ b/app-admin/puppet/files/50puppet-mode-gentoo.el @@ -0,0 +1,6 @@ + +;;; puppet-mode site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests") +(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode)) diff --git a/app-admin/puppet/files/puppet-fix-tests-4.x.patch b/app-admin/puppet/files/puppet-fix-tests-4.x.patch new file mode 100644 index 000000000000..77d9cfbda60a --- /dev/null +++ b/app-admin/puppet/files/puppet-fix-tests-4.x.patch @@ -0,0 +1,18 @@ +--- ./spec/unit/network/http/api/indirected_routes_spec.rb 2015-07-21 12:09:09.000000000 -0500 ++++ ./spec/unit/network/http/api/indirected_routes_spec.rb.new 2015-07-23 18:33:22.839914116 -0500 +@@ -144,15 +144,6 @@ + :env)))) + handler.uri2indirection("GET", "#{master_url_prefix}/node/bar", params) + end +- +- it "should not pass through an environment to check_authorization and fail if the environment is unknown" do +- handler.expects(:check_authorization).with(anything, +- anything, +- Not(has_entry(:environment))) +- expect(lambda { handler.uri2indirection("GET", +- "#{master_url_prefix}/node/bar", +- {:environment => 'bogus'}) }).to raise_error(ArgumentError) +- end + end + + describe "when converting a request into a URI" do diff --git a/app-admin/puppet/files/puppet-openrc-status-fix.patch b/app-admin/puppet/files/puppet-openrc-status-fix.patch new file mode 100644 index 000000000000..af568098d594 --- /dev/null +++ b/app-admin/puppet/files/puppet-openrc-status-fix.patch @@ -0,0 +1,15 @@ +diff -Naur puppet-3.1.1-r2.orig/lib/puppet/provider/service/openrc.rb puppet-3.1.1-r2/lib/puppet/provider/service/openrc.rb +--- all/puppet-3.1.1.orig/lib/puppet/provider/service/openrc.rb 2013-06-05 03:32:53.646824966 -0400 ++++ all/puppet-3.1.1/lib/puppet/provider/service/openrc.rb 2013-06-05 03:37:25.333824967 -0400 +@@ -10,8 +10,10 @@ + defaultfor :operatingsystem => :gentoo + defaultfor :operatingsystem => :funtoo + ++ has_command(:rcstatus, '/bin/rc-status') do ++ environment :RC_SVCNAME => nil ++ end + commands :rcservice => '/sbin/rc-service' +- commands :rcstatus => '/bin/rc-status' + commands :rcupdate => '/sbin/rc-update' + + self::STATUSLINE = /^\s+(.*?)\s*\[\s*(.*)\s*\]$/ diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init new file mode 100755 index 000000000000..5f15aeaa021e --- /dev/null +++ b/app-admin/puppet/files/puppet.init @@ -0,0 +1,40 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need localmount net + use dns logger puppetmaster netmount nfsmount +} + +checkconfig() { + if [ ! -d "${PUPPET_PID_DIR}" ] ; then + eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory" + return 1 + fi + + return 0 +} + +start() { + checkconfig || return $? + + local options="" + [ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}" + + ebegin "Starting puppet" + start-stop-daemon --start --quiet \ + --pidfile "${PUPPET_PID_DIR}/agent.pid" \ + --exec /usr/bin/puppetd -- ${options} + eend $? "Failed to start puppet" +} + +stop() { + ebegin "Stopping puppet" + start-stop-daemon --stop --quiet \ + --pidfile "${PUPPET_PID_DIR}/agent.pid" + local ret=$? + eend ${ret} "Failed to stop puppet" + rm -f "${PUPPET_PID_DIR}/agent.pid" + return ${ret} +} diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init-4.x new file mode 100644 index 000000000000..e1238012beee --- /dev/null +++ b/app-admin/puppet/files/puppet.init-4.x @@ -0,0 +1,29 @@ +#!/sbin/runscript +# 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/app-admin/puppet/files/puppet.init-r1 b/app-admin/puppet/files/puppet.init-r1 new file mode 100644 index 000000000000..b054e6b5a7e7 --- /dev/null +++ b/app-admin/puppet/files/puppet.init-r1 @@ -0,0 +1,24 @@ +#!/sbin/runscript +# Copyright 1999-2013 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" + +extra_started_commands="reload" + +command="/usr/bin/puppet" + +command_args="agent --pidfile ${pidfile} ${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} +} diff --git a/app-admin/puppet/files/puppetmaster.confd b/app-admin/puppet/files/puppetmaster.confd new file mode 100644 index 000000000000..afecf479a6a1 --- /dev/null +++ b/app-admin/puppet/files/puppetmaster.confd @@ -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/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init new file mode 100755 index 000000000000..a0da1bba3e1e --- /dev/null +++ b/app-admin/puppet/files/puppetmaster.init @@ -0,0 +1,37 @@ +#!/sbin/runscript +# Copyright 1999-2013 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} ${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 ${SVCNAME}" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? "Failed to stop ${SVCNAME}" +} diff --git a/app-admin/puppet/files/puppetmaster.init-4.x b/app-admin/puppet/files/puppetmaster.init-4.x new file mode 100644 index 000000000000..636f58f5516b --- /dev/null +++ b/app-admin/puppet/files/puppetmaster.init-4.x @@ -0,0 +1,37 @@ +#!/sbin/runscript +# 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/app-admin/puppet/files/puppetmaster.init-r1 b/app-admin/puppet/files/puppetmaster.init-r1 new file mode 100644 index 000000000000..f665991b81a6 --- /dev/null +++ b/app-admin/puppet/files/puppetmaster.init-r1 @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2013 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} ${PUPPETMASTER_EXTRA_OPTS}" +if [ -n "${PUPPETMASTER_PORT}" ] ; then + command_args="${command_args} --masterport ${PUPPETMASTER_PORT}" +fi + +command="/usr/bin/puppet" + +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" +} diff --git a/app-admin/puppet/files/tmpfiles.d b/app-admin/puppet/files/tmpfiles.d new file mode 100644 index 000000000000..cd33231df7f7 --- /dev/null +++ b/app-admin/puppet/files/tmpfiles.d @@ -0,0 +1 @@ +D /var/run/puppet 0755 puppet puppet - |