From 6310349e2ed11c1bb9b841850a240bb4c19333d9 Mon Sep 17 00:00:00 2001 From: cruelsmith <92088441+cruelsmith@users.noreply.github.com> Date: Sun, 16 Jun 2024 01:11:08 +0200 Subject: [PATCH] Enclose literal IP address in square brackets for socket --- README.md | 11 ++++------- manifests/init.pp | 2 +- templates/sysconfig/opendkim.epp | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 9d78fa4..2258c37 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ Warning : this package will replace all your RSA keys ! Before using it, be sure A basic example is as follows: ```puppet - class { '::opendkim': - socket => 'inet:8891@127.0.0.1', + class { 'opendkim': + socket => 'inet:8891@[127.0.0.1]', trusted_hosts => ['::1','127.0.0.1','localhost'], keys => [ { @@ -53,13 +53,12 @@ A basic example is as follows: You can also use natively Hiera : - ```puppet - include ::opendkim + include opendkim ``` ```yaml -opendkim::socket: 'inet:8891@127.0.0.1' +opendkim::socket: 'inet:8891@[127.0.0.1]' opendkim::trusted_hosts: - '::1' - '127.0.0.1' @@ -82,7 +81,6 @@ opendkim::keys: If you want to use OpenDKIM though a UNIX socket with postfix for example, you should configure the socket like this : - ```yaml opendkim::socket: 'local:/var/run/opendkim/opendkim.sock' opendkim::umask: '0111' @@ -185,4 +183,3 @@ You are pleased to fork this module and adapt it for you needs. I am open to any * v0.0.3 Improve some documentation parts * v0.0.2 Improve some documentation parts * v0.0.1 First Running version - diff --git a/manifests/init.pp b/manifests/init.pp index 35c2762..d4d8617 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -119,7 +119,7 @@ Variant[Boolean,Enum['yes','no']] $log_why = 'no', Variant[Boolean,Enum['yes','no']] $subdomains = 'yes', - String $socket = 'inet:8891@127.0.0.1', + String $socket = 'inet:8891@[127.0.0.1]', Pattern[/\A[0-7]{3,4}\z/] $umask = '0022', Array[Stdlib::IP::Address] $nameservers = [], Pattern[/\A[sv]{1,2}\z/] $mode = 'sv', diff --git a/templates/sysconfig/opendkim.epp b/templates/sysconfig/opendkim.epp index 2c3abde..306a28e 100755 --- a/templates/sysconfig/opendkim.epp +++ b/templates/sysconfig/opendkim.epp @@ -24,7 +24,7 @@ #SOCKET="inet:8891@localhost" # listen on 192.0.2.1 on port 12345 -#SOCKET="inet:12345@192.0.2.1" +#SOCKET="inet:12345@[192.0.2.1]" SOCKET="<%= $socket %>"