Commit 2e6c7bf5 authored by Raphaël Pinson's avatar Raphaël Pinson
Browse files

Use ensure=file for files

parent 1c595c74

manifests/files.pp

+4 −4
Original line number Diff line number Diff line
@@ -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',

manifests/ldap.pp

+3 −3
Original line number Diff line number Diff line
@@ -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'],

  }

manifests/mailman.pp

+2 −2
Original line number Diff line number Diff line
@@ -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',

  }



}

manifests/mta.pp

+2 −2
Original line number Diff line number Diff line
@@ -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',

  }



}

manifests/satellite.pp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class postfix::satellite ( 
  }



  postfix::virtual { "@${postfix::myorigin}":

    ensure      => present,

    ensure      => 'present',

    destination => 'root',

  }

}