diff options
| -rw-r--r-- | conf/redhat/no-chuser-0.15.1.patch | 38 | ||||
| -rw-r--r-- | conf/redhat/puppet.spec | 5 |
2 files changed, 43 insertions, 0 deletions
diff --git a/conf/redhat/no-chuser-0.15.1.patch b/conf/redhat/no-chuser-0.15.1.patch new file mode 100644 index 000000000..e19bc7c62 --- /dev/null +++ b/conf/redhat/no-chuser-0.15.1.patch @@ -0,0 +1,38 @@ +--- puppet-0.15.1/bin/puppetmasterd.orig 2006-03-15 08:33:45.000000000 -0800 ++++ puppet-0.15.1/bin/puppetmasterd 2006-03-22 13:07:54.000000000 -0800 +@@ -210,14 +210,15 @@ + exit(1) + end + +-if Process.uid == 0 +- begin +- Puppet::Util.chuser +- rescue => detail +- $stderr.puts "Could not change user to %s: %s" % [Puppet[:user], detail] +- exit(39) +- end +-end ++# FIXME: Running as non-root is not ready for primetime ++# if Process.uid == 0 ++# begin ++# Puppet::Util.chuser ++# rescue => detail ++# $stderr.puts "Could not change user to %s: %s" % [Puppet[:user], detail] ++# exit(39) ++# end ++# end + + if Puppet[:parseonly] + # we would have already exited if the file weren't syntactically correct +--- puppet-0.15.1/bin/puppetca.orig 2006-02-07 15:12:39.000000000 -0800 ++++ puppet-0.15.1/bin/puppetca 2006-03-22 13:07:56.000000000 -0800 +@@ -138,7 +138,8 @@ + Puppet.genconfig + Puppet.genmanifest + +-Puppet::Util.chuser ++# FIXME: Running as non-root is not ready for primetime ++# Puppet::Util.chuser + + begin + ca = Puppet::SSLCertificates::CA.new() diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec index fab19121e..33bd2bb4f 100644 --- a/conf/redhat/puppet.spec +++ b/conf/redhat/puppet.spec @@ -11,6 +11,7 @@ Group: System Environment/Base URL: http://reductivelabs.com/projects/puppet/ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz +Patch0: no-chuser-0.15.1.patch Requires: ruby >= 1.8.1 Requires: facter >= 1.1 @@ -37,6 +38,7 @@ The server can also function as a certificate authority and file server. %prep %setup -q +%patch0 -p1 %install %{__rm} -rf %{buildroot} @@ -123,6 +125,9 @@ fi %{__rm} -rf %{buildroot} %changelog +* Wed Mar 22 2006 David Lutterkort <dlutter@redhat.com> - 0.15.1-1 +- Patch0: Run puppetmaster as root; running as puppet is not ready for primetime + * Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 0.15.0-1 - Commented out noarch; requires fix for bz184199 |