Skip to content

Add support for new feature: port ranges #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
+100 −42
Open

Add support for new feature: port ranges #1325

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b40a4a1
Update streamhost.pp
00ssh Apr 18, 2019
c00d5e2
Update server.pp
00ssh Apr 18, 2019
efc321e
Update server.pp
00ssh May 29, 2019
d61fb86
Create portrange.pp
00ssh May 29, 2019
b727650
Updated variable name listen_port -> port
00ssh May 29, 2019
b416b8b
Updated variable name port -> ipv6_port
00ssh May 29, 2019
9dbf0a6
Changed variable name from listen_port -> port
00ssh May 29, 2019
be02ef8
added support for port range
00ssh May 29, 2019
dd1afc4
Added listen_port_range to spec attributes
00ssh May 29, 2019
513d75d
Added listen_port_range and ipv6_port_range
00ssh May 29, 2019
d0df89c
Added support for port ranges and ipv6 port ranges
00ssh May 29, 2019
fe09594
fixed value type
00ssh May 29, 2019
ec6a201
fixed value type
00ssh May 29, 2019
e09f5b4
removed new line trailing spaces
00ssh May 29, 2019
366bc45
removed new line trailing spaces
00ssh May 29, 2019
dc8b14a
remove whitespace
00ssh May 29, 2019
6a02424
fixed missing declared resource variable
00ssh May 29, 2019
addd3c6
Updated variable description
00ssh May 29, 2019
d4021eb
Merge pull request #1 from voxpupuli/master
00ssh May 30, 2019
bcad22d
Update streamhost.pp
00ssh Jun 3, 2019
ffaa006
Added nginx version checks for port range support
00ssh Jun 5, 2019
d9292c6
Added nginx version checks for port range support
00ssh Jun 5, 2019
f36f469
Updated specs for port range using nginx_version fact
00ssh Jun 5, 2019
01692cf
Updated spec for stream for port range support with nginx_version fact
00ssh Jun 5, 2019
558b32b
simplified code, updated spec, changed from fact function to $fact
Jun 5, 2019
8907ee4
updated specs for nginx_version in server resource
Jun 5, 2019
bf23d6b
updated specs for nginx_version in server resource
Jun 5, 2019
4045958
Added nginx_version fact to streamhost spec
00ssh Jun 5, 2019
f96006a
removed context "without a value for nginx_version fact"
00ssh Jun 5, 2019
0c7e28a
updated specs with correct titles
Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions manifests/resource/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Parameters:
# [*ensure*] - Enables or disables the specified server (present|absent)
# [*listen_ip*] - Default IP Address for NGINX to listen with this server on. Defaults to all interfaces (*)
# [*listen_port*] - Default IP Port for NGINX to listen with this server on. Defaults to TCP 80
# [*listen_port*] - Default IP Port for NGINX to listen with this server on. Defaults to TCP 80. It can be a port or a port range (eg. '8081-8085').
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment here is incorrect. It's forced to be an integer so it can't be a range. Can't we change listen_port to a type Variant[Stdlib::Port, Nginx::PortRange] and handle that in the code? I dislike having two parameters for the same thing.

# [*listen_options*] - Extra options for listen directive like 'default_server' to catchall. Undef by default.
# [*listen_unix_socket_enable*] - BOOL value to enable/disable UNIX socket listening support (false|true).
# [*listen_unix_socket*] - Default unix socket for NGINX to listen with this server on. Defaults to UNIX /var/run/nginx.sock
Expand Down Expand Up @@ -147,7 +147,7 @@
define nginx::resource::server (
Enum['absent', 'present'] $ensure = 'present',
Variant[Array, String] $listen_ip = '*',
Integer $listen_port = 80,
Variant[Integer, String] $listen_port = 80,
Optional[String] $listen_options = undef,
Boolean $listen_unix_socket_enable = false,
Variant[Array[Stdlib::Absolutepath], Stdlib::Absolutepath] $listen_unix_socket = '/var/run/nginx.sock',
Expand All @@ -157,7 +157,7 @@
Array $location_deny = [],
Boolean $ipv6_enable = false,
Variant[Array, String] $ipv6_listen_ip = '::',
Integer $ipv6_listen_port = 80,
Variant[Integer, String] $ipv6_listen_port = 80,
String $ipv6_listen_options = 'default ipv6only=on',
Hash $add_header = {},
Boolean $ssl = false,
Expand Down Expand Up @@ -442,7 +442,7 @@
}

# Create SSL File Stubs if SSL is enabled
if $ssl {
if $ssl and $listen_port !~ String {
# Access and error logs are named differently in ssl template

File <| title == $ssl_cert or path == $ssl_cert or title == $ssl_key or path == $ssl_key |>
Expand Down
37 changes: 19 additions & 18 deletions manifests/resource/streamhost.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
# [*listen_ip*] - Default IP Address for NGINX to listen with this
# streamhost on. Defaults to all interfaces (*)
# [*listen_port*] - Default IP Port for NGINX to listen with this
# streamhost on. Defaults to TCP 80
# streamhost on. Defaults to TCP 80. It can be a port or a port range
# (eg. '8081-8085').
# [*listen_options*] - Extra options for listen directive like
# 'default' to catchall. Undef by default.
# [*ipv6_enable*] - BOOL value to enable/disable IPv6 support
Expand Down Expand Up @@ -47,23 +48,23 @@
# ensure => present,
# }
define nginx::resource::streamhost (
Enum['absent', 'present'] $ensure = 'present',
Variant[Array, String] $listen_ip = '*',
Integer $listen_port = 80,
Optional[String] $listen_options = undef,
Boolean $ipv6_enable = false,
Variant[Array, String] $ipv6_listen_ip = '::',
Integer $ipv6_listen_port = 80,
String $ipv6_listen_options = 'default ipv6only=on',
$proxy = undef,
String $proxy_read_timeout = $nginx::proxy_read_timeout,
$proxy_connect_timeout = $nginx::proxy_connect_timeout,
Array $resolver = [],
$raw_prepend = undef,
$raw_append = undef,
String $owner = $nginx::global_owner,
String $group = $nginx::global_group,
String $mode = $nginx::global_mode,
Enum['absent', 'present'] $ensure = 'present',
Variant[Array, String] $listen_ip = '*',
Variant[Integer, String] $listen_port = 80,
Optional[String] $listen_options = undef,
Boolean $ipv6_enable = false,
Variant[Array, String] $ipv6_listen_ip = '::',
Variant[Integer, String] $ipv6_listen_port = 80,
String $ipv6_listen_options = 'default ipv6only=on',
$proxy = undef,
String $proxy_read_timeout = $nginx::proxy_read_timeout,
$proxy_connect_timeout = $nginx::proxy_connect_timeout,
Array $resolver = [],
$raw_prepend = undef,
$raw_append = undef,
String $owner = $nginx::global_owner,
String $group = $nginx::global_group,
String $mode = $nginx::global_mode,
) {

if ! defined(Class['nginx']) {
Expand Down