Merge pull request #2338 from ekohl/use-serveradmin

Make serveradmin an optional parameter and use it

Author: david22swan

manifests/init.pp

@@ -489,7 +489,7 @@
   Boolean $purge_configs                                                     = true,
   Optional[Boolean] $purge_vhost_dir                                         = undef,
   Boolean $purge_vdir                                                        = false,
-  String $serveradmin                                                        = 'root@localhost',
+  Optional[String[1]] $serveradmin                                           = undef,
   Enum['On', 'Off', 'on', 'off'] $sendfile                                   = 'On',
   Optional[Enum['On', 'Off', 'on', 'off']] $ldap_verify_server_cert          = undef,
   Optional[String] $ldap_trusted_mode                                        = undef,

spec/classes/apache_spec.rb

@@ -39,6 +39,7 @@
         'purge' => 'false'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+    it { is_expected.to contain_file('/etc/apache2/apache2.conf').without_content(%r{ServerAdmin}) }
     it {
       is_expected.to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'root',
@@ -83,6 +84,16 @@
       it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
     end
 
+    context 'with serveradmin' do
+      let(:params) do
+        {
+          serveradmin: '[email protected]',
+        }
+      end
+
+      it { is_expected.to contain_file('/etc/apache2/apache2.conf').with_content %r{^ServerAdmin admin@example\.com$} }
+    end
+
     context 'when specifying slash encoding behaviour' do
       let :params do
         { allow_encoded_slashes: 'nodecode' }

templates/httpd.conf.erb

@@ -5,6 +5,9 @@ TraceEnable <%= scope.call_function('apache::bool2httpd', [@trace_enable]) %>
 
 ServerName "<%= @servername %>"
 ServerRoot "<%= @server_root %>"
+<%- if @serveradmin -%>
+ServerAdmin <%= @serveradmin %>
+<%- end -%>
 PidFile <%= @pidfile %>
 Timeout <%= @timeout %>
 KeepAlive <%= @keepalive %>