opendev/puppet-httpd
Code Issues Proposed changes

Merge branch 'ticket/11070-scientific_linux'

Browse Source 
* ticket/11070-scientific_linux:
  (#11070) Add support for Scientific Linux
This commit is contained in:
Ken Barber 2011-12-01 00:58:34 +00:00
commit 6c378a219e
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/mod/python.pp
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,

2
manifests/mod/wsgi.pp
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,

2
manifests/params.pp
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'

2
manifests/ssl.pp
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'],
}

1
manifests/vhost.pp
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
) {

4
templates/vhost-default.conf.erb
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>

4
templates/vhost-proxy.conf.erb
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>