Граф коммитов

127 Коммитов

Автор SHA1 Сообщение Дата
Todd Zullinger f878fe836e Update Red Hat spec file for 0.25.2 2010-01-01 11:50:52 -05:00
James Turnbull 8b5b4b68b4 Fixed incorrect command line in Red Hat sysconfig file 2009-12-04 19:43:40 +11:00
Todd Zullinger 236bacc0a2 conf/redhat: Prevent killproc from removing /usr/sbin/puppetmasterd
Mattias Saou ran into a serious bug cause by 9dff71 (Use -p option to
killproc).  The puppetmaster init script lacked a pidfile variable,
which ended up with /usr/sbin/puppetmasterd being removed.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
2009-11-16 11:22:36 -05:00
Todd Zullinger 9dff7167b7 conf/redhat/*.init: Use -p option to killproc
If a puppetd run was started manually and 'service puppet stop' was run
the killproc function used would kill the manually started puppetd.  On
Fedora and newer RHEL (>= 5) we now use the -p option to prevent this.

This fixes #2751 (Red Hat initscripts kill an independently started
puppetd/puppetmasterd)

Signed-off-by: Todd Zullinger <tmz@pobox.com>
2009-10-25 12:13:02 -04:00
Todd Zullinger aea1e5fa34 Update Red Hat spec file for 0.25.1
Minor packaging fixes included since 0.25.0:

- Include the pi program and man page (R.I.Pienaar)
- Move puppetca to puppet package, it has uses on client systems
- Drop redundant %doc from manpage %file listings
2009-10-23 09:59:37 -04:00
Matthias Saou 3b548f412a Fix #2699 - Use --masterport for PUPPET_PORT variable
The sysconfig file shipped on Red Hat systems includes a PUPPET_PORT
variable.  When set, this should specify the port used by puppet to
connect to the puppetmaster.  The init script was incorrectly passing
this argument via the --port option, which sets the port on which
puppetd listens.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
2009-10-06 09:38:24 -04:00
James Turnbull 2e9b706898 Updated Red Hat spec file and RH patches for 0.25.0.
Thanks to Todd Zullinger for the patch and the updates.
2009-09-05 09:00:00 +10:00
John A. Barbuto 1a3d0c8761 Fixed #2593: puppet init script status command not returning proper exit code
Signed-off-by: John A. Barbuto <jbarbuto@corp.sourceforge.com>
2009-09-04 07:50:06 +10:00
Todd Zullinger b62d9668e0 conf/redhat/*.init: Fix condrestart/try-restart
Previously, the Red Hat init scripts used the $pidfile or $lockfile as a
test for whether to restart the daemons.  This caused condrestart to
start the daemons even when they were not running, in cases where they
had died or been killed without cleaning up the $pidfile/$lockfile.

This was reported by Ingvar Hagelund in Red Hat bug #480600.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
2009-08-13 08:21:28 +10:00
Todd Zullinger e9fbd4c9a2 conf/redhat/client.init: Fix #2123, status options on older RHEL
On RHEL < 5, the status function does not accept a -p option.  Using it
causes 'service puppet status' to produce erroneous output.  This was
also reported by Aaron Dummer in Red Hat bug #501577.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
2009-08-13 08:20:42 +10:00
Nigel Kersten a42e8788b1 deprecate NetInfo providers and examples, remove all NetInfo references and tests. 2009-07-14 07:54:15 -07:00
James Turnbull 91526785f5 Fixed #2229 - Red Hat init script error 2009-06-10 15:43:38 +10:00
Ian Taylor 4f2c066a97 Removed extra whitespace from end of lines 2009-06-06 09:12:00 +10:00
Ian Taylor 41ce18cc8e Changed tabs to spaces without interfering with indentation or alignment 2009-06-06 09:11:28 +10:00
Todd Zullinger 700ad5b8ed Sync conf/redhat/puppet.spec with Fedora/EPEL
The install.rb script is now used for installation.  The spec file is
also updated for the 0.25.0beta1 release.
2009-05-28 00:18:54 +10:00
James Turnbull dc0a9978df Fixes #2196 - Add sharedscripts directive to logrotate 2009-04-26 20:16:28 +10:00
James Turnbull 7403330c4f Updated Red Hat spec file 0.24.7 2008-12-16 22:54:35 +11:00
James Turnbull 05a5e14e2c Merge branch 'l' into 0.24.x
Conflicts:

	conf/redhat/puppet.spec
2008-10-28 13:40:26 +11:00
James Turnbull 6539f55b16 Updated Red Hat spec file for 0.24.6 and removed conf/debian directory.
To build a new debian package use:

apt-get source puppet; cd puppet-<curver>; uupdate ../puppet-<newver>.tgz
2008-10-24 08:47:12 +11:00
Luke Kanies b2c1149b5f Updated to version 0.24.6 2008-10-23 01:19:26 +02:00
James Turnbull b53509b453 Fixed #1460 - enhance redhat puppetmaster init.d script to easy start puppetmaster as a mongrel cluster 2008-10-21 10:37:56 +11:00
James Turnbull 7f5ded1852 Fixed #1646 - service puppet status does not work as non-root on redhat system 2008-10-14 11:22:40 +11:00
James Turnbull 3b1d6e25b4 Fixed #1579 and #1580 - errors in the Puppet RPM spec file 2008-09-19 09:49:18 +10:00
David Lutterkort a7721108df Sync with latest Fedora/EPEL specfile 2008-07-29 08:24:00 +10:00
James Turnbull aac7dd1cc2 Incremented versions 2008-07-22 18:21:34 +10:00
James Turnbull 9eb9affe11 Fixed #1368 - updated Red Hat init scripts 2008-07-09 09:29:51 +10:00
James Turnbull 335972edb6 Pushed patch to fix #1174 2008-04-02 11:40:41 +11:00
Luke Kanies d3e4ed7462 Updated to version 0.24.4 2008-03-25 21:27:37 +01:00
Luke Kanies 990638cd10 Updated to version 0.24.3 2008-03-17 06:27:36 +01:00
Luke Kanies bfdac69fcf Updated to version 0.24.2 2008-03-03 17:33:07 +01:00
David Lutterkort 20367c67f2 Updated for 0.24.1 2007-12-22 14:47:44 -08:00
David Lutterkort 8f5989a66b Updated for 0.24.0-2 2007-12-17 15:36:02 -08:00
David Lutterkort cc2d532fbc Updated for 0.24.0 2007-12-17 15:35:29 -08:00
Luke Kanies 6b02bd53ec Updated to version 0.24.0 2007-12-13 17:41:52 +01:00
David Lutterkort a54fa7e81e Sync to latest specfile in Fedora 2007-08-22 16:41:55 -07:00
luke 9530df1d8c Updated to version 0.23.2
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2755 980ebf18-57e1-0310-9a29-db15c13687c0
2007-08-07 02:41:08 +00:00
lutter 81d690ad00 Do not set any options if they aren't set in /etc/sysconfig/puppetmaster - otherwise we clobber settings from puppet.conf
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2734 980ebf18-57e1-0310-9a29-db15c13687c0
2007-08-03 19:26:57 +00:00
lutter 36a3e4a38c Changes for 0.23.1
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2733 980ebf18-57e1-0310-9a29-db15c13687c0
2007-08-03 19:09:07 +00:00
luke 64fba484eb Updated to version 0.23.1
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2725 980ebf18-57e1-0310-9a29-db15c13687c0
2007-07-20 19:23:36 +00:00
lutter 0f4de4fbe6 Fix trac #684 - set exit code for status properly (patch by abnormaliti)
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2644 980ebf18-57e1-0310-9a29-db15c13687c0
2007-06-25 17:17:45 +00:00
lutter 6b7d3aa037 Create the right puppet.conf; make sure old config files get preserved and stay functional
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2643 980ebf18-57e1-0310-9a29-db15c13687c0
2007-06-21 21:32:32 +00:00
lutter ac36ddd902 Fix name of main section
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2642 980ebf18-57e1-0310-9a29-db15c13687c0
2007-06-21 21:31:19 +00:00
lutter ec2d469b13 Rename puppet.conf to puppetd.conf
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2641 980ebf18-57e1-0310-9a29-db15c13687c0
2007-06-21 18:37:19 +00:00
lutter 8013e9645a Get rid of using silly macros in %install
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2640 980ebf18-57e1-0310-9a29-db15c13687c0
2007-06-21 17:40:27 +00:00
lutter dc2a0bff14 Use single config file
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2639 980ebf18-57e1-0310-9a29-db15c13687c0
2007-06-21 17:39:34 +00:00
luke ada4355b05 Updated to version 0.23.0
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2633 980ebf18-57e1-0310-9a29-db15c13687c0
2007-06-19 23:12:29 +00:00
lutter 23f986c711 Move ralsh and filebucket into /usr/bin
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2593 980ebf18-57e1-0310-9a29-db15c13687c0
2007-06-15 23:07:20 +00:00
luke 659792f280 Adding ralsh and filebucket to the rpm and the rakefile, and changing the url in the rpm
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2592 980ebf18-57e1-0310-9a29-db15c13687c0
2007-06-15 23:01:56 +00:00
lutter 0a2b43808b Fix trac #601: wrong location for client pidfile
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2546 980ebf18-57e1-0310-9a29-db15c13687c0
2007-06-01 22:05:56 +00:00
lutter a1d4f3567d Update to latest shipped for Fedora/RHEL
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2455 980ebf18-57e1-0310-9a29-db15c13687c0
2007-05-03 01:00:26 +00:00