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 puppetmaster.confd |
| Date: | Mon, 06 Oct 2008 16:30:25 |
| Message-Id: | E1KmsyV-0006Me-Ct@stork.gentoo.org |
| 1 | matsuu 08/10/06 16:30:23 |
| 2 | |
| 3 | Modified: puppetmaster.init |
| 4 | Added: puppetmaster.confd |
| 5 | Log: |
| 6 | Added /etc/openldap/schema/puppet.schema, bug #239433. |
| 7 | Removed PUPPETMASTER_MANIFEST FROM /etc/init.d/puppetmaster, bug #240266. |
| 8 | (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.6 app-admin/puppet/files/puppetmaster.init |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.6&view=markup |
| 14 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.6&content-type=text/plain |
| 15 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?r1=1.5&r2=1.6 |
| 16 | |
| 17 | Index: puppetmaster.init |
| 18 | =================================================================== |
| 19 | RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppetmaster.init,v |
| 20 | retrieving revision 1.5 |
| 21 | retrieving revision 1.6 |
| 22 | diff -u -r1.5 -r1.6 |
| 23 | --- puppetmaster.init 29 Sep 2008 12:48:32 -0000 1.5 |
| 24 | +++ puppetmaster.init 6 Oct 2008 16:30:22 -0000 1.6 |
| 25 | @@ -15,14 +15,6 @@ |
| 26 | return 1 |
| 27 | fi |
| 28 | |
| 29 | - local site_manifest="/etc/puppet/manifests/site.pp" |
| 30 | - [ -n "${PUPPETMASTER_MANIFEST}" ] && site_manifest="${PUPPETMASTER_MANIFEST}" |
| 31 | - |
| 32 | - if [ ! -f "${site_manifest}" ] ; then |
| 33 | - eerror "Please create ${site_manifest} before running puppet" |
| 34 | - return 1 |
| 35 | - fi |
| 36 | - |
| 37 | return 0 |
| 38 | } |
| 39 | |
| 40 | @@ -30,8 +22,6 @@ |
| 41 | checkconfig || return $? |
| 42 | |
| 43 | local options="" |
| 44 | - [ -n "${PUPPETMASTER_MANIFEST}" ] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}" |
| 45 | - [ -n "${PUPPETMASTER_LOG}" ] && options="${options} --logdest=${PUPPETMASTER_LOG}" |
| 46 | [ -n "${PUPPETMASTER_EXTRA_OPTS}" ] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}" |
| 47 | |
| 48 | ebegin "Starting puppetmaster" |
| 49 | |
| 50 | |
| 51 | |
| 52 | 1.1 app-admin/puppet/files/puppetmaster.confd |
| 53 | |
| 54 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.confd?rev=1.1&view=markup |
| 55 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.confd?rev=1.1&content-type=text/plain |
| 56 | |
| 57 | Index: puppetmaster.confd |
| 58 | =================================================================== |
| 59 | # Location of PID files |
| 60 | PUPPETMASTER_PID_DIR="/var/run/puppet" |
| 61 | |
| 62 | # Where to log general messages to. |
| 63 | # Specify syslog to send log messages to the system log. |
| 64 | #PUPPETMASTER_LOG="syslog" |
| 65 | |
| 66 | # You may specify other parameters to the puppetmaster here |
| 67 | #PUPPETMASTER_EXTRA_OPTS="--noca" |