style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
This commit is contained in:
parent
273f94d321
commit
073964152d
@ -20,7 +20,7 @@ class apache::params {
|
|||||||
|
|
||||||
$user = 'www-data'
|
$user = 'www-data'
|
||||||
$group = 'www-data'
|
$group = 'www-data'
|
||||||
$ssl = 'true'
|
$ssl = true
|
||||||
$template = 'apache/vhost-default.conf.erb'
|
$template = 'apache/vhost-default.conf.erb'
|
||||||
$priority = '25'
|
$priority = '25'
|
||||||
$servername = ''
|
$servername = ''
|
||||||
@ -30,7 +30,7 @@ class apache::params {
|
|||||||
$options = 'Indexes FollowSymLinks MultiViews'
|
$options = 'Indexes FollowSymLinks MultiViews'
|
||||||
$vhost_name = '*'
|
$vhost_name = '*'
|
||||||
|
|
||||||
case $operatingsystem {
|
case $::operatingsystem {
|
||||||
'centos', 'redhat', 'fedora', 'scientific': {
|
'centos', 'redhat', 'fedora', 'scientific': {
|
||||||
$apache_name = 'httpd'
|
$apache_name = 'httpd'
|
||||||
$php_package = 'php'
|
$php_package = 'php'
|
||||||
|
@ -16,7 +16,7 @@ class apache::ssl {
|
|||||||
|
|
||||||
include apache
|
include apache
|
||||||
|
|
||||||
case $operatingsystem {
|
case $::operatingsystem {
|
||||||
'centos', 'fedora', 'redhat', 'scientific': {
|
'centos', 'fedora', 'redhat', 'scientific': {
|
||||||
package { "apache_ssl_package":
|
package { "apache_ssl_package":
|
||||||
name => "$apache::params::ssl_package",
|
name => "$apache::params::ssl_package",
|
||||||
|
@ -57,7 +57,7 @@ define apache::vhost(
|
|||||||
|
|
||||||
# Since the template will use auth, redirect to https requires mod_rewrite
|
# Since the template will use auth, redirect to https requires mod_rewrite
|
||||||
if $redirect_ssl == true {
|
if $redirect_ssl == true {
|
||||||
case $operatingsystem {
|
case $::operatingsystem {
|
||||||
'debian','ubuntu': {
|
'debian','ubuntu': {
|
||||||
A2mod <| title == 'rewrite' |>
|
A2mod <| title == 'rewrite' |>
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user