Properly require proxy mods

This ensures the proxy module is always loaded at the right time.

Author: ekohl

manifests/mod/proxy_ajp.pp

@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html for additional documentation.
 #
 class apache::mod::proxy_ajp {
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_ajp']
+  require apache::mod::proxy
   ::apache::mod { 'proxy_ajp': }
 }

manifests/mod/proxy_balancer.pp

@@ -21,14 +21,12 @@
   Array $allow_from                  = ['127.0.0.1','::1'],
   Optional[String] $apache_version   = $apache::apache_version,
 ) {
-  include apache::mod::proxy
-  include apache::mod::proxy_http
+  require apache::mod::proxy
+  require apache::mod::proxy_http
   if versioncmp($apache_version, '2.4') >= 0 {
     ::apache::mod { 'slotmem_shm': }
   }
 
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_balancer']
-  Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_balancer']
   ::apache::mod { 'proxy_balancer': }
   if $manager {
     include apache::mod::status

manifests/mod/proxy_connect.pp

@@ -4,6 +4,6 @@
 #
 class apache::mod::proxy_connect {
   include apache
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_connect']
+  require apache::mod::proxy
   apache::mod { 'proxy_connect': }
 }

manifests/mod/proxy_fcgi.pp

@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html for additional documentation.
 #
 class apache::mod::proxy_fcgi {
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_fcgi']
+  require apache::mod::proxy
   ::apache::mod { 'proxy_fcgi': }
 }

manifests/mod/proxy_html.pp

@@ -5,8 +5,8 @@
 #
 class apache::mod::proxy_html {
   include apache
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_html']
-  Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_html']
+  require apache::mod:::proxy
+  require apache::mod:::proxy_http
 
   # Add libxml2
   case $facts['os']['family'] {

manifests/mod/proxy_http.pp

@@ -4,6 +4,6 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_http.html for additional documentation.
 #
 class apache::mod::proxy_http {
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_http']
+  require apache::mod::proxy
   ::apache::mod { 'proxy_http': }
 }

manifests/mod/proxy_wstunnel.pp

@@ -4,7 +4,7 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html for additional documentation.
 #
 class apache::mod::proxy_wstunnel {
-  include apache, apache::mod::proxy
-  Class['apache::mod::proxy'] -> Class['apache::mod::proxy_wstunnel']
+  include apache
+  require apache::mod::proxy
   ::apache::mod { 'proxy_wstunnel': }
 }

manifests/vhost.pp

@@ -2488,7 +2488,6 @@
   # - $proxy_add_headers
   # - $no_proxy_uris
   if ($proxy_dest or $proxy_pass or $proxy_pass_match or $proxy_dest_match or $proxy_preserve_host) and $ensure == 'present' {
-    include apache::mod::proxy
     include apache::mod::proxy_http
 
     concat::fragment { "${name}-proxy":