Changes for puppet 4 compatibility

diff --git a/manifests/envvars.pp b/manifests/envvars.pp
index fb60d6903557ec7c8416fcd266858b0dca42d6e5..f2d2b8b67ce947504dc118b99f702882ba6398c3 100644 (file)
--- a/manifests/envvars.pp
+++ b/manifests/envvars.pp
@@ -5,7 +5,7 @@ class apache::envvars(
     ensure  => present,
     owner   => root,
     group   => root,
-    mode    => 0644,
+    mode    => '0644',
     notify  => Service["apache"],
     source  => $source,
     require => Package['apache'],

diff --git a/manifests/init.pp b/manifests/init.pp
index 96f6f08c112f4ed4bde9caeb324e544cacb81ee0..bd1c6399f2f2e2365cc19a1e172003fae5b462b6 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -66,7 +66,7 @@ class apache(
     ensure  => directory,
     owner   => root,
     group   => root,
-    mode    => 0755,
+    mode    => '0755',
     require => Package["apache"],
   }
 
@@ -135,7 +135,7 @@ class apache(
     content => template('apache/macros.erb'),
     owner   => root,
     group   => root,
-    mode    => 0644,
+    mode    => '0644',
     require => Module["macro"],
     notify  => Service["apache"],
   }
@@ -146,7 +146,7 @@ class apache(
     content => template("apache/apache2.conf.${::lsbdistcodename}.erb"),
     owner   => root,
     group   => root,
-    mode    => 0644,
+    mode    => '0644',
     notify  => Service["apache"],
   }
 
@@ -156,7 +156,7 @@ class apache(
     content => template('apache/alias.conf.erb'),
     owner   => root,
     group   => root,
-    mode    => 0644,
+    mode    => '0644',
     notify  => Service["apache"],
   }
 
@@ -166,7 +166,7 @@ class apache(
     content => template('apache/autoindex.conf.erb'),
     owner   => root,
     group   => root,
-    mode    => 0644,
+    mode    => '0644',
     notify  => Service["apache"],
   }
 
@@ -174,7 +174,7 @@ class apache(
     ensure  => directory,
     owner   => "root",
     group   => "root",
-    mode    => 0755,
+    mode    => '0755',
   }
 
   # icons folder
@@ -189,7 +189,7 @@ class apache(
     owner   => "root",
     group   => "root",
     # This mode will also apply to files from the source directory
-    mode    => 0644,
+    mode    => '0644',
     # Puppet will automatically set +x for directories
     source  => [ "puppet:///modules/site_apache/htdocs/$domain/icons",
                  "puppet:///modules/apache/icons", ],
@@ -208,7 +208,7 @@ class apache(
     content => template('apache/default.erb'),
     owner   => root,
     group   => root,
-    mode    => 0644,
+    mode    => '0644',
     notify  => Service["apache"],
   }
 
@@ -232,7 +232,7 @@ class apache(
     },
     owner   => root,
     group   => root,
-    mode    => 0644,
+    mode    => '0644',
     notify  => Service["apache"],
   }
 
@@ -247,7 +247,7 @@ class apache(
     content => "RequestHeader set REMOTE_ADDR ${remote_addr}\n",
     owner   => root,
     group   => root,
-    mode    => 0644,
+    mode    => '0644',
     notify  => Service["apache"],
   }
 

diff --git a/manifests/site/config.pp b/manifests/site/config.pp
index 6e6829f93d6367b239e079576339c4b5365d7bf9..5ad91af8d70819750c50372a44e2f22341160239 100644 (file)
--- a/manifests/site/config.pp
+++ b/manifests/site/config.pp
@@ -31,7 +31,7 @@ define apache::site::config(
                             "puppet:///modules/site_apache/vhosts/${name}" ],
                owner   => root,
                group   => root,
-               mode    => 0644,
+               mode    => '0644',
                require => File["${apache::macros}"],
                notify  => Service["apache"],
              }
@@ -42,7 +42,7 @@ define apache::site::config(
                content => template("$template"),
                owner   => root,
                group   => root,
-               mode    => 0644,
+               mode    => '0644',
                require => File["${apache::macros}"],
                notify  => Service["apache"],
              }

diff --git a/manifests/site/manage.pp b/manifests/site/manage.pp
index c04bec3eb33835f6593d07cf5c663e29edb39681..36e99345bda5bac4183515eed383316d9de6fee4 100644 (file)
--- a/manifests/site/manage.pp
+++ b/manifests/site/manage.pp
@@ -14,7 +14,7 @@ define apache::site::manage(
             ensure  => present,
             owner   => $owner,
             group   => $group,
-            mode    => 0755,
+            mode    => '0755',
             recurse => false,
           }
         }