Merge pull request #443 from ptomulik/server_root

added $server_root parameter

README.md

@@ -255,6 +255,10 @@ Sets the servername. Defaults to fqdn provided by facter.
 
 Makes Apache use the Linux kernel 'sendfile' to serve static files. Defaults to 'On'.
 
+#####`server_root`
+
+A value to be set as `ServerRoot` in main configuration file (`httpd.conf`). Defaults to `/etc/httpd` on RedHat and `/etc/apache2` on Debian.
+
 #####`error_documents`
 
 Enables custom error documents. Defaults to 'false'.

manifests/init.pp

@@ -32,6 +32,7 @@
   $error_documents      = false,
   $timeout              = '120',
   $httpd_dir            = $apache::params::httpd_dir,
+  $server_root          = $apache::params::server_root,
   $confd_dir            = $apache::params::confd_dir,
   $vhost_dir            = $apache::params::vhost_dir,
   $vhost_enable_dir     = $apache::params::vhost_enable_dir,
@@ -235,6 +236,7 @@
     # - $apxs_workaround
     # - $keepalive
     # - $keepalive_timeout
+    # - $server_root
     file { "${apache::params::conf_dir}/${apache::params::conf_file}":
       ensure  => file,
       content => template($conf_template),

manifests/params.pp

@@ -39,6 +39,7 @@
     $apache_name          = 'httpd'
     $service_name         = 'httpd'
     $httpd_dir            = '/etc/httpd'
+    $server_root          = '/etc/httpd'
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
     $mod_dir              = "${httpd_dir}/conf.d"
@@ -93,6 +94,7 @@
     $apache_name      = 'apache2'
     $service_name     = 'apache2'
     $httpd_dir        = '/etc/apache2'
+    $server_root      = '/etc/apache2'
     $conf_dir         = $httpd_dir
     $confd_dir        = "${httpd_dir}/conf.d"
     $mod_dir          = "${httpd_dir}/mods-available"

templates/httpd.conf.erb

@@ -4,7 +4,7 @@ ServerSignature <%= @server_signature %>
 TraceEnable Off
 
 ServerName "<%= @servername %>"
-ServerRoot "<%= @httpd_dir %>"
+ServerRoot "<%= @server_root %>"
 PidFile <%= @pidfile %>
 Timeout <%= @timeout %>
 KeepAlive <%= @keepalive %>