Skip to content

Commit ffa5ad9

Browse files
authored
Merge pull request #1456 from bastelfreak/port
default ipv6_listen_port to listen_port
2 parents b2f8f15 + 958475d commit ffa5ad9

File tree

6 files changed

+12
-18
lines changed

6 files changed

+12
-18
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
setup_matrix:
77
name: 'Setup Test Matrix'
88
runs-on: ubuntu-latest
9-
timeout-minutes: 40
9+
timeout-minutes: 60
1010
outputs:
1111
beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }}
1212
puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
@@ -31,7 +31,7 @@ jobs:
3131
unit:
3232
needs: setup_matrix
3333
runs-on: ubuntu-latest
34-
timeout-minutes: 40
34+
timeout-minutes: 60
3535
strategy:
3636
fail-fast: false
3737
matrix:

.sync.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
---
2-
.travis.yml:
3-
secure: "SDpX6jzritODonEQBqy9g0NbOmk2a9dBfAtZLrvHwM8BTpM2W0Y1daqzIbpzxFiqlNX+6r2GSq9SV70N0A9Ko/uPV9aG/XZx7MsBR9DNVjgqjJSl7+aF88VJfRpOv4PAyTM33JMx91nLFxM/ql61YX+2DXGXrhUkBsMZcdBgQnk="
4-
docker_sets:
5-
- set: ubuntu1604-64
6-
- set: ubuntu1804-64
7-
- set: centos7-64
8-
- set: debian9-64
9-
- set: debian10-64
2+
.github/workflows/ci.yml:
3+
timeout_minutes: 60

manifests/resource/mailhost.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
Optional[String] $listen_options = undef,
133133
Boolean $ipv6_enable = false,
134134
Variant[Array[String], String] $ipv6_listen_ip = '::',
135-
Stdlib::Port $ipv6_listen_port = 80,
135+
Stdlib::Port $ipv6_listen_port = $listen_port,
136136
String $ipv6_listen_options = 'default ipv6only=on',
137137
Boolean $ssl = false,
138138
Optional[String] $ssl_cert = undef,

manifests/resource/server.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
define nginx::resource::server (
285285
Enum['absent', 'present'] $ensure = 'present',
286286
Variant[Array, String] $listen_ip = '*',
287-
Integer $listen_port = 80,
287+
Stdlib::Port $listen_port = 80,
288288
Optional[String] $listen_options = undef,
289289
Boolean $listen_unix_socket_enable = false,
290290
Variant[Array[Stdlib::Absolutepath], Stdlib::Absolutepath] $listen_unix_socket = '/var/run/nginx.sock',
@@ -294,7 +294,7 @@
294294
Array $location_deny = [],
295295
Boolean $ipv6_enable = false,
296296
Variant[Array, String] $ipv6_listen_ip = '::',
297-
Integer $ipv6_listen_port = 80,
297+
Stdlib::Port $ipv6_listen_port = $listen_port,
298298
String $ipv6_listen_options = 'default ipv6only=on',
299299
Hash $add_header = {},
300300
Boolean $ssl = false,

manifests/resource/streamhost.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
Optional[String] $listen_options = undef,
5757
Boolean $ipv6_enable = false,
5858
Variant[Array, String] $ipv6_listen_ip = '::',
59-
Integer $ipv6_listen_port = 80,
59+
Integer $ipv6_listen_port = $listen_port,
6060
String $ipv6_listen_options = 'default ipv6only=on',
6161
$proxy = undef,
6262
String $proxy_read_timeout = $nginx::proxy_read_timeout,

spec/defines/resource_mailhost_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@
6161
title: 'should enable IPv6',
6262
attr: 'ipv6_enable',
6363
value: true,
64-
match: ' listen [::]:80 default ipv6only=on;'
64+
match: ' listen [::]:25 default ipv6only=on;'
6565
},
6666
{
6767
title: 'should not enable IPv6',
6868
attr: 'ipv6_enable',
6969
value: false,
70-
notmatch: %r{ listen \[::\]:80 default ipv6only=on;}
70+
notmatch: %r{ listen \[::\]:25 default ipv6only=on;}
7171
},
7272
{
7373
title: 'should set the IPv6 listen IP',
7474
attr: 'ipv6_listen_ip',
7575
value: '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
76-
match: ' listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80 default ipv6only=on;'
76+
match: ' listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:25 default ipv6only=on;'
7777
},
7878
{
7979
title: 'should set the IPv6 listen port',
@@ -85,7 +85,7 @@
8585
title: 'should set the IPv6 listen options',
8686
attr: 'ipv6_listen_options',
8787
value: 'spdy',
88-
match: ' listen [::]:80 spdy;'
88+
match: ' listen [::]:25 spdy;'
8989
},
9090
{
9191
title: 'should set servername(s)',

0 commit comments

Comments
 (0)