Skip to content

Optimize var types #519

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

Merged
jordanbreen28 merged 1 commit into from
May 24, 2023
Merged

Optimize var types #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ Default value: `'present'`

##### <a name="-tomcat--config--server--address"></a>`address`

Data type: `Optional[String[1]]`
Data type: `Optional[Variant[Pattern[/^localhost$/], Stdlib::IP::Address]]`

Specifies a TCP/IP address on which to listen for the shutdown command. Maps to the [address XML attribute](http://tomcat.apache.org/tomcat-8.0-doc/config/server.html#Common_Attributes). Valid options: a string.

Expand All @@ -827,7 +827,7 @@ Default value: `'present'`

##### <a name="-tomcat--config--server--port"></a>`port`

Data type: `Optional[String[1]]`
Data type: `Optional[Variant[String[1], Stdlib::Port]]`

Specifies a port on which to listen for the designated shutdown command. Maps to the [port XML attribute](http://tomcat.apache.org/tomcat-8.0-doc/config/server.html#Common_Attributes). Valid options: a string containing a port number.

Expand All @@ -843,7 +843,7 @@ Default value: `undef`

##### <a name="-tomcat--config--server--server_config"></a>`server_config`

Data type: `Optional[String[1]]`
Data type: `Optional[Stdlib::Absolutepath]`

Specifies a server.xml file to manage. Valid options: a string containing an absolute path.

Expand Down Expand Up @@ -2001,7 +2001,7 @@ The following parameters are available in the `tomcat::install` defined type:

##### <a name="-tomcat--install--catalina_home"></a>`catalina_home`

Data type: `String[1]`
Data type: `Stdlib::Absolutepath`

specifies the directory of the Tomcat installation from which the instance should be created. Valid options: a string containing an absolute path.

Expand Down Expand Up @@ -2037,7 +2037,18 @@ Default value: `true`

##### <a name="-tomcat--install--proxy_type"></a>`proxy_type`

Data type: `Optional[Enum['none', 'http', 'https', 'ftp']]`
Data type:

```puppet
Optional[
Enum[
'none',
'http',
'https',
'ftp'
]
]
```

Specifies the proxy server type used by `proxy_server`. Normally this defaults to the protocol specified in the `proxy_server` URI. `proxy_server`. Valid options: 'none', 'http', 'https', 'ftp'.

Expand Down
18 changes: 9 additions & 9 deletions manifests/config/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
# Specifies display differences when augeas changes files, defaulting to true. Valid options: true or false.
#
define tomcat::config::server (
Optional[Stdlib::Absolutepath] $catalina_base = undef,
Optional[String[1]] $class_name = undef,
Enum['present','absent'] $class_name_ensure = 'present',
Optional[String[1]] $address = undef,
Enum['present','absent'] $address_ensure = 'present',
Optional[String[1]] $port = undef,
Optional[String[1]] $shutdown = undef,
Optional[String[1]] $server_config = undef,
Boolean $show_diff = true,
Optional[Stdlib::Absolutepath] $catalina_base = undef,
Optional[String[1]] $class_name = undef,
Enum['present','absent'] $class_name_ensure = 'present',
Optional[Variant[Pattern[/^localhost$/], Stdlib::IP::Address]] $address = undef,
Enum['present','absent'] $address_ensure = 'present',
Optional[Variant[String[1], Stdlib::Port]] $port = undef,
Optional[String[1]] $shutdown = undef,
Optional[Stdlib::Absolutepath] $server_config = undef,
Boolean $show_diff = true,
) {
include tomcat
$_catalina_base = pick($catalina_base, $tomcat::catalina_home)
Expand Down
39 changes: 23 additions & 16 deletions manifests/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,33 @@
# Specifies the default webapps to be removed.
#
define tomcat::install (
String[1] $catalina_home = $name,
Boolean $install_from_source = true,
Stdlib::Absolutepath $catalina_home = $name,
Boolean $install_from_source = true,

# source options
Optional[String[1]] $source_url = undef,
Boolean $source_strip_first_dir = true,
Optional[Enum['none', 'http', 'https', 'ftp']] $proxy_type = undef,
Optional[String[1]] $proxy_server = undef,
Boolean $allow_insecure = false,
Optional[String[1]] $user = undef,
Optional[String[1]] $group = undef,
Optional[Boolean] $manage_user = undef,
Optional[Boolean] $manage_group = undef,
Optional[Boolean] $manage_home = undef,
Optional[Array[String[1]]] $remove_default_webapps = undef,
Optional[String[1]] $source_url = undef,
Boolean $source_strip_first_dir = true,
Optional[
Enum[
'none',
'http',
'https',
'ftp'
]
] $proxy_type = undef,
Optional[String[1]] $proxy_server = undef,
Boolean $allow_insecure = false,
Optional[String[1]] $user = undef,
Optional[String[1]] $group = undef,
Optional[Boolean] $manage_user = undef,
Optional[Boolean] $manage_group = undef,
Optional[Boolean] $manage_home = undef,
Optional[Array[String[1]]] $remove_default_webapps = undef,

# package options
Optional[String[1]] $package_ensure = undef,
Optional[String[1]] $package_name = undef,
Optional[Array[String[1]]] $package_options = undef,
Optional[String[1]] $package_ensure = undef,
Optional[String[1]] $package_name = undef,
Optional[Array[String[1]]] $package_options = undef,
) {
include tomcat
$_user = pick($user, $tomcat::user)
Expand Down