From 810231ead207dfefda722c8589afc8e3b4314402 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 5 Jun 2017 19:06:30 -0300 Subject: Changes for puppet 4 compatibility --- manifests/amavisd.pp | 10 +++++----- manifests/dovecot.pp | 4 ++-- manifests/firma.pp | 2 +- manifests/gpg_mailgate.pp | 2 +- manifests/hidden.pp | 2 +- manifests/mlmmj.pp | 2 +- manifests/mlmmj/web.pp | 4 ++-- manifests/opendkim.pp | 14 +++++++------- manifests/spamassassin.pp | 4 ++-- manifests/sympa.pp | 12 ++++++------ manifests/sympa/web.pp | 2 +- manifests/virtual.pp | 2 +- manifests/virtual/database.pp | 16 ++++++++-------- manifests/virtual/web/admin.pp | 2 +- manifests/virtual/web/client.pp | 6 +++--- 15 files changed, 42 insertions(+), 42 deletions(-) diff --git a/manifests/amavisd.pp b/manifests/amavisd.pp index 12accfa..d726e00 100644 --- 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 ac22bfb..d76ae79 100644 --- 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 095143b..81f6ae7 100644 --- 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 44770a9..f307fbc 100644 --- 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 65504bf..08ca3e2 100644 --- 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 dc1d4f0..198595b 100644 --- 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 473bb8c..1a3a328 100644 --- 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 14b47a7..99e2295 100644 --- 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 12d1e19..ea03567 100644 --- 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 6ddf0dc..f8cf491 100644 --- 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 a174e62..ebbfa64 100644 --- 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 b212d58..0a1d12c 100644 --- 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 c2589b2..9b5de64 100644 --- 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 d6b8422..2629769 100644 --- 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 88c9a28..bfea6cc 100644 --- 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'], } -- cgit v1.2.3