aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2012-11-11 22:46:25 +0100
committerintrigeri <intrigeri@boum.org>2012-11-11 22:46:25 +0100
commit6153fcd9fd2469ab3521843defd7d61d790bb6c5 (patch)
treed8506d7a52c504c15bbfac6b68eaa9b7702cea3f
parent1627732475fa126d8eb3cb437994df1f14f96766 (diff)
downloadpuppet-tor-6153fcd9fd2469ab3521843defd7d61d790bb6c5.tar.gz
puppet-tor-6153fcd9fd2469ab3521843defd7d61d790bb6c5.tar.bz2
Specify file modes as single-quoted strings.
Puppet style guide "9.6. File Modes" reads: In addition, file modes should be specified as single-quoted strings instead of bare word numbers.
-rw-r--r--manifests/daemon.pp34
-rw-r--r--manifests/munin.pp6
-rw-r--r--manifests/polipo/base.pp2
-rw-r--r--manifests/polipo/debian.pp2
4 files changed, 22 insertions, 22 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 2dcdccf..e280593 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -36,7 +36,7 @@ class tor::daemon (
# directories
file { "${data_dir}":
ensure => directory,
- mode => 0700,
+ mode => '0700',
owner => 'debian-tor',
group => 'debian-tor',
require => User['debian-tor'],
@@ -44,7 +44,7 @@ class tor::daemon (
file { '/etc/tor':
ensure => directory,
- mode => 0755,
+ mode => '0755',
owner => 'debian-tor',
group => 'debian-tor',
require => User['debian-tor'],
@@ -58,7 +58,7 @@ class tor::daemon (
# tor configuration file
concat { "${config_file}":
- mode => 0600,
+ mode => '0600',
owner => 'debian-tor', group => 'debian-tor',
}
@@ -66,7 +66,7 @@ class tor::daemon (
concat::fragment { '00.header':
ensure => present,
content => template('tor/torrc.header.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 00,
target => "${config_file}",
}
@@ -74,7 +74,7 @@ class tor::daemon (
# global configurations
concat::fragment { '01.global':
content => template('tor/torrc.global.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 01,
target => "${config_file}",
}
@@ -86,7 +86,7 @@ class tor::daemon (
concat::fragment { '02.socks':
content => template('tor/torrc.socks.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 02,
target => "${tor::daemon::config_file}",
}
@@ -118,7 +118,7 @@ class tor::daemon (
concat::fragment { '03.relay':
ensure => $ensure,
content => template('tor/torrc.relay.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 03,
target => "${tor::daemon::config_file}",
}
@@ -143,7 +143,7 @@ class tor::daemon (
concat::fragment { '04.control':
ensure => $ensure,
content => template('tor/torrc.control.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0600,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0600',
order => 04,
target => "${tor::daemon::config_file}",
}
@@ -157,7 +157,7 @@ class tor::daemon (
concat::fragment { "05.hidden_service.${name}":
ensure => $ensure,
content => template('tor/torrc.hidden_service.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 05,
target => "${tor::daemon::config_file}",
}
@@ -172,7 +172,7 @@ class tor::daemon (
concat::fragment { '06.directory':
ensure => $ensure,
content => template('tor/torrc.directory.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 06,
target => "${tor::daemon::config_file}",
}
@@ -181,7 +181,7 @@ class tor::daemon (
ensure => $ensure,
source => 'puppet:///modules/tor/tor.html',
require => File['/etc/tor'],
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
}
}
@@ -194,7 +194,7 @@ class tor::daemon (
concat::fragment { "07.exit_policy.${name}":
ensure => $ensure,
content => template('tor/torrc.exit_policy.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 07,
target => "${tor::daemon::config_file}",
}
@@ -208,7 +208,7 @@ class tor::daemon (
concat::fragment { "08.dns.${name}":
ensure => $ensure,
content => template('tor/torrc.dns.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 08,
target => "${tor::daemon::config_file}",
}
@@ -222,7 +222,7 @@ class tor::daemon (
concat::fragment { "09.transparent.${name}":
ensure => $ensure,
content => template('tor/torrc.transparent.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 09,
target => "${tor::daemon::config_file}",
}
@@ -237,7 +237,7 @@ class tor::daemon (
concat::fragment { "10.bridge.${name}":
ensure => $ensure,
content => template('tor/torrc.bridge.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 10,
target => "${tor::daemon::config_file}",
}
@@ -250,7 +250,7 @@ class tor::daemon (
concat::fragment { "08.map_address.${name}":
ensure => $ensure,
content => template('tor/torrc.map_address.erb'),
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 08,
target => "${tor::daemon::config_file}",
}
@@ -263,7 +263,7 @@ class tor::daemon (
concat::fragment { "99.snippet.${name}":
ensure => $ensure,
content => "${content}",
- owner => 'debian-tor', group => 'debian-tor', mode => 0644,
+ owner => 'debian-tor', group => 'debian-tor', mode => '0644',
order => 99,
target => "${tor::daemon::config_file}",
}
diff --git a/manifests/munin.pp b/manifests/munin.pp
index ecb13d9..2974195 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -3,15 +3,15 @@ class tor::munin {
file {
'/usr/local/share/munin-plugins/tor_connections':
source => 'puppet:///modules/tor/munin/tor_connections',
- mode => 0755, owner => root, group => root;
+ mode => '0755', owner => root, group => root;
'/usr/local/share/munin-plugins/tor_routers':
source => 'puppet:///modules/tor/munin/tor_routers',
- mode => 0755, owner => root, group => root;
+ mode => '0755', owner => root, group => root;
'/usr/local/share/munin-plugins/tor_traffic':
source => 'puppet:///modules/tor/munin/tor_traffic',
- mode => 0755, owner => root, group => root;
+ mode => '0755', owner => root, group => root;
}
munin::plugin {
diff --git a/manifests/polipo/base.pp b/manifests/polipo/base.pp
index 8c1dd1c..f988e55 100644
--- a/manifests/polipo/base.pp
+++ b/manifests/polipo/base.pp
@@ -7,7 +7,7 @@ class tor::polipo::base {
ensure => present,
owner => root,
group => root,
- mode => 0644,
+ mode => '0644',
source => 'puppet:///modules/tor/polipo/polipo.conf',
require => Package['polipo'],
notify => Service['polipo'],
diff --git a/manifests/polipo/debian.pp b/manifests/polipo/debian.pp
index 0a8aa93..db29fe6 100644
--- a/manifests/polipo/debian.pp
+++ b/manifests/polipo/debian.pp
@@ -5,7 +5,7 @@ class tor::polipo::debian inherits tor::polipo::base {
ensure => present,
owner => root,
group => root,
- mode => 0755,
+ mode => '0755',
require => Package['polipo'],
source => 'puppet:///modules/tor/polipo/polipo.cron',
}