From 073964152dd993e23c116b846b19a6ad2e60fdc7 Mon Sep 17 00:00:00 2001 From: Walter Heck Date: Mon, 16 Apr 2012 15:20:00 +0800 Subject: [PATCH] style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc. --- manifests/params.pp | 4 ++-- manifests/ssl.pp | 2 +- manifests/vhost.pp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 86d0620..5d28a88 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -20,7 +20,7 @@ class apache::params { $user = 'www-data' $group = 'www-data' - $ssl = 'true' + $ssl = true $template = 'apache/vhost-default.conf.erb' $priority = '25' $servername = '' @@ -30,7 +30,7 @@ class apache::params { $options = 'Indexes FollowSymLinks MultiViews' $vhost_name = '*' - case $operatingsystem { + case $::operatingsystem { 'centos', 'redhat', 'fedora', 'scientific': { $apache_name = 'httpd' $php_package = 'php' diff --git a/manifests/ssl.pp b/manifests/ssl.pp index 82035fe..4787f98 100644 --- a/manifests/ssl.pp +++ b/manifests/ssl.pp @@ -16,7 +16,7 @@ class apache::ssl { include apache - case $operatingsystem { + case $::operatingsystem { 'centos', 'fedora', 'redhat', 'scientific': { package { "apache_ssl_package": name => "$apache::params::ssl_package", diff --git a/manifests/vhost.pp b/manifests/vhost.pp index dbe3d3d..d883400 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -57,7 +57,7 @@ define apache::vhost( # Since the template will use auth, redirect to https requires mod_rewrite if $redirect_ssl == true { - case $operatingsystem { + case $::operatingsystem { 'debian','ubuntu': { A2mod <| title == 'rewrite' |> }