Merge pull request #47 from saz/apache_fragment

remove apache custom fragment

Author: stephenrjohnson

.fixtures.yml

@@ -3,7 +3,7 @@ fixtures:
         stdlib:  "git://github.com/puppetlabs/puppetlabs-stdlib.git"
         apache:
           repo: "git://github.com/puppetlabs/puppetlabs-apache.git"
-          ref: '0.8.0'
+          ref: '1.0.1'
         puppetdb: "git://github.com/puppetlabs/puppetlabs-puppetdb.git"
         inifile: "git://github.com/puppetlabs/puppetlabs-inifile.git"
         concat: "git://github.com/ripienaar/puppet-concat.git"

Modulefile

@@ -8,6 +8,6 @@ license 'Apache'
 project_page 'https://github.com/stephenrjohnson/puppetlabs-puppet'
 ## Add dependencies, if any:
 dependency 'puppetlabs/inifile', '>= 1.0.0'
-dependency 'puppetlabs/apache', '>= 0.8.0'
+dependency 'puppetlabs/apache', '>= 1.0.1'
 dependency 'puppetlabs/puppetdb', '>= 2.0.0'
 dependency 'puppetlabs/stdlib', '>= 3.0.0'

manifests/passenger.pp

@@ -99,20 +99,33 @@
   }
 
   apache::vhost { "puppet-${certname}":
-    port               => $puppet_passenger_port,
-    priority           => '40',
-    docroot            => $puppet_docroot,
-    serveradmin        => $apache_serveradmin,
-    servername         => $certname,
-    ssl                => true,
-    ssl_cert           => "${puppet_ssldir}/certs/${certname}.pem",
-    ssl_key            => "${puppet_ssldir}/private_keys/${certname}.pem",
-    ssl_chain          => "${puppet_ssldir}/ca/ca_crt.pem",
-    ssl_ca             => "${puppet_ssldir}/ca/ca_crt.pem",
-    ssl_crl            => "${puppet_ssldir}/ca/ca_crl.pem",
-    rack_base_uris     => '/',
-    custom_fragment    => template('puppet/apache_custom_fragment.erb'),
-    require            => [ File['/etc/puppet/rack/config.ru'], File[$puppet_conf] ],
+    port              => $puppet_passenger_port,
+    priority          => '40',
+    docroot           => $puppet_docroot,
+    serveradmin       => $apache_serveradmin,
+    servername        => $certname,
+    ssl               => true,
+    ssl_cert          => "${puppet_ssldir}/certs/${certname}.pem",
+    ssl_key           => "${puppet_ssldir}/private_keys/${certname}.pem",
+    ssl_chain         => "${puppet_ssldir}/ca/ca_crt.pem",
+    ssl_ca            => "${puppet_ssldir}/ca/ca_crt.pem",
+    ssl_crl           => "${puppet_ssldir}/ca/ca_crl.pem",
+    ssl_protocol      => '-ALL +SSLv3 +TLSv1',
+    ssl_cipher        => 'ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:-LOW:-SSLv2:-EXP',
+    ssl_verify_client => 'optional',
+    ssl_verify_depth  => '1',
+    ssl_options       => ['+StdEnvVars', '+ExportCertData'],
+    rack_base_uris    => '/',
+    directories       => [
+      {
+        path => $puppet_docroot,
+      },
+      {
+        path    => '/etc/puppet/rack',
+        options => 'None',
+      },
+    ],
+    require         => [ File['/etc/puppet/rack/config.ru'], File[$puppet_conf] ],
   }
 
   #Hack to add extra passenger configurations for puppetmaster