Unverified Commit 3e09850a authored by Tim Meusel's avatar Tim Meusel Committed by GitHub
Browse files

Merge pull request #373 from ekohl/fix-canonical-type 

Remove camptocamp/augeas dependency
parents 76bad494 84a211ba

REFERENCE.md

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


#### Private Classes



* `postfix::augeas`: Provides augeas lenses for postfix files

* `postfix::files`: Manages the Postfix related files

* `postfix::ldap`: Provides the Postfix LDAP support

* `postfix::mailman`: Configure Postfix to work with mailman

manifests/augeas.pp

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
# @summary Provides augeas lenses for postfix files

#

# This class provides the augeas lenses used by the postfix class

#

# @api private

#

class postfix::augeas {

  assert_private()



  $module_path = get_module_path($module_name)

  augeas::lens { 'postfix_canonical':

    ensure       => present,

    lens_content => file("${module_path}/files/lenses/postfix_canonical.aug"),

    test_content => file("${module_path}/files/lenses/test_postfix_canonical.aug"),

  }

}

manifests/canonical.pp

+1 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ define postfix::canonical ( 
  String[1]                $lookup_table_suffix = 'db',

) {

  include postfix

  include postfix::augeas



  $_file = pick($file, "${postfix::confdir}/canonical")
@@ -66,7 +65,7 @@ define postfix::canonical ( 


  augeas { "Postfix canonical - ${name}":

    incl    => $_file,

    lens    => 'Postfix_Canonical.lns',

    lens    => 'postfix_canonical.lns',

    changes => $changes,

    require => Package['postfix'],

    notify  => Exec["generate ${_file}.${lookup_table_suffix}"],