opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed various puppet-lint warnings and fixed a typo

Browse source
This commit is contained in:
Maarten Dirkse 2013-06-13 18:44:15 +02:00
parent 96af4c84af
commit 7714251f67
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/init.pp
View file

@ -40,7 +40,7 @@ class nginx (
$proxy_cache_max_size = $nginx::params::nx_proxy_cache_max_size, $proxy_cache_max_size = $nginx::params::nx_proxy_cache_max_size,
$proxy_cache_inactive = $nginx::params::nx_proxy_cache_inactive, $proxy_cache_inactive = $nginx::params::nx_proxy_cache_inactive,
$configtest_enable = $nginx::params::nx_configtest_enable, $configtest_enable = $nginx::params::nx_configtest_enable,
$service_restart = $nginx::params::nx_service_restrart, $service_restart = $nginx::params::nx_service_restart,
$mail = $nginx::params::nx_mail, $mail = $nginx::params::nx_mail,
$server_tokens = $nginx::params::nx_server_tokens $server_tokens = $nginx::params::nx_server_tokens
) inherits nginx::params { ) inherits nginx::params {

4
manifests/package/debian.pp
View file

@ -17,7 +17,7 @@ class nginx::package::debian {
$operatingsystem_lowercase = inline_template('<%= operatingsystem.downcase %>') $operatingsystem_lowercase = inline_template('<%= operatingsystem.downcase %>')
package { 'nginx': package { 'nginx':
ensure => present, ensure => present,
require => Anchor['nginx::apt_repo'], require => Anchor['nginx::apt_repo'],
} }
@ -34,7 +34,7 @@ class nginx::package::debian {
} }
exec { 'add_nginx_apt_key': exec { 'add_nginx_apt_key':
command => "/usr/bin/wget http://nginx.org/keys/nginx_signing.key -O - | /usr/bin/apt-key add -", command => '/usr/bin/wget http://nginx.org/keys/nginx_signing.key -O - | /usr/bin/apt-key add -',
unless => '/usr/bin/apt-key list | /bin/grep -q nginx', unless => '/usr/bin/apt-key list | /bin/grep -q nginx',
before => Anchor['nginx::apt_repo'], before => Anchor['nginx::apt_repo'],
} }

10
manifests/resource/vhost.pp
View file

@ -42,7 +42,7 @@
# put after everything else inside vhost # put after everything else inside vhost
# [*rewrite_to_https*] - Adds a server directive and rewrite rule to # [*rewrite_to_https*] - Adds a server directive and rewrite rule to
# rewrite to ssl # rewrite to ssl
# [*include_files*] - Adds include files to vhost # [*include_files*] - Adds include files to vhost
# #
# Actions: # Actions:
# #
@ -84,14 +84,14 @@ define nginx::resource::vhost (
$server_name = [$name], $server_name = [$name],
$www_root = undef, $www_root = undef,
$rewrite_www_to_non_www = false, $rewrite_www_to_non_www = false,
$rewrite_to_https = undef, $rewrite_to_https = undef,
$location_cfg_prepend = undef, $location_cfg_prepend = undef,
$location_cfg_append = undef, $location_cfg_append = undef,
$try_files = undef, $try_files = undef,
$auth_basic = undef, $auth_basic = undef,
$auth_basic_user_file = undef, $auth_basic_user_file = undef,
$vhost_cfg_append = undef, $vhost_cfg_append = undef,
$include_files = undef $include_files = undef
) { ) {
File { File {
@ -173,7 +173,7 @@ define nginx::resource::vhost (
# Create SSL File Stubs if SSL is enabled # Create SSL File Stubs if SSL is enabled
if ($ssl == true) { if ($ssl == true) {
file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-700-ssl": file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-700-ssl":
ensure => $ensure ? { ensure => $ensure ? {
'absent' => absent, 'absent' => absent,
default => 'file', default => 'file',
}, },
@ -181,7 +181,7 @@ define nginx::resource::vhost (
notify => Class['nginx::service'], notify => Class['nginx::service'],
} }
file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-999-ssl": file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-999-ssl":
ensure => $ensure ? { ensure => $ensure ? {
'absent' => absent, 'absent' => absent,
default => 'file', default => 'file',
}, },