Skip to content

Commit 630a7d2

Browse files
jordanbreen28jordanbreen28
authored
Merge pull request #2415 from evgeni/on-off-dance
use a dedicated Enum type for On/Off and accept lower case too
2 parents eb0c6d6 + 59fb882 commit 630a7d2

File tree

11 files changed

+58
-54
lines changed

11 files changed

+58
-54
lines changed

‎manifests/init.pp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -483,16 +483,16 @@
483483
Optional[Boolean] $purge_vhost_dir = undef,
484484
Boolean $purge_vdir = false,
485485
Optional[String[1]] $serveradmin = undef,
486-
Enum['On', 'Off', 'on', 'off'] $sendfile = 'On',
487-
Optional[Enum['On', 'Off', 'on', 'off']] $ldap_verify_server_cert = undef,
486+
Apache::OnOff $sendfile = 'On',
487+
Optional[Apache::OnOff] $ldap_verify_server_cert = undef,
488488
Optional[String] $ldap_trusted_mode = undef,
489489
Boolean $error_documents = false,
490490
Integer[0] $timeout = 60,
491491
Stdlib::Absolutepath $httpd_dir = $apache::params::httpd_dir,
492492
Stdlib::Absolutepath $server_root = $apache::params::server_root,
493493
Stdlib::Absolutepath $conf_dir = $apache::params::conf_dir,
494494
Stdlib::Absolutepath $confd_dir = $apache::params::confd_dir,
495-
Enum['Off', 'On', 'Double', 'off', 'on', 'double'] $hostname_lookups = $apache::params::hostname_lookups,
495+
Variant[Apache::OnOff, Enum['Double', 'double']] $hostname_lookups = $apache::params::hostname_lookups,
496496
Optional[Stdlib::Absolutepath] $conf_enabled = $apache::params::conf_enabled,
497497
Stdlib::Absolutepath $vhost_dir = $apache::params::vhost_dir,
498498
Optional[Stdlib::Absolutepath] $vhost_enable_dir = $apache::params::vhost_enable_dir,
@@ -513,7 +513,7 @@
513513
String $group = $apache::params::group,
514514
Optional[String] $http_protocol_options = $apache::params::http_protocol_options,
515515
Array $supplementary_groups = [],
516-
Enum['On', 'Off'] $keepalive = $apache::params::keepalive,
516+
Apache::OnOff $keepalive = $apache::params::keepalive,
517517
Integer $keepalive_timeout = $apache::params::keepalive_timeout,
518518
Integer $max_keepalive_requests = $apache::params::max_keepalive_requests,
519519
Integer $limitreqfieldsize = 8190,
@@ -527,11 +527,11 @@
527527
Stdlib::Absolutepath $ports_file = $apache::params::ports_file,
528528
Stdlib::Absolutepath $docroot = $apache::params::docroot,
529529
Apache::ServerTokens $server_tokens = 'Prod',
530-
Variant[Enum['On', 'Off'], String] $server_signature = 'On',
531-
Enum['On', 'Off', 'extended'] $trace_enable = 'On',
532-
Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes = undef,
530+
Variant[Apache::OnOff, String] $server_signature = 'On',
531+
Variant[Apache::OnOff, Enum['extended']] $trace_enable = 'On',
532+
Optional[Variant[Apache::OnOff, Enum['nodecode']]] $allow_encoded_slashes = undef,
533533
Optional[String] $file_e_tag = undef,
534-
Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name = undef,
534+
Optional[Variant[Apache::OnOff, Enum['DNS', 'dns']]] $use_canonical_name = undef,
535535
String $package_ensure = 'installed',
536536
Boolean $use_optional_includes = $apache::params::use_optional_includes,
537537
Boolean $use_systemd = $apache::params::use_systemd,

‎manifests/mod/dumpio.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
# @see https://httpd.apache.org/docs/current/mod/mod_dumpio.html for additional documentation.
2121
#
2222
class apache::mod::dumpio (
23-
Enum['Off', 'On', 'off', 'on'] $dump_io_input = 'Off',
24-
Enum['Off', 'On', 'off', 'on'] $dump_io_output = 'Off',
23+
Apache::OnOff $dump_io_input = 'Off',
24+
Apache::OnOff $dump_io_output = 'Off',
2525
) {
2626
include apache
2727

‎manifests/mod/md.pp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,29 +94,29 @@
9494
# @note Unsupported platforms: CentOS: 6, 7; Debian: 8, 9; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
9595
class apache::mod::md (
9696
Optional[String] $md_activation_delay = undef,
97-
Optional[Enum['on', 'off']] $md_base_server = undef,
97+
Optional[Apache::OnOff] $md_base_server = undef,
9898
Optional[Array[Enum['dns-01', 'http-01', 'tls-alpn-01']]] $md_ca_challenges = undef,
9999
Optional[Enum['accepted']] $md_certificate_agreement = undef,
100100
Optional[Stdlib::HTTPUrl] $md_certificate_authority = undef,
101101
Optional[String] $md_certificate_check = undef, # undocumented
102102
Optional[String] $md_certificate_monitor = undef,
103103
Optional[Enum['ACME']] $md_certificate_protocol = undef,
104-
Optional[Enum['on', 'off']] $md_certificate_status = undef,
104+
Optional[Apache::OnOff] $md_certificate_status = undef,
105105
Optional[Stdlib::Absolutepath] $md_challenge_dns01 = undef,
106106
Optional[String] $md_contact_email = undef,
107107
Optional[Stdlib::HTTPUrl] $md_http_proxy = undef,
108108
Optional[Enum['auto', 'manual']] $md_members = undef,
109109
Optional[Stdlib::Absolutepath] $md_message_cmd = undef,
110-
Optional[Enum['on', 'off']] $md_must_staple = undef,
110+
Optional[Apache::OnOff] $md_must_staple = undef,
111111
Optional[Stdlib::Absolutepath] $md_notify_cmd = undef,
112112
Optional[String] $md_port_map = undef,
113113
Optional[String] $md_private_keys = undef,
114114
Optional[Enum['always', 'auto', 'manual']] $md_renew_mode = undef,
115115
Optional[String] $md_renew_window = undef,
116116
Optional[Enum['off', 'permanent', 'temporary']] $md_require_https = undef,
117-
Optional[Enum['on', 'off']] $md_server_status = undef,
118-
Optional[Enum['on', 'off']] $md_staple_others = undef,
119-
Optional[Enum['on', 'off']] $md_stapling = undef,
117+
Optional[Apache::OnOff] $md_server_status = undef,
118+
Optional[Apache::OnOff] $md_staple_others = undef,
119+
Optional[Apache::OnOff] $md_stapling = undef,
120120
Optional[String] $md_stapling_keep_response = undef,
121121
Optional[String] $md_stapling_renew_window = undef,
122122
Optional[Stdlib::Absolutepath] $md_store_dir = undef,

‎manifests/mod/passenger.pp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -329,38 +329,38 @@
329329
Optional[String] $mod_package = undef,
330330
Optional[String] $mod_package_ensure = undef,
331331
Optional[String] $mod_path = undef,
332-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_allow_encoded_slashes = undef,
332+
Optional[Apache::OnOff] $passenger_allow_encoded_slashes = undef,
333333
Optional[String] $passenger_anonymous_telemetry_proxy = undef,
334334
Optional[String] $passenger_app_env = undef,
335335
Optional[String] $passenger_app_group_name = undef,
336336
Optional[String] $passenger_app_root = undef,
337337
Optional[String] $passenger_app_type = undef,
338338
Optional[String] $passenger_base_uri = undef,
339-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_buffer_response = undef,
340-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_buffer_upload = undef,
339+
Optional[Apache::OnOff] $passenger_buffer_response = undef,
340+
Optional[Apache::OnOff] $passenger_buffer_upload = undef,
341341
Optional[String] $passenger_concurrency_model = undef,
342342
String $passenger_conf_file = $apache::params::passenger_conf_file,
343343
Optional[String] $passenger_conf_package_file = $apache::params::passenger_conf_package_file,
344344
Optional[Stdlib::Absolutepath] $passenger_data_buffer_dir = undef,
345345
Optional[String] $passenger_debug_log_file = undef,
346-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_debugger = undef,
346+
Optional[Apache::OnOff] $passenger_debugger = undef,
347347
Optional[String] $passenger_default_group = undef,
348348
Optional[String] $passenger_default_ruby = $apache::params::passenger_default_ruby,
349349
Optional[String] $passenger_default_user = undef,
350350
Optional[Boolean] $passenger_disable_anonymous_telemetry = undef,
351351
Optional[Boolean] $passenger_disable_log_prefix = undef,
352-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_disable_security_update_check = undef,
353-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_enabled = undef,
354-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_error_override = undef,
352+
Optional[Apache::OnOff] $passenger_disable_security_update_check = undef,
353+
Optional[Apache::OnOff] $passenger_enabled = undef,
354+
Optional[Apache::OnOff] $passenger_error_override = undef,
355355
Optional[String] $passenger_file_descriptor_log_file = undef,
356356
Optional[String] $passenger_fly_with = undef,
357357
Optional[Variant[Integer, String]] $passenger_force_max_concurrent_requests_per_process = undef,
358-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_friendly_error_pages = undef,
358+
Optional[Apache::OnOff] $passenger_friendly_error_pages = undef,
359359
Optional[String] $passenger_group = undef,
360-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_high_performance = undef,
360+
Optional[Apache::OnOff] $passenger_high_performance = undef,
361361
Optional[String] $passenger_installed_version = undef,
362362
Optional[String] $passenger_instance_registry_dir = undef,
363-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_load_shell_envvars = undef,
363+
Optional[Apache::OnOff] $passenger_load_shell_envvars = undef,
364364
Optional[Boolean] $passenger_preload_bundler = undef,
365365
Optional[Stdlib::Absolutepath] $passenger_log_file = undef,
366366
Optional[Integer] $passenger_log_level = undef,
@@ -379,28 +379,28 @@
379379
Optional[Integer] $passenger_pool_idle_time = undef,
380380
Optional[Variant[String, Array[String]]] $passenger_pre_start = undef,
381381
Optional[String] $passenger_python = undef,
382-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_resist_deployment_errors = undef,
383-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_resolve_symlinks_in_document_root = undef,
382+
Optional[Apache::OnOff] $passenger_resist_deployment_errors = undef,
383+
Optional[Apache::OnOff] $passenger_resolve_symlinks_in_document_root = undef,
384384
Optional[Variant[Integer, String]] $passenger_response_buffer_high_watermark = undef,
385385
Optional[String] $passenger_restart_dir = undef,
386-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_rolling_restarts = undef,
386+
Optional[Apache::OnOff] $passenger_rolling_restarts = undef,
387387
Optional[String] $passenger_root = $apache::params::passenger_root,
388388
Optional[String] $passenger_ruby = $apache::params::passenger_ruby,
389389
Optional[String] $passenger_security_update_check_proxy = undef,
390-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_show_version_in_header = undef,
390+
Optional[Apache::OnOff] $passenger_show_version_in_header = undef,
391391
Optional[Variant[Integer, String]] $passenger_socket_backlog = undef,
392392
Optional[String] $passenger_spawn_dir = undef,
393393
Optional[Enum['smart', 'direct', 'smart-lv2', 'conservative']] $passenger_spawn_method = undef,
394394
Optional[Integer] $passenger_start_timeout = undef,
395395
Optional[String] $passenger_startup_file = undef,
396396
Optional[Integer] $passenger_stat_throttle_rate = undef,
397-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_sticky_sessions = undef,
397+
Optional[Apache::OnOff] $passenger_sticky_sessions = undef,
398398
Optional[String] $passenger_sticky_sessions_cookie_name = undef,
399399
Optional[String] $passenger_sticky_sessions_cookie_attributes = undef,
400400
Optional[Integer] $passenger_thread_count = undef,
401401
Optional[String] $passenger_use_global_queue = undef,
402402
Optional[String] $passenger_user = undef,
403-
Optional[Enum['on', 'off', 'On', 'Off']] $passenger_user_switching = undef,
403+
Optional[Apache::OnOff] $passenger_user_switching = undef,
404404
Optional[String] $rack_auto_detect = undef,
405405
Optional[String] $rack_autodetect = undef,
406406
Optional[String] $rack_base_uri = undef,

‎manifests/mod/peruser.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
Integer $maxrequestsperchild = 1000,
3030
Integer $idletimeout = 120,
3131
Integer $expiretimeout = 120,
32-
Enum['On', 'Off'] $keepalive = 'Off',
32+
Apache::OnOff $keepalive = 'Off',
3333
) {
3434
include apache
3535
case $facts['os']['family'] {

‎manifests/mod/security.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163
Integer $secrequestbodyinmemorylimit = 131072,
164164
Integer[1,4] $paranoia_level = 1,
165165
Integer[1,4] $executing_paranoia_level = $paranoia_level,
166-
Enum['On', 'Off'] $secrequestbodyaccess = 'On',
167-
Enum['On', 'Off'] $secresponsebodyaccess = 'Off',
166+
Apache::OnOff $secrequestbodyaccess = 'On',
167+
Apache::OnOff $secresponsebodyaccess = 'Off',
168168
Enum['Reject', 'ProcessPartial'] $secrequestbodylimitaction = 'Reject',
169169
Enum['Reject', 'ProcessPartial'] $secresponsebodylimitaction = 'ProcessPartial',
170170
Boolean $manage_security_crs = true,

‎manifests/mod/ssl.pp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
Optional[Stdlib::Absolutepath] $ssl_key = undef,
9797
Optional[Stdlib::Absolutepath] $ssl_ca = undef,
9898
String $ssl_cipher = $apache::params::ssl_cipher,
99-
Variant[Boolean, Enum['on', 'off']] $ssl_honorcipherorder = true,
99+
Variant[Boolean, Apache::OnOff] $ssl_honorcipherorder = true,
100100
Array[String] $ssl_protocol = $apache::params::ssl_protocol,
101101
Array $ssl_proxy_protocol = [],
102102
Optional[String[1]] $ssl_proxy_cipher_suite = $apache::params::ssl_proxy_cipher_suite,
@@ -119,7 +119,9 @@
119119
} else {
120120
$_ssl_honorcipherorder = $ssl_honorcipherorder ? {
121121
'on' => true,
122+
'On' => true,
122123
'off' => false,
124+
'Off' => false,
123125
default => true,
124126
}
125127
}

‎manifests/mod/status.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#
3232
class apache::mod::status (
3333
Optional[Variant[String, Array, Hash]] $requires = undef,
34-
Enum['On', 'Off', 'on', 'off'] $extended_status = 'On',
34+
Apache::OnOff $extended_status = 'On',
3535
String $status_path = '/server-status',
3636
) inherits apache::params {
3737
include apache

0 commit comments

Comments
 (0)