Mercurial > repos > other > Puppet

diff modules/dovecot/manifests/init.pp @ 480:2c3e745be8d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update server defs and own modules to match * $osver and $fqdn and others are now all in $facts * Firewall swapped action for jump and has new way to do IPv6 * SSH server setup changed * Resolve warnings from fileserver.conf * has_key() no longer exists because Puppet can do "key in array" * Some variables are now more strictly typed Also: * Try to configure full IPv6 DNS resolver * Clean up old config - unused servers and some CentOS complexity
author IBBoard <dev@ibboard.co.uk>
date Thu, 29 Aug 2024 18:58:49 +0100
parents 21f6add30502
children
line wrap: on
line diff
--- a/modules/dovecot/manifests/init.pp	Thu Aug 29 18:48:03 2024 +0100
+++ b/modules/dovecot/manifests/init.pp	Thu Aug 29 18:58:49 2024 +0100
@@ -4,10 +4,10 @@
 	$imapserver_proxy = undef,
 	$proxy_upstream = [],
 	) {
-	if $osfamily == 'RedHat' {
+	if $facts["os"]["family"] == 'RedHat' {
 		$dovecot_package = 'dovecot'
 	}
-	elsif $osfamily == 'Debian' {
+	elsif $facts["os"]["family"] == 'Debian' {
 		$dovecot_package = 'dovecot-imapd'
 	}
 	
@@ -79,7 +79,7 @@
 		destination => $imapserver_ip,
 		dport => 993,
 		proto => tcp,
-		action => accept,
+		jump => accept,
 	}
 	if $imapserver_proxy != undef {
 		$proxy_upstream.each |Stdlib::IP::Address::V6 $upstream_addr| {
@@ -88,7 +88,7 @@
 				destination => $imapserver_proxy,
 				dport => 993,
 				proto => tcp,
-				action => accept,
+				jump => accept,
 			}
 		}
 	}