From 2e6c7bf5db49cdf842506c0f84109b0153f4620e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Wed, 24 Jul 2013 18:03:58 +0200
Subject: [PATCH] Use ensure=file for files
---
manifests/files.pp | 8 ++++----
manifests/ldap.pp | 6 +++---
manifests/mailman.pp | 4 ++--
manifests/mta.pp | 4 ++--
manifests/satellite.pp | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/manifests/files.pp b/manifests/files.pp
index dc33f97..1679c86 100644
--- a/manifests/files.pp
+++ b/manifests/files.pp
@@ -16,14 +16,14 @@ class postfix::files {
$use_sympa = $postfix::use_sympa
file { '/etc/mailname':
- ensure => present,
+ ensure => 'file',
content => "${::fqdn}\n",
seltype => $postfix::params::seltype,
}
# Aliases
file { '/etc/aliases':
- ensure => present,
+ ensure => 'file',
content => "# file managed by puppet\n",
notify => Exec['newaliases'],
replace => false,
@@ -48,7 +48,7 @@ class postfix::files {
}
file { '/etc/postfix/master.cf':
- ensure => present,
+ ensure => 'file',
content => $mastercf_content,
group => 'root',
mode => '0644',
@@ -59,7 +59,7 @@ class postfix::files {
# Config files
file { '/etc/postfix/main.cf':
- ensure => present,
+ ensure => 'file',
group => 'root',
mode => '0644',
owner => 'root',
diff --git a/manifests/ldap.pp b/manifests/ldap.pp
index 30ab30c..d6c40be 100644
--- a/manifests/ldap.pp
+++ b/manifests/ldap.pp
@@ -32,9 +32,9 @@ class postfix::ldap {
}
file {'/etc/postfix/ldap-aliases.cf':
- ensure => present,
- owner => root,
- group => postfix,
+ ensure => 'file',
+ owner => 'root',
+ group => 'postfix',
content => template('postfix/postfix-ldap-aliases.cf.erb'),
require => Package['postfix-ldap'],
}
diff --git a/manifests/mailman.pp b/manifests/mailman.pp
index 6d5e0d2..5d3f2dd 100644
--- a/manifests/mailman.pp
+++ b/manifests/mailman.pp
@@ -23,11 +23,11 @@ class postfix::mailman {
}
postfix::hash { '/etc/postfix/virtual':
- ensure => present,
+ ensure => 'present',
}
postfix::hash { '/etc/postfix/transport':
- ensure => present,
+ ensure => 'present',
}
}
diff --git a/manifests/mta.pp b/manifests/mta.pp
index 0d838c1..6a75d3a 100644
--- a/manifests/mta.pp
+++ b/manifests/mta.pp
@@ -45,11 +45,11 @@ class postfix::mta (
}
postfix::hash { '/etc/postfix/virtual':
- ensure => present,
+ ensure => 'present',
}
postfix::hash { '/etc/postfix/transport':
- ensure => present,
+ ensure => 'present',
}
}
diff --git a/manifests/satellite.pp b/manifests/satellite.pp
index 46589c0..92c6883 100644
--- a/manifests/satellite.pp
+++ b/manifests/satellite.pp
@@ -37,7 +37,7 @@ class postfix::satellite (
}
postfix::virtual { "@${postfix::myorigin}":
- ensure => present,
+ ensure => 'present',
destination => 'root',
}
}
--
GitLab