File tree Expand file tree Collapse file tree 6 files changed +12
-18
lines changed Expand file tree Collapse file tree 6 files changed +12
-18
lines changed Original file line number Diff line number Diff line change 6
6
setup_matrix :
7
7
name : ' Setup Test Matrix'
8
8
runs-on : ubuntu-latest
9
- timeout-minutes : 40
9
+ timeout-minutes : 60
10
10
outputs :
11
11
beaker_setfiles : ${{ steps.get-outputs.outputs.beaker_setfiles }}
12
12
puppet_major_versions : ${{ steps.get-outputs.outputs.puppet_major_versions }}
31
31
unit :
32
32
needs : setup_matrix
33
33
runs-on : ubuntu-latest
34
- timeout-minutes : 40
34
+ timeout-minutes : 60
35
35
strategy :
36
36
fail-fast : false
37
37
matrix :
Original file line number Diff line number Diff line change 1
1
---
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
Original file line number Diff line number Diff line change 132
132
Optional[String] $listen_options = undef ,
133
133
Boolean $ipv6_enable = false ,
134
134
Variant[Array[String], String] $ipv6_listen_ip = ' ::' ,
135
- Stdlib::Port $ipv6_listen_port = 80 ,
135
+ Stdlib::Port $ipv6_listen_port = $listen_port ,
136
136
String $ipv6_listen_options = ' default ipv6only=on' ,
137
137
Boolean $ssl = false ,
138
138
Optional[String] $ssl_cert = undef ,
Original file line number Diff line number Diff line change 284
284
define nginx::resource::server (
285
285
Enum['absent', 'present'] $ensure = ' present' ,
286
286
Variant[Array, String] $listen_ip = ' *' ,
287
- Integer $listen_port = 80,
287
+ Stdlib::Port $listen_port = 80,
288
288
Optional[String] $listen_options = undef ,
289
289
Boolean $listen_unix_socket_enable = false ,
290
290
Variant[Array[Stdlib::Absolutepath], Stdlib::Absolutepath] $listen_unix_socket = ' /var/run/nginx.sock' ,
294
294
Array $location_deny = [],
295
295
Boolean $ipv6_enable = false ,
296
296
Variant[Array, String] $ipv6_listen_ip = ' ::' ,
297
- Integer $ipv6_listen_port = 80 ,
297
+ Stdlib::Port $ipv6_listen_port = $listen_port ,
298
298
String $ipv6_listen_options = ' default ipv6only=on' ,
299
299
Hash $add_header = {},
300
300
Boolean $ssl = false ,
Original file line number Diff line number Diff line change 56
56
Optional[String] $listen_options = undef ,
57
57
Boolean $ipv6_enable = false ,
58
58
Variant[Array, String] $ipv6_listen_ip = ' ::' ,
59
- Integer $ipv6_listen_port = 80 ,
59
+ Integer $ipv6_listen_port = $listen_port ,
60
60
String $ipv6_listen_options = ' default ipv6only=on' ,
61
61
$proxy = undef ,
62
62
String $proxy_read_timeout = $nginx::proxy_read_timeout,
Original file line number Diff line number Diff line change 61
61
title : 'should enable IPv6' ,
62
62
attr : 'ipv6_enable' ,
63
63
value : true ,
64
- match : ' listen [::]:80 default ipv6only=on;'
64
+ match : ' listen [::]:25 default ipv6only=on;'
65
65
} ,
66
66
{
67
67
title : 'should not enable IPv6' ,
68
68
attr : 'ipv6_enable' ,
69
69
value : false ,
70
- notmatch : %r{ listen \[ ::\] :80 default ipv6only=on;}
70
+ notmatch : %r{ listen \[ ::\] :25 default ipv6only=on;}
71
71
} ,
72
72
{
73
73
title : 'should set the IPv6 listen IP' ,
74
74
attr : 'ipv6_listen_ip' ,
75
75
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;'
77
77
} ,
78
78
{
79
79
title : 'should set the IPv6 listen port' ,
85
85
title : 'should set the IPv6 listen options' ,
86
86
attr : 'ipv6_listen_options' ,
87
87
value : 'spdy' ,
88
- match : ' listen [::]:80 spdy;'
88
+ match : ' listen [::]:25 spdy;'
89
89
} ,
90
90
{
91
91
title : 'should set servername(s)' ,
You can’t perform that action at this time.
0 commit comments