Archives
Archives
| From: | "Matsuu Takuto (matsuu)" <matsuu@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-admin/puppet/files: puppetmaster.init puppet-0.24.2-gentoo.patch |
| Date: | Wed, 05 Mar 2008 16:15:59 |
| Message-Id: | E1JWwHb-00022r-L8@stork.gentoo.org |
| 1 | matsuu 08/03/05 16:15:55 |
| 2 | |
| 3 | Added: puppetmaster.init puppet-0.24.2-gentoo.patch |
| 4 | Log: |
| 5 | Version bumped, bug #212262. Fixed /etc/init.d/puppetmaster, bug #211910. |
| 6 | (Portage version: 2.1.4.4) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 app-admin/puppet/files/puppetmaster.init |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: puppetmaster.init |
| 15 | =================================================================== |
| 16 | #!/sbin/runscript |
| 17 | # Copyright 1999-2008 Gentoo Foundation |
| 18 | # Distributed under the terms of the GNU General Public License v2 |
| 19 | |
| 20 | depend() { |
| 21 | need net |
| 22 | before puppet |
| 23 | use dns logger |
| 24 | } |
| 25 | |
| 26 | checkconfig() { |
| 27 | if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then |
| 28 | eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory" |
| 29 | return 1 |
| 30 | fi |
| 31 | |
| 32 | local site_manifest="/etc/puppet/manifests/site.pp" |
| 33 | [[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}" |
| 34 | |
| 35 | if [ ! -f "${site_manifest}" ] ; then |
| 36 | eerror "Please create ${site_manifest} before running puppet" |
| 37 | return 1 |
| 38 | fi |
| 39 | |
| 40 | return 0 |
| 41 | } |
| 42 | |
| 43 | start() { |
| 44 | checkconfig || return $? |
| 45 | |
| 46 | local options="" |
| 47 | [[ -n "${PUPPETMASTER_MANIFEST}" ]] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}" |
| 48 | [[ -n "${PUPPETMASTER_LOG}" ]] && options="${options} --logdest=${PUPPETMASTER_LOG}" |
| 49 | [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}" |
| 50 | |
| 51 | ebegin "Starting puppetmaster" |
| 52 | start-stop-daemon --start --quiet --exec /usr/bin/puppetmasterd \ |
| 53 | -- ${options} |
| 54 | eend $? "Failed to start puppetmaster" |
| 55 | } |
| 56 | |
| 57 | stop() { |
| 58 | ebegin "Stopping puppetmaster" |
| 59 | start-stop-daemon --stop --quiet \ |
| 60 | --pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid |
| 61 | local ret=$? |
| 62 | eend ${ret} "Failed to stop puppetmaster" |
| 63 | rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid |
| 64 | return ${ret} |
| 65 | } |
| 66 | |
| 67 | |
| 68 | |
| 69 | 1.1 app-admin/puppet/files/puppet-0.24.2-gentoo.patch |
| 70 | |
| 71 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.2-gentoo.patch?rev=1.1&view=markup |
| 72 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.2-gentoo.patch?rev=1.1&content-type=text/plain |
| 73 | |
| 74 | Index: puppet-0.24.2-gentoo.patch |
| 75 | =================================================================== |
| 76 | diff -Naur puppet-0.24.2.orig/lib/puppet/provider/service/gentoo.rb puppet-0.24.2/lib/puppet/provider/service/gentoo.rb |
| 77 | --- puppet-0.24.2.orig/lib/puppet/provider/service/gentoo.rb 2008-03-04 01:32:37.000000000 +0900 |
| 78 | +++ puppet-0.24.2/lib/puppet/provider/service/gentoo.rb 2008-03-06 00:53:20.000000000 +0900 |
| 79 | @@ -33,7 +33,7 @@ |
| 80 | return :false unless line |
| 81 | |
| 82 | # If it's enabled then it will print output showing service | runlevel |
| 83 | - if output =~ /#{@resource[:name]}\s*|\s*default/ |
| 84 | + if output =~ /#{@resource[:name]}\s*\|\s*default/ |
| 85 | return :true |
| 86 | else |
| 87 | return :false |
| 88 | |
| 89 | |
| 90 | |
| 91 | -- |
| 92 | gentoo-commits@l.g.o mailing list |