(#11070) Add support for Scientific Linux

This patch adds Scientific Linux to the various case statements so it is
supported. This also fixed the various templates so that the log location
is variable depending on weither the OS is Redhat based or Debian based.

Author: davidalden

manifests/mod/python.pp

@@ -3,7 +3,7 @@
 
   package { "python":
     name => $operatingsystem ? {
-      centos  => "mod_python",
+      'centos', 'fedora', 'redhat', 'scientific' => "mod_python",
       default => "libapache2-mod-python",
     },
     ensure  => installed,

manifests/mod/wsgi.pp

@@ -3,7 +3,7 @@
 
   package { "wsgi":
     name => $operatingsystem ? {
-      centos  => "mod_wsgi",
+      'centos', 'fedora', 'redhat', 'scientific' => "mod_wsgi",
       default => "libapache2-mod-wsgi",
     },
     ensure  => installed,

manifests/params.pp

@@ -31,7 +31,7 @@
   $vhost_name    = '*'
 
   case $operatingsystem {
-    'centos', 'redhat', 'fedora': {
+    'centos', 'redhat', 'fedora', 'scientific': {
        $apache_name = 'httpd'
        $php_package = 'php'
        $ssl_package = 'mod_ssl'

manifests/ssl.pp

@@ -17,7 +17,7 @@
   include apache
 
   case $operatingsystem {
-     'centos', 'fedora', 'redhat': {
+     'centos', 'fedora', 'redhat', 'scientific': {
         package { $apache::params::ssl_package:
            require => Package['httpd'],
         }

manifests/vhost.pp

@@ -36,6 +36,7 @@
     $auth          = $apache::params::auth,
     $redirect_ssl  = $apache::params::redirect_ssl,
     $options       = $apache::params::options,
+    $apache_name   = $apache::params::apache_name,
     $vhost_name    = $apache::params::vhost_name
   ) {
 

templates/vhost-default.conf.erb

@@ -18,9 +18,9 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
     Order allow,deny
     allow from all
   </Directory>
-  ErrorLog /var/log/apache2/<%= name %>_error.log
+  ErrorLog /var/log/<%= apache_name %>/<%= name %>_error.log
   LogLevel warn
-  CustomLog /var/log/apache2/<%= name %>_access.log combined
+  CustomLog /var/log/<%= apache_name %>/<%= name %>_access.log combined
   ServerSignature Off
 </VirtualHost>
 

templates/vhost-proxy.conf.erb

@@ -20,9 +20,9 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
    ProxyPassReverse / <%= dest %>/
    ProxyPreserveHost On 
 
-   ErrorLog /var/log/apache2/<%= name %>_error.log
+   ErrorLog /var/log/<%= apache_name %>/<%= name %>_error.log
    LogLevel warn
-   CustomLog /var/log/apache2/<%= name %>_access.log combined
+   CustomLog /var/log/<%= apache_name %>/<%= name %>_access.log combined
 
 </VirtualHost>