(#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.
This commit is contained in:
David Alden 2011-11-29 10:39:23 -05:00 committed by Ken Barber
parent f1001b367e
commit 2b79e8bdd1
7 changed files with 9 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -36,6 +36,7 @@ define apache::vhost(
$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
) {

View File

@ -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>

View File

@ -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>