Skip to content

Commit aaf7c32

Browse files
authored
Merge pull request voxpupuli#1130 from wyardley/update_optional_params
Remove 'Optional' for resources with default settings
2 parents e994779 + 1589c0e commit aaf7c32

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

manifests/resource/location.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@
173173
Optional[String] $fastcgi = undef,
174174
Optional[String] $fastcgi_index = undef,
175175
Optional[Hash] $fastcgi_param = undef,
176-
Optional[String] $fastcgi_params = "${::nginx::conf_dir}/fastcgi.conf",
176+
String $fastcgi_params = "${::nginx::conf_dir}/fastcgi.conf",
177177
Optional[String] $fastcgi_script = undef,
178178
Optional[String] $fastcgi_split_path = undef,
179179
Optional[String] $uwsgi = undef,
180180
Optional[Hash] $uwsgi_param = undef,
181-
Optional[String] $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
181+
String $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
182182
Optional[String] $uwsgi_read_timeout = undef,
183183
Boolean $ssl = false,
184184
Boolean $ssl_only = false,

manifests/resource/server.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
Boolean $ssl_listen_option = true,
155155
Optional[Variant[String, Boolean]] $ssl_cert = undef,
156156
Optional[String] $ssl_client_cert = undef,
157-
Optional[String] $ssl_verify_client = 'on',
157+
String $ssl_verify_client = 'on',
158158
Optional[String] $ssl_dhparam = $::nginx::ssl_dhparam,
159159
Boolean $ssl_redirect = false,
160160
Optional[Integer] $ssl_redirect_port = undef,
@@ -195,10 +195,10 @@
195195
Optional[String] $fastcgi = undef,
196196
Optional[String] $fastcgi_index = undef,
197197
$fastcgi_param = undef,
198-
Optional[String] $fastcgi_params = "${::nginx::conf_dir}/fastcgi.conf",
198+
String $fastcgi_params = "${::nginx::conf_dir}/fastcgi.conf",
199199
Optional[String] $fastcgi_script = undef,
200200
Optional[String] $uwsgi = undef,
201-
Optional[String] $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
201+
String $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
202202
Optional[String] $uwsgi_read_timeout = undef,
203203
Array $index_files = [
204204
'index.html',

0 commit comments

Comments
 (0)