From f55e4e54ee093b0561815e8062b1454a0bd3a32e Mon Sep 17 00:00:00 2001 From: Jesse Hathaway Date: Mon, 5 Dec 2022 12:10:57 -0600 Subject: [PATCH] Debian: don't install augeas lens for unix-dgram Debian Bullseye's package already has patched support for unix-dgram. --- manifests/config.pp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index cb440a7..4dd9458 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -20,10 +20,14 @@ mode => '0644', } - # Augeas 1.12.0 has a lens that doesn't recognise unix-dgram in master.cf - augeas::lens { 'postfix_master': - lens_content => file("${module_name}/postfix_master.aug"), - stock_since => '1.12.1', + # Augeas 1.12.0 has a lens that doesn't recognise unix-dgram in master.cf, however Debian's + # package has patched in support. + if ! ($facts['os']['family'] == 'Debian' and Integer($facts['os']['release']['major']) >= 11) { + augeas::lens { 'postfix_master': + lens_content => file("${module_name}/postfix_master.aug"), + stock_since => '1.12.1', + before => [Postfix_master, Resources['postfix_master']], + } } Postfix_main { @@ -32,7 +36,6 @@ Postfix_master { target => $master_cf, - require => Augeas::Lens['postfix_master'], } resources { 'postfix_main': @@ -41,7 +44,6 @@ resources { 'postfix_master': purge => true, - require => Augeas::Lens['postfix_master'], } $config = delete_undef_values({