Changes for puppet 4 compatibility

diff --git a/manifests/amavisd.pp b/manifests/amavisd.pp
index 12accfa679737d80be1af43bc0b1b1f53cf7fbe4..d726e00eb75f37fddb411b5638f0cd725003e0f0 100644 (file)
--- a/manifests/amavisd.pp
+++ b/manifests/amavisd.pp
@@ -9,7 +9,7 @@ class mail::amavisd {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => "puppet:///modules/mail/amavisd/05-domain_id",
     notify => Service['amavis'],
   }
@@ -18,7 +18,7 @@ class mail::amavisd {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => "puppet:///modules/mail/amavisd/15-content_filter_mode",
     notify => Service['amavis'],
   }
@@ -27,7 +27,7 @@ class mail::amavisd {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => "puppet:///modules/mail/amavisd/20-debian_defaults",
     notify => Service['amavis'],
   }
@@ -36,7 +36,7 @@ class mail::amavisd {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => "puppet:///modules/mail/amavisd/50-user",
     notify => Service['amavis'],
   }
@@ -48,7 +48,7 @@ class mail::amavisd {
         ensure  => present,
         owner   => root,
         group   => root,
-        mode    => 0644,
+        mode    => '0644',
         content => template('mail/amavisd/05-node_id.erb'),
         notify  => Service['amavis'],
       }

diff --git a/manifests/dovecot.pp b/manifests/dovecot.pp
index ac22bfb13c8a4d361644303975a111d732acccc0..d76ae79f507a4b4e988f3e6c967981da606d0e9d 100644 (file)
--- a/manifests/dovecot.pp
+++ b/manifests/dovecot.pp
@@ -10,7 +10,7 @@ class mail::dovecot {
     ensure  => present,
     owner   => root,
     group   => vmail,
-    mode    => 0644,
+    mode    => '0644',
     content => template("mail/dovecot/dovecot.conf.${::lsbdistcodename}.erb"),
     notify  => Service['dovecot'],
   }
@@ -19,7 +19,7 @@ class mail::dovecot {
     ensure  => present,
     owner   => root,
     group   => root,
-    mode    => 0600,
+    mode    => '0600',
     content => template('mail/dovecot/dovecot-sql.conf.erb'),
     notify  => Service['dovecot'],
   }

diff --git a/manifests/firma.pp b/manifests/firma.pp
index 095143b1912931822e064ea0d344a3be95a1bbf4..81f6ae76896a17a01b04f477ff5efe4f8d08bd81 100644 (file)
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -48,7 +48,7 @@ class mail::firma(
     ensure => present,
     owner   => firma,
     group   => firma,
-    mode    => 0600,
+    mode    => '0600',
     require => Vcsrepo['/var/lib/firma'],
     source => "puppet:///modules/mail/firma/firma.conf",
   }

diff --git a/manifests/gpg_mailgate.pp b/manifests/gpg_mailgate.pp
index 44770a9c5a3f77bf6b4654eb4a285cd4745fd250..f307fbccde8cdab1deb5289270325a939af46ddf 100644 (file)
--- a/manifests/gpg_mailgate.pp
+++ b/manifests/gpg_mailgate.pp
@@ -33,7 +33,7 @@ class mail::gpg_mailgate {
     ensure => present,
     owner   => gpg_mailgate,
     group   => gpg_mailgate,
-    mode    => 0600,
+    mode    => '0600',
     require => Vcsrepo['/var/lib/gpg_mailgate'],
     source  => [ "puppet:///modules/site_mail/gpg_mailgate/gpg-mailgate.conf",
                  "puppet:///modules/mail/gpg_mailgate/gpg-mailgate.conf" ],

diff --git a/manifests/hidden.pp b/manifests/hidden.pp
index 65504bfc44aeea2224897500861eb817e140db70..08ca3e2e454318f781728b4d3a7e1c48672878be 100644 (file)
--- a/manifests/hidden.pp
+++ b/manifests/hidden.pp
@@ -10,7 +10,7 @@ class mail::hidden {
       ensure => directory, 
       owner  => 'debian-tor',
       group  => 'debian-tor',
-      mode   => 0700,
+      mode   => '0700',
     }
   }
 

diff --git a/manifests/mlmmj.pp b/manifests/mlmmj.pp
index dc1d4f0b69b3a8c412f5776b4dbc4b3e3e9994ab..198595b16d7b997967071294ca37868355dc9505 100644 (file)
--- a/manifests/mlmmj.pp
+++ b/manifests/mlmmj.pp
@@ -24,7 +24,7 @@ class mail::mlmmj(
     ensure  => directory,
     owner   => mlmmj,
     group   => mlmmj,
-    mode    => 0750,
+    mode    => '0750',
     require => User['mlmmj'],
   }
 

diff --git a/manifests/mlmmj/web.pp b/manifests/mlmmj/web.pp
index 473bb8c803cb51bc7eb3b6e5254a2ec8ce25ed29..1a3a328a824eb13c30cde773cc27ebd5f6fb106b 100644 (file)
--- a/manifests/mlmmj/web.pp
+++ b/manifests/mlmmj/web.pp
@@ -17,14 +17,14 @@ class mail::mlmmj::web inherits websites::setup {
     ensure => directory,
     owner  => mlmmj,
     group  => mlmmj,
-    mode   => 0640,
+    mode   => '0640',
   }
 
   file { '/etc/mlmmj-php-web-admin/htpasswd':
     ensure  => present,
     owner   => mlmmj,
     group   => mlmmj,
-    mode    => 0640,
+    mode    => '0640',
     content => hiera('mail::mlmmj::web::htpasswd', ''),
   }
 }

diff --git a/manifests/opendkim.pp b/manifests/opendkim.pp
index 14b47a7245dfbe0b916787f5f019088cb95a3e65..99e2295657860fb0bd1924ab0ca4810b3eb829d1 100644 (file)
--- a/manifests/opendkim.pp
+++ b/manifests/opendkim.pp
@@ -6,7 +6,7 @@ class mail::opendkim {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => "puppet:///modules/mail/opendkim/default",
     require => Package['opendkim'],
     notify  => Service['opendkim'],
@@ -16,7 +16,7 @@ class mail::opendkim {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => [ "puppet:///modules/site_mail/opendkim/opendkim.conf",
                 "puppet:///modules/mail/opendkim/opendkim.conf" ],
     require => Package['opendkim'],
@@ -27,7 +27,7 @@ class mail::opendkim {
     ensure => directory,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     require => Package['opendkim'],
   }
 
@@ -35,7 +35,7 @@ class mail::opendkim {
     ensure => directory,
     owner  => opendkim,
     group  => opendkim,
-    mode   => 0750,
+    mode   => '0750',
     require => File['/etc/opendkim'],
   }
 
@@ -43,7 +43,7 @@ class mail::opendkim {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => [ "puppet:///modules/site_mail/opendkim/TrustedHosts",
                 "puppet:///modules/mail/opendkim/TrustedHosts" ],
     require => File['/etc/opendkim'],
@@ -54,7 +54,7 @@ class mail::opendkim {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => [ "puppet:///modules/site_mail/opendkim/KeyTable",
                 "puppet:///modules/mail/opendkim/KeyTable" ],
     require => File['/etc/opendkim'],
@@ -65,7 +65,7 @@ class mail::opendkim {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => [ "puppet:///modules/site_mail/opendkim/SigningTable",
                 "puppet:///modules/mail/opendkim/SigningTable" ],
     require => File['/etc/opendkim'],

diff --git a/manifests/spamassassin.pp b/manifests/spamassassin.pp
index 12d1e19afa87d978c152af6f7d2dfc2aabb2cc28..ea035679a40a03d13225d4a57221b6a0a7c52529 100644 (file)
--- a/manifests/spamassassin.pp
+++ b/manifests/spamassassin.pp
@@ -3,7 +3,7 @@ class mail::spamassassin {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => "puppet:///modules/mail/spamassassin/default",
     require => Package['spamassassin'],
   }
@@ -19,7 +19,7 @@ class mail::spamassassin {
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => "puppet:///modules/mail/spamassassin/awl.pre",
     require => Package['spamassassin'],
   }

diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index 6ddf0dc22e0597a87f474eaa280ba642b56202a1..f8cf491d0f35dae24ab23ad1af0fa8844f4deda6 100644 (file)
--- a/manifests/sympa.pp
+++ b/manifests/sympa.pp
@@ -55,14 +55,14 @@ class mail::sympa(
     ensure => directory,
     owner  => postfix,
     group  => root,
-    mode   => 0755,
+    mode   => '0755',
   }
 
   file { "/etc/sympa/sympa.conf":
     ensure  => present,
     owner   => sympa,
     group   => sympa,
-    mode    => 0640,
+    mode    => '0640',
     content => template("mail/sympa/sympa.conf.${::lsbdistcodename}.erb"),
     require => [ File['/etc/sympa'], User['sympa'] ],
     notify  => Service['apache', 'sympa'],
@@ -72,7 +72,7 @@ class mail::sympa(
     ensure => present,
     owner  => sympa,
     group  => sympa,
-    mode   => 0640,
+    mode   => '0640',
     source => "puppet:///modules/mail/sympa/wwsympa.conf",
     notify => Service['apache', 'sympa'],
   }
@@ -81,14 +81,14 @@ class mail::sympa(
     ensure => directory,
     owner  => root,
     group  => root,
-    mode   => 0755,
+    mode   => '0755',
   }
 
   file { "/etc/dbconfig-common/sympa.conf":
     ensure  => present,
     owner   => root,
     group   => root,
-    mode    => 0600,
+    mode    => '0600',
     content => template("mail/sympa/dbconfig-common.${::lsbdistcodename}.erb"),
     require => File['/etc/dbconfig-common'],
   }
@@ -97,7 +97,7 @@ class mail::sympa(
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => "puppet:///modules/mail/sympa/logrotate",
   }
 

diff --git a/manifests/sympa/web.pp b/manifests/sympa/web.pp
index a174e62df76c9b772ef930fec2472c772a048de4..ebbfa6415d33342d3be88cd859d73861283d2f3f 100644 (file)
--- a/manifests/sympa/web.pp
+++ b/manifests/sympa/web.pp
@@ -25,7 +25,7 @@ class mail::sympa::web inherits websites::setup {
     ensure  => present,
     owner   => sympa,
     group   => sympa,
-    mode    => 0550,
+    mode    => '0550',
     content => "#!/bin/sh\n/usr/lib/cgi-bin/sympa/wwsympa.fcgi\n",
     require => File["${apache::www_folder}/${sympa::subdomain}"],
   }

diff --git a/manifests/virtual.pp b/manifests/virtual.pp
index b212d58d0656eb791ff1559b53289373fcd8e780..0a1d12cf07244e4d399d9bc2e381be9bd20a3a03 100644 (file)
--- a/manifests/virtual.pp
+++ b/manifests/virtual.pp
@@ -22,7 +22,7 @@ class mail::virtual(
     ensure  => directory,
     owner   => vmail,
     group   => vmail,
-    mode    => 0750,
+    mode    => '0750',
     require => User['vmail'],
   }
 

diff --git a/manifests/virtual/database.pp b/manifests/virtual/database.pp
index c2589b29a501b319a0fbbe83b6dff527e5711469..9b5de64c33bbb2c0d0f67ec6da2bee550340b942 100644 (file)
--- a/manifests/virtual/database.pp
+++ b/manifests/virtual/database.pp
@@ -41,13 +41,13 @@ class mail::virtual::database {
     ensure => directory,
     owner  => postfix,
     group  => root,
-    mode   => 0755,
+    mode   => '0755',
   }
 
   file { "/etc/postfix/sql/mysql_virtual_domains_maps.cf":
     ensure  => present,
     owner   => postfix,
-    mode    => 0600,
+    mode    => '0600',
     content => template('mail/virtual/database/mysql_virtual_domains_maps.cf.erb'),
     require => File['/etc/postfix/sql'],
   }
@@ -55,7 +55,7 @@ class mail::virtual::database {
   file { "/etc/postfix/sql/mysql_virtual_alias_maps.cf":
     ensure  => present,
     owner   => postfix,
-    mode    => 0600,
+    mode    => '0600',
     content => template('mail/virtual/database/mysql_virtual_alias_maps.cf.erb'),
     require => File['/etc/postfix/sql'],
   }
@@ -63,7 +63,7 @@ class mail::virtual::database {
   file { "/etc/postfix/sql/mysql_virtual_alias_domain_maps.cf":
     ensure  => present,
     owner   => postfix,
-    mode    => 0600,
+    mode    => '0600',
     content => template('mail/virtual/database/mysql_virtual_alias_domain_maps.cf.erb'),
     require => File['/etc/postfix/sql'],
   }
@@ -71,7 +71,7 @@ class mail::virtual::database {
   file { "/etc/postfix/sql/mysql_virtual_alias_domain_catchall_maps.cf":
     ensure  => present,
     owner   => postfix,
-    mode    => 0600,
+    mode    => '0600',
     content => template('mail/virtual/database/mysql_virtual_alias_domain_catchall_maps.cf.erb'),
     require => File['/etc/postfix/sql'],
   }
@@ -79,7 +79,7 @@ class mail::virtual::database {
   file { "/etc/postfix/sql/mysql_virtual_mailbox_maps.cf":
     ensure  => present,
     owner   => postfix,
-    mode    => 0600,
+    mode    => '0600',
     content => template('mail/virtual/database/mysql_virtual_mailbox_maps.cf.erb'),
     require => File['/etc/postfix/sql'],
   }
@@ -87,7 +87,7 @@ class mail::virtual::database {
   file { "/etc/postfix/sql/mysql_virtual_alias_domain_mailbox_maps.cf":
     ensure  => present,
     owner   => postfix,
-    mode    => 0600,
+    mode    => '0600',
     content => template('mail/virtual/database/mysql_virtual_alias_domain_mailbox_maps.cf.erb'),
     require => File['/etc/postfix/sql'],
   }
@@ -109,7 +109,7 @@ class mail::virtual::database {
   #file { "/etc/postfix/mysql_virtual_mailbox_limit_maps.cf":
   #  ensure  => present,
   #  owner   => postfix,
-  #  mode    => 0600,
+  #  mode    => '0600',
   #  content => template('mail/virtual/database/mysql_virtual_mailbox_limit_maps.cf.erb'),
   #  require => File['/etc/postfix/sql'],
   #}

diff --git a/manifests/virtual/web/admin.pp b/manifests/virtual/web/admin.pp
index d6b8422db0ab4a7c13f5288c4e74b9f1eba1972c..262976969ce802e31821cddcc133a6e97737277e 100644 (file)
--- a/manifests/virtual/web/admin.pp
+++ b/manifests/virtual/web/admin.pp
@@ -20,7 +20,7 @@ class mail::virtual::web::admin(
     ensure  => present,
     owner   => www-data,
     group   => root,
-    mode    => 0640,
+    mode    => '0640',
     content => template('mail/virtual/postfixadmin/config.inc.php.erb'),
     #require => File["${apache::sites_folder}/postfixadmin/site"],
     require => Package['postfixadmin'],

diff --git a/manifests/virtual/web/client.pp b/manifests/virtual/web/client.pp
index 88c9a2877356ee5994b556a5899ce63756146a72..bfea6cc4ae04ca9ef96d493957591206670b6eb3 100644 (file)
--- a/manifests/virtual/web/client.pp
+++ b/manifests/virtual/web/client.pp
@@ -29,7 +29,7 @@ class mail::virtual::web::client(
     ensure => absent,
     owner   => root,
     group   => www-data,
-    mode    => 0640,
+    mode    => '0640',
     require => Package['roundcube'],
   }
 
@@ -40,7 +40,7 @@ class mail::virtual::web::client(
     },
     owner   => root,
     group   => www-data,
-    mode    => 0640,
+    mode    => '0640',
     content => template('mail/virtual/roundcube/config.inc.php.erb'),
     require => Package['roundcube'],
   }
@@ -53,7 +53,7 @@ class mail::virtual::web::client(
     recurse => true,
     owner   => root,
     group   => root,
-    mode    => 0644,
+    mode    => '0644',
     source  => "puppet:///modules/mail/roundcube/plugins/login_info",
     require => Package['roundcube'],
   }