Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22992926 Update puppetlabs-apache to 1.8.1
authorPatrick Einheber <patrick.einheber@oracle.com>
Thu, 31 Mar 2016 15:18:19 -0700
changeset 5696 f99e26938556
parent 5695 4f374a28b509
child 5697 c0e69798472c
22992926 Update puppetlabs-apache to 1.8.1
components/ruby/puppet-modules/puppetlabs-apache/Makefile file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-apache/patches/02-params.patch file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-apache/patches/05-mod-alias.patch file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-apache/patches/06-mod-prefork.patch file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-apache/patches/09-mod-ssl.patch file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-apache/puppetlabs-apache.p5m file | annotate | diff | comparison | revisions 
--- a/components/ruby/puppet-modules/puppetlabs-apache/Makefile	Thu Mar 31 14:07:16 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/Makefile	Thu Mar 31 15:18:19 2016 -0700
@@ -20,22 +20,22 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		puppetlabs-apache
-COMPONENT_VERSION=	1.4.0
+COMPONENT_VERSION=	1.8.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:4cde055af7b225ffed97fd54ead21dc0ebc36ba77eb42d5fa5532e320888fce4
+    sha256:c6ddcfcafbc9d1cb459d0f7b907213a7ffee7954ed588f9c08037527a04d7aad
 COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://www.openstack.org/
 COMPONENT_BUGDB=	utility/apache
 
-TPNO=			24140
+TPNO=			27383
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/02-params.patch	Thu Mar 31 14:07:16 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/02-params.patch	Thu Mar 31 15:18:19 2016 -0700
@@ -3,12 +3,12 @@
 
 This patch has not yet been submitted upstream.
 
---- puppetlabs-apache-1.4.0/manifests/params.pp.orig	2015-05-27 11:04:52.423946815 -0600
-+++ puppetlabs-apache-1.4.0/manifests/params.pp	2015-05-27 13:45:14.205705497 -0600
-@@ -416,6 +416,65 @@ class apache::params inherits ::apache::
-     $wsgi_socket_prefix   = undef
-     $docroot              = '/var/www/localhost/htdocs'
-     $error_documents_path = '/usr/share/apache2/error'
+--- puppetlabs-apache-1.8.1/manifests/params.pp.orig    2016-03-31 11:05:50.763682325 -0700
++++ puppetlabs-apache-1.8.1/manifests/params.pp 2016-03-31 11:08:32.016651366 -0700
+@@ -183,6 +183,66 @@
+       'base_rules/modsecurity_crs_59_outbound_blocking.conf',
+       'base_rules/modsecurity_crs_60_correlation.conf'
+     ]
 +  } elsif $::osfamily == 'Solaris' {
 +    $user                = 'webservd'
 +    $group               = 'webservd'
@@ -68,6 +68,8 @@
 +    $modsec_default_rules   = undef
 +    $error_documents_path   = '/var/apache2/2.4/error'
 +    $wsgi_socket_prefix     = undef
-   } else {
-     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
-   }
++    $alias_icons_path       = '/var/apache2/2.4/icons'
+   } elsif $::osfamily == 'Debian' {
+     $user                = 'www-data'
+     $group               = 'www-data'
+
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/05-mod-alias.patch	Thu Mar 31 14:07:16 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Patch to add Solaris specific paths for mod-alias.  This patch has not
-yet been submitted upstream.
-
---- puppetlabs-apache-1.4.0/manifests/mod/alias.pp.orig	2015-06-03 13:49:26.561897609 -0600
-+++ puppetlabs-apache-1.4.0/manifests/mod/alias.pp	2015-06-03 13:49:37.216355218 -0600
-@@ -12,6 +12,7 @@ class apache::mod::alias(
-     },
-     'freebsd' => '/usr/local/www/apache24/icons',
-     'gentoo'  => '/usr/share/apache2/icons',
-+    'solaris'  => '/var/apache2/2.4/icons',
-   }
-   apache::mod { 'alias': }
-   # Template uses $icons_path
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/06-mod-prefork.patch	Thu Mar 31 14:07:16 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/06-mod-prefork.patch	Thu Mar 31 15:18:19 2016 -0700
@@ -7,8 +7,8 @@
          }
        }
      }
--    'debian', 'freebsd' : {
-+    'debian', 'freebsd', 'solaris' : {
+-    'debian', 'freebsd', 'Suse' : {
++    'debian', 'freebsd', 'Suse', 'solaris' : {
        ::apache::mpm{ 'prefork':
          apache_version => $apache_version,
        }
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/09-mod-ssl.patch	Thu Mar 31 14:07:16 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/09-mod-ssl.patch	Thu Mar 31 15:18:19 2016 -0700
@@ -1,17 +1,18 @@
 Patch to add Solaris specific paths for mod-ssl.  This patch has not
 yet been submitted upstream.
 
---- puppetlabs-apache-1.4.0/manifests/mod/ssl.pp.orig	Thu Mar 24 13:28:37 2016
-+++ puppetlabs-apache-1.4.0/manifests/mod/ssl.pp	Thu Mar 24 14:38:48 2016
-@@ -8,11 +8,28 @@
-   $apache_version         = $::apache::apache_version,
-   $package_name           = undef,
- ) {
+--- puppetlabs-apache-1.8.1/manifests/mod/ssl.pp.orig   2016-03-31 11:38:48.810710927 -0700
++++ puppetlabs-apache-1.8.1/manifests/mod/ssl.pp        2016-03-31 11:40:38.688179788 -0700
+@@ -40,12 +40,31 @@
+     }
+   }
+
 -  $session_cache = $::osfamily ? {
 -    'debian'  => "\${APACHE_RUN_DIR}/ssl_scache(512000)",
 -    'redhat'  => '/var/cache/mod_ssl/scache(512000)',
 -    'freebsd' => '/var/run/ssl_scache(512000)',
 -    'gentoo'  => '/var/run/ssl_scache(512000)',
+-    'Suse'    => '/var/lib/apache2/ssl_scache(512000)'
 +  case $::osfamily {
 +    'debian': {
 +      $session_cache = "\${APACHE_RUN_DIR}/ssl_scache(512000)"
@@ -25,32 +26,19 @@
 +    'gentoo': {
 +      $session_cache = '/var/run/ssl_scache(512000)'
 +    }
++    'Suse': {
++      $session_cache = '/var/lib/apache2/ssl_scache(512000)'
++    }
 +    'solaris': {
 +      if versioncmp($apache_version, '2.4') == 0 {
-+	$session_cache = '/var/run/apache2/2.4/ssl_scache(512000)'
++       $session_cache = '/var/run/apache2/2.4/ssl_scache(512000)'
 +      } elsif versioncmp($apache_version, '2.2') == 0 {
-+	$session_cache = '/var/run/apache2/2.2/ssl_scache(512000)'
++       $session_cache = '/var/run/apache2/2.2/ssl_scache(512000)'
 +      } else {
-+	$session_cache = '/var/run/ssl_scache(512000)'
++       $session_cache = '/var/run/ssl_scache(512000)'
 +      }
 +    }
    }
- 
-   case $::osfamily {
-@@ -34,6 +51,15 @@
-     'gentoo': {
-       $ssl_mutex = 'default'
-     }
-+    'solaris': {
-+      if versioncmp($apache_version, '2.4') == 0 {
-+        $ssl_mutex = 'default'
-+      } elsif versioncmp($apache_version, '2.2') == 0 {
-+        $ssl_mutex = 'file:/var/run/apache2/2.2/ssl_mutex'
-+      } else {
-+        $ssl_mutex = "file:/var/run/ssl_mutex"
-+      }
-+    }
-     default: {
-       fail("Unsupported osfamily ${::osfamily}")
-     }
 
+   ::apache::mod { 'ssl':
+
--- a/components/ruby/puppet-modules/puppetlabs-apache/puppetlabs-apache.p5m	Thu Mar 31 14:07:16 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/puppetlabs-apache.p5m	Thu Mar 31 15:18:19 2016 -0700
@@ -47,11 +47,26 @@
 file path=etc/puppet/modules/apache/Gemfile
 file path=etc/puppet/modules/apache/LICENSE
 file path=etc/puppet/modules/apache/README.md
-file path=etc/puppet/modules/apache/README.passenger.md
 file path=etc/puppet/modules/apache/Rakefile
 file path=etc/puppet/modules/apache/checksums.json
+file path=etc/puppet/modules/apache/examples/apache.pp
+file path=etc/puppet/modules/apache/examples/dev.pp
+file path=etc/puppet/modules/apache/examples/init.pp
+file path=etc/puppet/modules/apache/examples/mod_load_params.pp
+file path=etc/puppet/modules/apache/examples/mods.pp
+file path=etc/puppet/modules/apache/examples/mods_custom.pp
+file path=etc/puppet/modules/apache/examples/php.pp
+file path=etc/puppet/modules/apache/examples/vhost.pp
+file path=etc/puppet/modules/apache/examples/vhost_directories.pp
+file path=etc/puppet/modules/apache/examples/vhost_filter.pp
+file path=etc/puppet/modules/apache/examples/vhost_ip_based.pp
+file path=etc/puppet/modules/apache/examples/vhost_proxypass.pp
+file path=etc/puppet/modules/apache/examples/vhost_ssl.pp
+file path=etc/puppet/modules/apache/examples/vhosts_without_listen.pp
 file path=etc/puppet/modules/apache/files/httpd
 file path=etc/puppet/modules/apache/lib/puppet/parser/functions/bool2httpd.rb
+file path=etc/puppet/modules/apache/lib/puppet/parser/functions/enclose_ipv6.rb
+file path=etc/puppet/modules/apache/lib/puppet/parser/functions/validate_apache_log_level.rb
 file path=etc/puppet/modules/apache/lib/puppet/provider/a2mod.rb
 file path=etc/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb
 file path=etc/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb
@@ -75,6 +90,8 @@
 file path=etc/puppet/modules/apache/manifests/mod/auth_basic.pp
 file path=etc/puppet/modules/apache/manifests/mod/auth_cas.pp
 file path=etc/puppet/modules/apache/manifests/mod/auth_kerb.pp
+file path=etc/puppet/modules/apache/manifests/mod/auth_mellon.pp
+file path=etc/puppet/modules/apache/manifests/mod/authn_core.pp
 file path=etc/puppet/modules/apache/manifests/mod/authn_file.pp
 file path=etc/puppet/modules/apache/manifests/mod/authnz_ldap.pp
 file path=etc/puppet/modules/apache/manifests/mod/authz_default.pp
@@ -92,9 +109,11 @@
 file path=etc/puppet/modules/apache/manifests/mod/disk_cache.pp
 file path=etc/puppet/modules/apache/manifests/mod/event.pp
 file path=etc/puppet/modules/apache/manifests/mod/expires.pp
+file path=etc/puppet/modules/apache/manifests/mod/ext_filter.pp
 file path=etc/puppet/modules/apache/manifests/mod/fastcgi.pp
 file path=etc/puppet/modules/apache/manifests/mod/fcgid.pp
 file path=etc/puppet/modules/apache/manifests/mod/filter.pp
+file path=etc/puppet/modules/apache/manifests/mod/geoip.pp
 file path=etc/puppet/modules/apache/manifests/mod/headers.pp
 file path=etc/puppet/modules/apache/manifests/mod/include.pp
 file path=etc/puppet/modules/apache/manifests/mod/info.pp
@@ -117,6 +136,7 @@
 file path=etc/puppet/modules/apache/manifests/mod/proxy_html.pp
 file path=etc/puppet/modules/apache/manifests/mod/proxy_http.pp
 file path=etc/puppet/modules/apache/manifests/mod/python.pp
+file path=etc/puppet/modules/apache/manifests/mod/remoteip.pp
 file path=etc/puppet/modules/apache/manifests/mod/reqtimeout.pp
 file path=etc/puppet/modules/apache/manifests/mod/rewrite.pp
 file path=etc/puppet/modules/apache/manifests/mod/rpaf.pp
@@ -148,10 +168,10 @@
 file path=etc/puppet/modules/apache/manifests/ssl.pp
 file path=etc/puppet/modules/apache/manifests/version.pp
 file path=etc/puppet/modules/apache/manifests/vhost.pp
+file path=etc/puppet/modules/apache/manifests/vhost/custom.pp
 file path=etc/puppet/modules/apache/metadata.json
 file path=etc/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb
 file path=etc/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/basic_spec.rb
 file path=etc/puppet/modules/apache/spec/acceptance/class_spec.rb
 file path=etc/puppet/modules/apache/spec/acceptance/custom_config_spec.rb
 file path=etc/puppet/modules/apache/spec/acceptance/default_mods_spec.rb
@@ -167,15 +187,12 @@
 file path=etc/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb
 file path=etc/puppet/modules/apache/spec/acceptance/mod_security_spec.rb
 file path=etc/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml
 file path=etc/puppet/modules/apache/spec/acceptance/nodesets/centos-70-x64.yml
 file path=etc/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml
 file path=etc/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml
 file path=etc/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml
 file path=etc/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml
+file path=etc/puppet/modules/apache/spec/acceptance/nodesets/debian-82-x64.yml
 file path=etc/puppet/modules/apache/spec/acceptance/nodesets/default.yml
 file path=etc/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml
 file path=etc/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
@@ -184,7 +201,6 @@
 file path=etc/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
 file path=etc/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb
 file path=etc/puppet/modules/apache/spec/acceptance/service_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/unsupported_spec.rb
 file path=etc/puppet/modules/apache/spec/acceptance/version.rb
 file path=etc/puppet/modules/apache/spec/acceptance/vhost_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/apache_spec.rb
@@ -192,16 +208,21 @@
 file path=etc/puppet/modules/apache/spec/classes/mod/alias_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/auth_cas_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb
+file path=etc/puppet/modules/apache/spec/classes/mod/auth_mellon_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/deflate_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/dev_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/dir_spec.rb
+file path=etc/puppet/modules/apache/spec/classes/mod/disk_cache.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/event_spec.rb
+file path=etc/puppet/modules/apache/spec/classes/mod/expires_spec.rb
+file path=etc/puppet/modules/apache/spec/classes/mod/ext_filter_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/info_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/itk_spec.rb
+file path=etc/puppet/modules/apache/spec/classes/mod/ldap_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/mime_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/negotiation_spec.rb
@@ -214,6 +235,7 @@
 file path=etc/puppet/modules/apache/spec/classes/mod/proxy_connect_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/python_spec.rb
+file path=etc/puppet/modules/apache/spec/classes/mod/remoteip_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/reqtimeout_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb
 file path=etc/puppet/modules/apache/spec/classes/mod/security_spec.rb
@@ -231,18 +253,22 @@
 file path=etc/puppet/modules/apache/spec/defines/fastcgi_server_spec.rb
 file path=etc/puppet/modules/apache/spec/defines/mod_spec.rb
 file path=etc/puppet/modules/apache/spec/defines/modsec_link_spec.rb
+file path=etc/puppet/modules/apache/spec/defines/vhost_custom_spec.rb
 file path=etc/puppet/modules/apache/spec/defines/vhost_spec.rb
 file path=etc/puppet/modules/apache/spec/spec.opts
 file path=etc/puppet/modules/apache/spec/spec_helper.rb
 file path=etc/puppet/modules/apache/spec/spec_helper_acceptance.rb
 file path=etc/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
 file path=etc/puppet/modules/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
+file path=etc/puppet/modules/apache/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb
+file path=etc/puppet/modules/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb
 file path=etc/puppet/modules/apache/templates/confd/no-accf.conf.erb
 file path=etc/puppet/modules/apache/templates/fastcgi/server.erb
 file path=etc/puppet/modules/apache/templates/httpd.conf.erb
 file path=etc/puppet/modules/apache/templates/listen.erb
 file path=etc/puppet/modules/apache/templates/mod/alias.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/auth_cas.conf.erb
+file path=etc/puppet/modules/apache/templates/mod/auth_mellon.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/autoindex.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/cgid.conf.erb
@@ -251,8 +277,10 @@
 file path=etc/puppet/modules/apache/templates/mod/dir.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/disk_cache.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/event.conf.erb
+file path=etc/puppet/modules/apache/templates/mod/expires.conf.erb
+file path=etc/puppet/modules/apache/templates/mod/ext_filter.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/fastcgi.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/fcgid.conf.erb
+file path=etc/puppet/modules/apache/templates/mod/geoip.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/info.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/itk.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/ldap.conf.erb
@@ -269,6 +297,7 @@
 file path=etc/puppet/modules/apache/templates/mod/prefork.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/proxy.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/proxy_html.conf.erb
+file path=etc/puppet/modules/apache/templates/mod/remoteip.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/reqtimeout.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/rpaf.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/security.conf.erb
@@ -277,6 +306,7 @@
 file path=etc/puppet/modules/apache/templates/mod/ssl.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/status.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/suphp.conf.erb
+file path=etc/puppet/modules/apache/templates/mod/unixd_fcgid.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/userdir.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/worker.conf.erb
 file path=etc/puppet/modules/apache/templates/mod/wsgi.conf.erb
@@ -287,6 +317,7 @@
 file path=etc/puppet/modules/apache/templates/vhost/_additional_includes.erb
 file path=etc/puppet/modules/apache/templates/vhost/_aliases.erb
 file path=etc/puppet/modules/apache/templates/vhost/_allow_encoded_slashes.erb
+file path=etc/puppet/modules/apache/templates/vhost/_auth_kerb.erb
 file path=etc/puppet/modules/apache/templates/vhost/_block.erb
 file path=etc/puppet/modules/apache/templates/vhost/_charsets.erb
 file path=etc/puppet/modules/apache/templates/vhost/_custom_fragment.erb
@@ -297,10 +328,12 @@
 file path=etc/puppet/modules/apache/templates/vhost/_fastcgi.erb
 file path=etc/puppet/modules/apache/templates/vhost/_file_footer.erb
 file path=etc/puppet/modules/apache/templates/vhost/_file_header.erb
+file path=etc/puppet/modules/apache/templates/vhost/_filters.erb
 file path=etc/puppet/modules/apache/templates/vhost/_header.erb
 file path=etc/puppet/modules/apache/templates/vhost/_itk.erb
 file path=etc/puppet/modules/apache/templates/vhost/_logging.erb
 file path=etc/puppet/modules/apache/templates/vhost/_passenger.erb
+file path=etc/puppet/modules/apache/templates/vhost/_passenger_base_uris.erb
 file path=etc/puppet/modules/apache/templates/vhost/_php.erb
 file path=etc/puppet/modules/apache/templates/vhost/_php_admin.erb
 file path=etc/puppet/modules/apache/templates/vhost/_proxy.erb
@@ -314,22 +347,10 @@
 file path=etc/puppet/modules/apache/templates/vhost/_serversignature.erb
 file path=etc/puppet/modules/apache/templates/vhost/_setenv.erb
 file path=etc/puppet/modules/apache/templates/vhost/_ssl.erb
+file path=etc/puppet/modules/apache/templates/vhost/_sslproxy.erb
 file path=etc/puppet/modules/apache/templates/vhost/_suexec.erb
 file path=etc/puppet/modules/apache/templates/vhost/_suphp.erb
 file path=etc/puppet/modules/apache/templates/vhost/_wsgi.erb
-file path=etc/puppet/modules/apache/tests/apache.pp
-file path=etc/puppet/modules/apache/tests/dev.pp
-file path=etc/puppet/modules/apache/tests/init.pp
-file path=etc/puppet/modules/apache/tests/mod_load_params.pp
-file path=etc/puppet/modules/apache/tests/mods.pp
-file path=etc/puppet/modules/apache/tests/mods_custom.pp
-file path=etc/puppet/modules/apache/tests/php.pp
-file path=etc/puppet/modules/apache/tests/vhost.pp
-file path=etc/puppet/modules/apache/tests/vhost_directories.pp
-file path=etc/puppet/modules/apache/tests/vhost_ip_based.pp
-file path=etc/puppet/modules/apache/tests/vhost_proxypass.pp
-file path=etc/puppet/modules/apache/tests/vhost_ssl.pp
-file path=etc/puppet/modules/apache/tests/vhosts_without_listen.pp
 #
 license LICENSE license="Apache v2.0"
 # Renamed Package
upstream/oracle/userland-gate