Load modules on platforms that need it.

Ensure that modules-enabled gets created

Add newline to configs

Enable Mail in the mail tests

Make newlines work

Author: jstraw

REFERENCE.md

@@ -258,7 +258,8 @@ The following parameters are available in the `nginx` class:
 Data type: `Boolean`
 
 When set, nginx will include module configurations files installed in the
-/etc/nginx/modules-enabled directory.
+/etc/nginx/modules-enabled directory. This is also enabled if mail is
+being configured (to allow the module to be loaded).
 
 Default value: `$nginx::params::include_modules_enabled`
 
@@ -405,7 +406,7 @@ Data type: `Array[String]`
 
 
 
-Default value: `$nginx::params::dynamic_modules`
+Default value: `[]`
 
 ##### <a name="-nginx--global_owner"></a>`global_owner`
 

manifests/config.pp

@@ -199,6 +199,12 @@
     }
   }
 
+  if ($include_modules_enabled or $nginx::mail) {
+    file { "${conf_dir}/modules-enabled":
+      ensure => directory,
+    }
+  }
+
   file { $log_dir:
     ensure  => directory,
     mode    => $log_mode,

manifests/init.pp

@@ -10,7 +10,8 @@
 #
 # @param include_modules_enabled
 #   When set, nginx will include module configurations files installed in the
-#   /etc/nginx/modules-enabled directory.
+#   /etc/nginx/modules-enabled directory. This is also enabled if mail is
+#   being configured (to allow the module to be loaded).
 #
 # @param passenger_package_name
 #   The name of the package to install in order for the passenger module of
@@ -224,7 +225,7 @@
   Optional[Enum['on', 'off']] $daemon                        = undef,
   String[1] $daemon_user                                     = $nginx::params::daemon_user,
   Optional[String[1]] $daemon_group                          = undef,
-  Array[String] $dynamic_modules                             = $nginx::params::dynamic_modules,
+  Array[String] $dynamic_modules                             = [],
   String[1] $global_owner                                    = 'root',
   String[1] $global_group                                    = $nginx::params::global_group,
   Stdlib::Filemode $global_mode                              = '0644',

manifests/params.pp

@@ -17,7 +17,6 @@
     'mail_package_name'       => undef,
     'manage_repo'             => false,
     'include_modules_enabled' => false,
-    'dynamic_modules'         => [],
     'mime_types'              => {
       'text/html'                                                                 => 'html htm shtml',
       'text/css'                                                                  => 'css',
@@ -149,7 +148,6 @@
         $_module_os_overrides = {
           'log_group'         => 'nginx',
           'mail_package_name' => 'nginx-mod-mail',
-          'dynamic_modules'   => ['/usr/lib64/nginx/modules/ngx_mail_module.so'],
         }
       }
     }
@@ -209,7 +207,6 @@
   $log_mode                = $_module_parameters['log_mode']
   $pid                     = $_module_parameters['pid']
   $include_modules_enabled = $_module_parameters['include_modules_enabled']
-  $dynamic_modules         = $_module_parameters['dynamic_modules']
 
   $daemon_user             = $_module_parameters['daemon_user']
   $global_group            = $_module_parameters['root_group']

manifests/resource/mailhost.pp

@@ -194,6 +194,17 @@
     package { $nginx::mail_package_name:
       ensure => 'installed',
     }
+    $mail_load_content = $facts['os']['family'] ? {
+      'ArchLinux' => "load_module /usr/lib/nginx/modules/ngx_mail_module.so;\n",
+      'RedHat'    => "load_module /usr/lib64/nginx/modules/ngx_mail_module.so;\n",
+    }
+    file { '/etc/nginx/modules-enabled/mail.conf':
+      ensure  => 'file',
+      owner   => 'root',
+      mode    => '0644',
+      content => $mail_load_content,
+      require => File['/etc/nginx/modules-enabled'],
+    }
   }
 
   # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled

spec/defines/resource_mailhost_spec.rb

@@ -16,7 +16,7 @@
           ipv6_enable: true
         }
       end
-      let(:pre_condition) { ['include nginx'] }
+      let(:pre_condition) { ['class { "nginx": mail => true }'] }
 
       describe 'os-independent items' do
         describe 'basic assumptions' do

templates/conf.d/nginx.conf.erb

@@ -6,6 +6,7 @@ load_module "<%= mod_item -%>";
 load_module "modules/<%= mod_item -%>.so";
   <%- end -%>
 <%- end -%>
+
 <% if @daemon -%>
 daemon <%= @daemon %>;
 <% end -%>
@@ -23,7 +24,7 @@ pcre_jit <%= @pcre_jit %>;
 <% if @pid -%>
 pid        <%= @pid %>;
 <% end -%>
-<% if @include_modules_enabled -%>
+<% if @include_modules_enabled or @mail -%>
 include /etc/nginx/modules-enabled/*.conf;
 <% end -%>
 <% if @nginx_cfg_prepend -%>