Skip to content
Browse files

fixes #2342 converting to ::osfamily to support redhat based distribu…

…tions globally
  • Loading branch information...
1 parent 6e3d58d commit ebbf39cb53d572ac276d75f2650046ae2d1e6124 Byron Miller committed with domcleal Mar 29, 2013
Showing with 11 additions and 11 deletions.
  1. +4 −4 manifests/install.pp
  2. +2 −2 manifests/params.pp
  3. +3 −3 manifests/service.pp
  4. +2 −2 manifests/ssl.pp
View
8 manifests/install.pp
@@ -1,13 +1,13 @@
class apache::install {
- case $::operatingsystem {
- redhat,centos,fedora,Scientific: {
+ case $::osfamily {
+ RedHat: {
$http_package = 'httpd'
}
- Debian,Ubuntu: {
+ Debian: {
$http_package = 'apache2'
}
default: {
- fail("${::hostname}: This module does not support operatingsystem ${::operatingsystem}")
+ fail("${::hostname}: This module does not support operatingsystem ${::osfamily}")
}
}
View
4 manifests/params.pp
@@ -1,6 +1,6 @@
class apache::params {
- case $::operatingsystem {
- Debian,Ubuntu: {
+ case $::osfamily {
+ Debian: {
$user = 'www-data'
$group = 'www-data'
$configdir = '/etc/apache2/conf.d'
View
6 manifests/service.pp
@@ -1,7 +1,7 @@
class apache::service {
- $http_service = $::operatingsystem ? {
- /(Debian|Ubuntu)/ => 'apache2',
- default => 'httpd',
+ $http_service = $::osfamily ? {
+ 'Debian' => 'apache2',
+ default => 'httpd',
}
service { $http_service:
View
4 manifests/ssl.pp
@@ -1,8 +1,8 @@
class apache::ssl {
include apache
- case $::operatingsystem {
- Debian,Ubuntu: {
+ case $::osfamily {
+ Debian: {
exec { 'enable-ssl':
command => '/usr/sbin/a2enmod ssl',
creates => '/etc/apache2/mods-enabled/ssl.load',

0 comments on commit ebbf39c

Please sign in to comment.
Something went wrong with that request. Please try again.