[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.3-1-27-gdd28873

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit b649a9f6fb858cd62e08e1424e0085365497507f
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Wed Jan 19 15:19:49 2011 +0100

    debian/patches: remove apache2 configuration patch
    
    It is represented in the packaging repository as git commit
    0d2bc3125b48ed5a918ea87150a528df05c56f18
    
    --------------------

diff --git a/debian/patches/debianize_apache2.conf b/debian/patches/debianize_apache2.conf
deleted file mode 100644
index e46a210..0000000
--- a/debian/patches/debianize_apache2.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: puppet/ext/rack/files/apache2.conf
-===================================================================
---- puppet.orig/ext/rack/files/apache2.conf	2010-04-25 18:39:21.000000000 -0400
-+++ puppet/ext/rack/files/apache2.conf	2010-04-25 18:40:11.000000000 -0400
-@@ -1,11 +1,32 @@
-+# performance settings, from http://reductivelabs.com/trac/puppet/wiki/UsingPassenger
- 
--# you probably want to tune these settings
-+# Set to 5 min (300 seconds) or less. The shorting this option allows for
-+# puppetmasterd to get refreshed at some interval. This option is also
-+# somewhat dependent upon the amount of puppetd nodes connecting and at what
-+# interval.
-+PassengerPoolIdleTime 300
-+
-+# to 15% more instances than what's needed. This will allow idle
-+# puppetmasterd to get recycled. The net effect is less memory will be used,
-+# not more.
-+PassengerMaxPoolSize 15
-+
-+# Since communication with the puppetmaster from puppetd is a long process
-+# (more than 20 seconds in most cases) and will allow for processes to get
-+# recycled better
-+PassengerUseGlobalQueue on
-+
-+# The additional Passenger features for apache compatibility are not needed
-+# with Puppet.
- PassengerHighPerformance on
--PassengerMaxPoolSize 12
--PassengerPoolIdleTime 1500
--# PassengerMaxRequests 1000
--PassengerStatThrottleRate 120
-+
-+# Whether Passenger should automatically detect whether a virtual host’s
-+# document root is a Rack application. The default is on. Because
-+# RackBaseURI is set, this does not need to be on
- RackAutoDetect Off
-+
-+# Whether Phusion Passenger should automatically detect whether a virtual
-+# host’s document root is a Ruby on Rails application. The default is on.
- RailsAutoDetect Off
- 
- Listen 8140
-@@ -15,20 +36,20 @@
-         SSLProtocol -ALL +SSLv3 +TLSv1
-         SSLCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:-LOW:-SSLv2:-EXP
- 
--        SSLCertificateFile      /etc/puppet/ssl/certs/squigley.namespace.at.pem
--        SSLCertificateKeyFile   /etc/puppet/ssl/private_keys/squigley.namespace.at.pem
--        SSLCertificateChainFile /etc/puppet/ssl/ca/ca_crt.pem
--        SSLCACertificateFile    /etc/puppet/ssl/ca/ca_crt.pem
-+	SSLCertificateKeyFile /var/lib/puppet/ssl/private_keys/puppetmaster.example.com.pem
-+    	SSLCertificateFile /var/lib/puppet/ssl/certs/puppetmaster.example.com.pem
-+    	SSLCACertificateFile /var/lib/puppet/ssl/ca/ca_crt.pem
-+        SSLCertificateChainFile /var/lib/puppet/ssl/ca/ca_crt.pem
-         # If Apache complains about invalid signatures on the CRL, you can try disabling
-         # CRL checking by commenting the next line, but this is not recommended.
--        SSLCARevocationFile     /etc/puppet/ssl/ca/ca_crl.pem
-+        SSLCARevocationFile     /var/lib/puppet/ssl/ca/ca_crl.pem
-         SSLVerifyClient optional
-         SSLVerifyDepth  1
-         SSLOptions +StdEnvVars
- 
--        DocumentRoot /etc/puppet/rack/public/
-+        DocumentRoot /usr/share/puppet/rack/puppetmasterd/public
-         RackBaseURI /
--        <Directory /etc/puppet/rack/>
-+        <Directory /usr/share/puppet/rack/puppetmasterd/>
-                 Options None
-                 AllowOverride None
-                 Order allow,deny
diff --git a/debian/patches/series b/debian/patches/series
index 8c9c9bd..fae01cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix_logcheck
-debianize_apache2.conf

-- 
Puppet packaging for Debian