← Back to branch summary

~bkerensa/ubuntu/raring/puppet/new-upstream-release

« back to all changes in this revision

Viewing changes to debian/patches/debian-changes

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-07-25 01:00:37 UTC
  • mfrom: (1.1.24 upstream) (3.1.25 sid)
  • Revision ID: james.westby@ubuntu.com-20110725010037-875vuxs10eboqgw3
Tags: 2.7.1-1ubuntu1
https://launchpad.net/bugs/641001
* Merge from debian unstable.  Remaining changes:
  - debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
    set the location of the CRL in apache2 configuration. Fix apache2
    configuration on upgrade as well (LP: #641001)
  - move all puppet dependencies to puppet-common since all the code
    actually located in puppet-common.
  - move libagueas from a recommend to a dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian-changes
 
1
Description: Undocumented upstream changes
 
2
 This patch has been created by dpkg-source during the package build
 
3
 but it might have accumulated changes from several uploads. Please
 
4
 check the changelog to (hopefully) learn more on those changes.
 
5
 
 
6
--- puppet-2.7.1.orig/Rakefile
 
7
+++ puppet-2.7.1/Rakefile
 
8
@@ -9,7 +9,7 @@ require 'rspec'
 
9
 require "rspec/core/rake_task"
 
10
 
 
11
 module Puppet
 
12
-    PUPPETVERSION = File.read('lib/puppet.rb')[/PUPPETVERSION *= *'(.*)'/,1] or fail "Couldn't find PUPPETVERSION"
 
13
+    PUPPETVERSION = File.read('/usr/lib/ruby/1.8/puppet.rb')[/PUPPETVERSION *= *'(.*)'/,1] or fail "Couldn't find PUPPETVERSION"
 
14
 end
 
15
 
 
16
 Dir['tasks/**/*.rake'].each { |t| load t }
 
17
--- puppet-2.7.1.orig/test/lib/puppettest/fakes.rb
 
18
+++ puppet-2.7.1/test/lib/puppettest/fakes.rb
 
19
@@ -1,4 +1,4 @@
 
20
-require File.expand_path(File.join(File.dirname(__FILE__), '../../../lib/puppet/util'))
 
21
+require '/usr/lib/ruby/1.8/puppet/util'
 
22
 
 
23
 module PuppetTest
 
24
   # A baseclass for the faketypes.
 
25
--- puppet-2.7.1.orig/lib/puppet/provider/service/init.rb
 
26
+++ puppet-2.7.1/lib/puppet/provider/service/init.rb
 
27
@@ -134,7 +134,15 @@ Puppet::Type.type(:service).provide :ini
 
28
   # we just return that; otherwise, we return false, which causes it to
 
29
   # fallback to other mechanisms.
 
30
   def statuscmd
 
31
-    (@resource[:hasstatus] == :true) && [initscript, :status]
 
32
+      if @resource[:hasstatus] == :true then 
 
33
+          # Workaround the fact that initctl status command doesn't return
 
34
+          # proper exit codes. Can be removed once LP: #552786 is fixed.
 
35
+          if File.symlink?(initscript) && File.readlink(initscript) == "/lib/init/upstart-job" then
 
36
+              ['sh', '-c', "LANG=C invoke-rc.d #{File::basename(initscript)} status | grep -q '^#{File::basename(initscript)}.*running'" ]
 
37
+          else
 
38
+              [initscript, :status ]
 
39
+          end
 
40
+      end
 
41
   end
 
42
 
 
43
 end
 
44
--- puppet-2.7.1.orig/ext/rack/files/apache2.conf
 
45
+++ puppet-2.7.1/ext/rack/files/apache2.conf
 
46
@@ -1,12 +1,4 @@
 
47
-
 
48
-# you probably want to tune these settings
 
49
-PassengerHighPerformance on
 
50
-PassengerMaxPoolSize 12
 
51
-PassengerPoolIdleTime 1500
 
52
-# PassengerMaxRequests 1000
 
53
-PassengerStatThrottleRate 120
 
54
-RackAutoDetect Off
 
55
-RailsAutoDetect Off
 
56
+# Based on http://projects.puppetlabs.com/projects/1/wiki/Using_Passenger
 
57
 
 
58
 Listen 8140
 
59
 
 
60
@@ -15,20 +7,32 @@ Listen 8140
 
61
         SSLProtocol -ALL +SSLv3 +TLSv1
 
62
         SSLCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:-LOW:-SSLv2:-EXP
 
63
 
 
64
-        SSLCertificateFile      /etc/puppet/ssl/certs/squigley.namespace.at.pem
 
65
-        SSLCertificateKeyFile   /etc/puppet/ssl/private_keys/squigley.namespace.at.pem
 
66
-        SSLCertificateChainFile /etc/puppet/ssl/ca/ca_crt.pem
 
67
-        SSLCACertificateFile    /etc/puppet/ssl/ca/ca_crt.pem
 
68
+       SSLCertificateKeyFile /var/lib/puppet/ssl/private_keys/puppetmaster.example.com.pem
 
69
+       SSLCertificateFile /var/lib/puppet/ssl/certs/puppetmaster.example.com.pem
 
70
+       SSLCACertificateFile /var/lib/puppet/ssl/ca/ca_crt.pem
 
71
+        SSLCertificateChainFile /var/lib/puppet/ssl/ca/ca_crt.pem
 
72
         # If Apache complains about invalid signatures on the CRL, you can try disabling
 
73
         # CRL checking by commenting the next line, but this is not recommended.
 
74
-        SSLCARevocationFile     /etc/puppet/ssl/ca/ca_crl.pem
 
75
+        SSLCARevocationFile     /var/lib/puppet/ssl/ca/ca_crl.pem
 
76
+        # Set to require if this puppetmaster doesn't issue certificates
 
77
+        # to puppet clients.
 
78
+        # NB: this requires SSLCACertificateFile to include the CA cert 
 
79
+        #     issuing puppet client certificate.
 
80
         SSLVerifyClient optional
 
81
         SSLVerifyDepth  1
 
82
         SSLOptions +StdEnvVars
 
83
 
 
84
-        DocumentRoot /etc/puppet/rack/public/
 
85
+        # Passenger options that can be set in a virtual host
 
86
+        # configuration block.
 
87
+        PassengerHighPerformance on
 
88
+        PassengerStatThrottleRate 120
 
89
+        PassengerUseGlobalQueue on
 
90
+        RackAutoDetect Off
 
91
+        RailsAutoDetect Off
 
92
         RackBaseURI /
 
93
-        <Directory /etc/puppet/rack/>
 
94
+
 
95
+        DocumentRoot /usr/share/puppet/rack/puppetmasterd/public
 
96
+        <Directory /usr/share/puppet/rack/puppetmasterd/>
 
97
                 Options None
 
98
                 AllowOverride None
 
99
                 Order allow,deny
 
100
--- puppet-2.7.1.orig/lib/puppet/network/rest_authconfig.rb
 
101
+++ puppet-2.7.1/lib/puppet/network/rest_authconfig.rb
 
102
@@ -18,6 +18,7 @@ module Puppet
 
103
       { :acl => "/certificate/", :method => :find, :authenticated => false },
 
104
       { :acl => "/certificate_request", :method => [:find, :save], :authenticated => false },
 
105
       { :acl => "/status", :method => [:find], :authenticated => true },
 
106
+      { :acl => "/resource", :method => [:find, :save, :search], :authenticated => true },
 
107
     ]
 
108
 
 
109
     def self.main