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.

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 2dcdccfee4647e161098411aa986b4a8497851ca..e280593dead2cc51b0665a593cb218b50f399f2d 100644 (file)
--- 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 ecb13d9889f47dbc29ea2f909a9af901b43d3858..2974195d044489c927c8c8e39e083f6f09e9c386 100644 (file)
--- 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 8c1dd1cfb4bca0c57edcf7b64df37c17732ed79f..f988e55a7682832da5453a116316564c7d91d20f 100644 (file)
--- 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 0a8aa9300affa19201378e0a1735265f190ad2f9..db29fe687a26de14f7290fd53f54e678d91b85be 100644 (file)
--- 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',
   }