From d2780c3eed26dd6cc01e28fa0ebe0a2c260dabb1 Mon Sep 17 00:00:00 2001 From: david22swan Date: Fri, 27 May 2022 15:24:00 +0100 Subject: [PATCH] (syntax) parameter_types part 6 --- manifests/mpm.pp | 4 +- manifests/package.pp | 4 +- manifests/peruser/multiplexer.pp | 6 +- manifests/peruser/processor.pp | 6 +- manifests/service.pp | 10 +- manifests/vhost.pp | 492 +++++++++++++++---------------- manifests/vhost/custom.pp | 8 +- manifests/vhost/fragment.pp | 8 +- manifests/vhosts.pp | 2 +- 9 files changed, 270 insertions(+), 270 deletions(-) diff --git a/manifests/mpm.pp b/manifests/mpm.pp index 854d86027a..8d76fa796a 100644 --- a/manifests/mpm.pp +++ b/manifests/mpm.pp @@ -2,8 +2,8 @@ # # @api private define apache::mpm ( - $lib_path = $apache::lib_path, - $apache_version = $apache::apache_version, + String $lib_path = $apache::lib_path, + Optional[String] $apache_version = $apache::apache_version, ) { if ! defined(Class['apache']) { fail('You must include the apache base class before using any apache defined resources') diff --git a/manifests/package.pp b/manifests/package.pp index bc779097eb..06b8bc77bf 100644 --- a/manifests/package.pp +++ b/manifests/package.pp @@ -3,8 +3,8 @@ # # @api private class apache::package ( - $ensure = 'present', - $mpm_module = $apache::params::mpm_module, + String $ensure = 'present', + String $mpm_module = $apache::params::mpm_module, ) inherits apache::params { # The base class must be included first because it is used by parameter defaults if ! defined(Class['apache']) { diff --git a/manifests/peruser/multiplexer.pp b/manifests/peruser/multiplexer.pp index 5001090c4c..b8b271e306 100644 --- a/manifests/peruser/multiplexer.pp +++ b/manifests/peruser/multiplexer.pp @@ -5,9 +5,9 @@ # # @api private define apache::peruser::multiplexer ( - $user = $apache::user, - $group = $apache::group, - $file = undef, + String $user = $apache::user, + String $group = $apache::group, + Optional[String] $file = undef, ) { if ! $file { $filename = "${name}.conf" diff --git a/manifests/peruser/processor.pp b/manifests/peruser/processor.pp index 57c26fa9f8..9be3d6109a 100644 --- a/manifests/peruser/processor.pp +++ b/manifests/peruser/processor.pp @@ -3,9 +3,9 @@ # # @api private define apache::peruser::processor ( - $user, - $group, - $file = undef, + String $user, + String $group, + Optional[String] $file = undef, ) { if ! $file { $filename = "${name}.conf" diff --git a/manifests/service.pp b/manifests/service.pp index 7366e5fd31..6e5ce53d9f 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -3,11 +3,11 @@ # # @api private class apache::service ( - $service_name = $apache::params::service_name, - Boolean $service_enable = true, - $service_ensure = 'running', - Boolean $service_manage = true, - $service_restart = undef + String $service_name = $apache::params::service_name, + Boolean $service_enable = true, + Variant[Boolean,String] $service_ensure = 'running', + Boolean $service_manage = true, + Optional[String] $service_restart = undef ) { # The base class must be included first because parameter defaults depend on it if ! defined(Class['apache::params']) { diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 8092448c88..135925d32e 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -1708,80 +1708,80 @@ # define apache::vhost ( Variant[Boolean,String] $docroot, - $manage_docroot = true, - $virtual_docroot = false, - $virtual_use_default_docroot = false, - $port = undef, - $ip = undef, - Boolean $ip_based = false, - $add_listen = true, - $docroot_owner = 'root', - $docroot_group = $apache::params::root_group, - $docroot_mode = undef, - Array[Enum['h2', 'h2c', 'http/1.1']] $protocols = [], - Optional[Boolean] $protocols_honor_order = undef, - $serveradmin = undef, - Boolean $ssl = false, - $ssl_cert = $apache::default_ssl_cert, - $ssl_key = $apache::default_ssl_key, - $ssl_chain = $apache::default_ssl_chain, - $ssl_ca = $apache::default_ssl_ca, - $ssl_crl_path = $apache::default_ssl_crl_path, - $ssl_crl = $apache::default_ssl_crl, - $ssl_crl_check = $apache::default_ssl_crl_check, - $ssl_certs_dir = $apache::params::ssl_certs_dir, - Boolean $ssl_reload_on_change = $apache::default_ssl_reload_on_change, - $ssl_protocol = undef, - $ssl_cipher = undef, - Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef] $ssl_honorcipherorder = undef, - Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client = undef, - $ssl_verify_depth = undef, - Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify = undef, - Optional[Integer[0]] $ssl_proxy_verify_depth = undef, - $ssl_proxy_ca_cert = undef, - Optional[Enum['on', 'off']] $ssl_proxy_check_peer_cn = undef, - Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name = undef, - Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire = undef, - $ssl_proxy_machine_cert = undef, - $ssl_proxy_machine_cert_chain = undef, - $ssl_proxy_cipher_suite = undef, - $ssl_proxy_protocol = undef, - $ssl_options = undef, - $ssl_openssl_conf_cmd = undef, - Boolean $ssl_proxyengine = false, - Optional[Boolean] $ssl_stapling = undef, - $ssl_stapling_timeout = undef, - $ssl_stapling_return_errors = undef, - Optional[String] $ssl_user_name = undef, - $priority = undef, - Boolean $default_vhost = false, - $servername = $name, - $serveraliases = [], - $options = ['Indexes','FollowSymLinks','MultiViews'], - $override = ['None'], - $directoryindex = '', - $vhost_name = '*', - $logroot = $apache::logroot, - Enum['directory', 'absent'] $logroot_ensure = 'directory', - $logroot_mode = undef, - $logroot_owner = undef, - $logroot_group = undef, - Optional[Apache::LogLevel] $log_level = undef, - Boolean $access_log = true, - $access_log_file = false, - $access_log_pipe = false, - $access_log_syslog = false, - $access_log_format = false, - $access_log_env_var = false, - Optional[Array] $access_logs = undef, - Boolean $use_servername_for_filenames = false, - Boolean $use_port_for_filenames = false, - $aliases = undef, - Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories = undef, - Boolean $error_log = true, - $error_log_file = undef, - $error_log_pipe = undef, - $error_log_syslog = undef, + Boolean $manage_docroot = true, + Variant[Boolean,String] $virtual_docroot = false, + Boolean $virtual_use_default_docroot = false, + Optional[Variant[Array[Integer],Array[String],Integer,String]] $port = undef, + Optional[Variant[Array[String],String]] $ip = undef, + Boolean $ip_based = false, + Boolean $add_listen = true, + String $docroot_owner = 'root', + String $docroot_group = $apache::params::root_group, + Optional[Variant[Integer,String]] $docroot_mode = undef, + Array[Enum['h2', 'h2c', 'http/1.1']] $protocols = [], + Optional[Boolean] $protocols_honor_order = undef, + Optional[String] $serveradmin = undef, + Boolean $ssl = false, + Optional[String] $ssl_cert = $apache::default_ssl_cert, + Optional[String] $ssl_key = $apache::default_ssl_key, + Optional[String] $ssl_chain = $apache::default_ssl_chain, + Optional[String] $ssl_ca = $apache::default_ssl_ca, + Optional[String] $ssl_crl_path = $apache::default_ssl_crl_path, + Optional[String] $ssl_crl = $apache::default_ssl_crl, + Optional[String] $ssl_crl_check = $apache::default_ssl_crl_check, + Optional[String] $ssl_certs_dir = $apache::params::ssl_certs_dir, + Boolean $ssl_reload_on_change = $apache::default_ssl_reload_on_change, + Optional[Variant[Array[String],String]] $ssl_protocol = undef, + Optional[Variant[Array[String],String]] $ssl_cipher = undef, + Variant[Boolean, Enum['on', 'On', 'off', 'Off'], Undef] $ssl_honorcipherorder = undef, + Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_verify_client = undef, + Optional[Variant[Integer,String]] $ssl_verify_depth = undef, + Optional[Enum['none', 'optional', 'require', 'optional_no_ca']] $ssl_proxy_verify = undef, + Optional[Integer[0]] $ssl_proxy_verify_depth = undef, + Optional[String] $ssl_proxy_ca_cert = undef, + Optional[Enum['on', 'off']] $ssl_proxy_check_peer_cn = undef, + Optional[Enum['on', 'off']] $ssl_proxy_check_peer_name = undef, + Optional[Enum['on', 'off']] $ssl_proxy_check_peer_expire = undef, + Optional[String] $ssl_proxy_machine_cert = undef, + Optional[String] $ssl_proxy_machine_cert_chain = undef, + Optional[String] $ssl_proxy_cipher_suite = undef, + Optional[String] $ssl_proxy_protocol = undef, + Optional[Variant[Array[String],String]] $ssl_options = undef, + Optional[String] $ssl_openssl_conf_cmd = undef, + Boolean $ssl_proxyengine = false, + Optional[Boolean] $ssl_stapling = undef, + Optional[Variant[Integer,String]] $ssl_stapling_timeout = undef, + Optional[Enum['on', 'off']] $ssl_stapling_return_errors = undef, + Optional[String] $ssl_user_name = undef, + Optional[Variant[Integer,String]] $priority = undef, + Boolean $default_vhost = false, + Optional[String] $servername = $name, + Array[String] $serveraliases = [], + Array[String] $options = ['Indexes','FollowSymLinks','MultiViews'], + Array[String] $override = ['None'], + Optional[String] $directoryindex = undef, + String $vhost_name = '*', + String $logroot = $apache::logroot, + Enum['directory', 'absent'] $logroot_ensure = 'directory', + Optional[String] $logroot_mode = undef, + Optional[String] $logroot_owner = undef, + Optional[String] $logroot_group = undef, + Optional[Apache::LogLevel] $log_level = undef, + Boolean $access_log = true, + Variant[Boolean,String] $access_log_file = false, + Variant[Boolean,String] $access_log_pipe = false, + Variant[Boolean,String] $access_log_syslog = false, + Variant[Boolean,String] $access_log_format = false, + Variant[Boolean,String] $access_log_env_var = false, + Optional[Array] $access_logs = undef, + Boolean $use_servername_for_filenames = false, + Boolean $use_port_for_filenames = false, + Optional[Hash] $aliases = undef, + Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories = undef, + Boolean $error_log = true, + Optional[String] $error_log_file = undef, + Optional[String] $error_log_pipe = undef, + Optional[String] $error_log_syslog = undef, Optional[ Array[ Variant[ @@ -1789,179 +1789,179 @@ Hash[String, Enum['connection', 'request']] ] ] - ] $error_log_format = undef, + ] $error_log_format = undef, Optional[Pattern[/^((Strict|Unsafe)?\s*(\b(Registered|Lenient)Methods)?\s*(\b(Allow0\.9|Require1\.0))?)$/]] $http_protocol_options = undef, - $modsec_audit_log = undef, - $modsec_audit_log_file = undef, - $modsec_audit_log_pipe = undef, - $error_documents = [], - Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]] $fallbackresource = undef, - $scriptalias = undef, - $scriptaliases = [], - Optional[Integer] $limitreqfieldsize = undef, - Optional[Integer] $limitreqfields = undef, - Optional[Integer] $limitreqline = undef, - Optional[Integer] $limitreqbody = undef, - $proxy_dest = undef, - $proxy_dest_match = undef, - $proxy_dest_reverse_match = undef, - $proxy_pass = undef, - $proxy_pass_match = undef, - Boolean $proxy_requests = false, - $suphp_addhandler = $apache::params::suphp_addhandler, - Enum['on', 'off'] $suphp_engine = $apache::params::suphp_engine, - $suphp_configpath = $apache::params::suphp_configpath, - $php_flags = {}, - $php_values = {}, - $php_admin_flags = {}, - $php_admin_values = {}, - $no_proxy_uris = [], - $no_proxy_uris_match = [], - $proxy_preserve_host = false, - $proxy_add_headers = undef, - $proxy_error_override = false, - $redirect_source = '/', - $redirect_dest = undef, - $redirect_status = undef, - $redirectmatch_status = undef, - $redirectmatch_regexp = undef, - $redirectmatch_dest = undef, - $headers = undef, - $request_headers = undef, - $filters = undef, - Optional[Array] $rewrites = undef, - $rewrite_base = undef, - $rewrite_rule = undef, - $rewrite_cond = undef, - $rewrite_inherit = false, - $setenv = [], - $setenvif = [], - $setenvifnocase = [], - $block = [], - Enum['absent', 'present'] $ensure = 'present', - $wsgi_application_group = undef, - Optional[Variant[String,Hash]] $wsgi_daemon_process = undef, - Optional[Hash] $wsgi_daemon_process_options = undef, - $wsgi_import_script = undef, - Optional[Hash] $wsgi_import_script_options = undef, - $wsgi_process_group = undef, - Optional[Hash] $wsgi_script_aliases_match = undef, - Optional[Hash] $wsgi_script_aliases = undef, - Optional[Enum['on', 'off', 'On', 'Off']] $wsgi_pass_authorization = undef, - $wsgi_chunked_request = undef, - Optional[String] $custom_fragment = undef, - Optional[Hash] $itk = undef, - $action = undef, - $fastcgi_server = undef, - $fastcgi_socket = undef, - $fastcgi_dir = undef, - $fastcgi_idle_timeout = undef, - $additional_includes = [], - $use_optional_includes = $apache::use_optional_includes, - $apache_version = $apache::apache_version, - Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes = undef, - Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group = undef, - - Optional[Boolean] $h2_copy_files = undef, - Optional[Boolean] $h2_direct = undef, - Optional[Boolean] $h2_early_hints = undef, - Optional[Integer] $h2_max_session_streams = undef, - Optional[Boolean] $h2_modern_tls_only = undef, - Optional[Boolean] $h2_push = undef, - Optional[Integer] $h2_push_diary_size = undef, - Array[String] $h2_push_priority = [], - Array[String] $h2_push_resource = [], - Optional[Boolean] $h2_serialize_headers = undef, - Optional[Integer] $h2_stream_max_mem_size = undef, - Optional[Integer] $h2_tls_cool_down_secs = undef, - Optional[Integer] $h2_tls_warm_up_size = undef, - Optional[Boolean] $h2_upgrade = undef, - Optional[Integer] $h2_window_size = undef, - - Optional[Boolean] $passenger_enabled = undef, - Optional[String] $passenger_base_uri = undef, - Optional[Stdlib::Absolutepath] $passenger_ruby = undef, - Optional[Stdlib::Absolutepath] $passenger_python = undef, - Optional[Stdlib::Absolutepath] $passenger_nodejs = undef, - Optional[String] $passenger_meteor_app_settings = undef, - Optional[String] $passenger_app_env = undef, - Optional[Stdlib::Absolutepath] $passenger_app_root = undef, - Optional[String] $passenger_app_group_name = undef, - Optional[String] $passenger_app_start_command = undef, - Optional[Enum['meteor', 'node', 'rack', 'wsgi']] $passenger_app_type = undef, - Optional[String] $passenger_startup_file = undef, - Optional[String] $passenger_restart_dir = undef, - Optional[Enum['direct', 'smart']] $passenger_spawn_method = undef, - Optional[Boolean] $passenger_load_shell_envvars = undef, - Optional[Boolean] $passenger_preload_bundler = undef, - Optional[Boolean] $passenger_rolling_restarts = undef, - Optional[Boolean] $passenger_resist_deployment_errors = undef, - Optional[String] $passenger_user = undef, - Optional[String] $passenger_group = undef, - Optional[Boolean] $passenger_friendly_error_pages = undef, - Optional[Integer] $passenger_min_instances = undef, - Optional[Integer] $passenger_max_instances = undef, - Optional[Integer] $passenger_max_preloader_idle_time = undef, - Optional[Integer] $passenger_force_max_concurrent_requests_per_process = undef, - Optional[Integer] $passenger_start_timeout = undef, - Optional[Enum['process', 'thread']] $passenger_concurrency_model = undef, - Optional[Integer] $passenger_thread_count = undef, - Optional[Integer] $passenger_max_requests = undef, - Optional[Integer] $passenger_max_request_time = undef, - Optional[Integer] $passenger_memory_limit = undef, - Optional[Integer] $passenger_stat_throttle_rate = undef, - Optional[Variant[String,Array[String]]] $passenger_pre_start = undef, - Optional[Boolean] $passenger_high_performance = undef, - Optional[Boolean] $passenger_buffer_upload = undef, - Optional[Boolean] $passenger_buffer_response = undef, - Optional[Boolean] $passenger_error_override = undef, - Optional[Integer] $passenger_max_request_queue_size = undef, - Optional[Integer] $passenger_max_request_queue_time = undef, - Optional[Boolean] $passenger_sticky_sessions = undef, - Optional[String] $passenger_sticky_sessions_cookie_name = undef, - Optional[String] $passenger_sticky_sessions_cookie_attributes = undef, - Optional[Boolean] $passenger_allow_encoded_slashes = undef, - Optional[String] $passenger_app_log_file = undef, - Optional[Boolean] $passenger_debugger = undef, - Optional[Integer] $passenger_lve_min_uid = undef, - $add_default_charset = undef, - $modsec_disable_vhost = undef, - Optional[Variant[Hash, Array]] $modsec_disable_ids = undef, - $modsec_disable_ips = undef, - Optional[Variant[Hash, Array]] $modsec_disable_msgs = undef, - Optional[Variant[Hash, Array]] $modsec_disable_tags = undef, - $modsec_body_limit = undef, - $jk_mounts = undef, - Boolean $auth_kerb = false, - $krb_method_negotiate = 'on', - $krb_method_k5passwd = 'on', - $krb_authoritative = 'on', - $krb_auth_realms = [], - $krb_5keytab = undef, - $krb_local_user_mapping = undef, - $krb_verify_kdc = 'on', - $krb_servicename = 'HTTP', - $krb_save_credentials = 'off', - Optional[Enum['on', 'off']] $keepalive = undef, - $keepalive_timeout = undef, - $max_keepalive_requests = undef, - $cas_attribute_prefix = undef, - $cas_attribute_delimiter = undef, - $cas_root_proxied_as = undef, - $cas_scrub_request_headers = undef, - $cas_sso_enabled = undef, - $cas_login_url = undef, - $cas_validate_url = undef, - $cas_validate_saml = undef, - $cas_cookie_path = undef, - Optional[String] $shib_compat_valid_user = undef, - Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name = undef, - Optional[Variant[String,Array[String]]] $comment = undef, - Hash $define = {}, - Boolean $auth_oidc = false, - Optional[Apache::OIDCSettings] $oidc_settings = undef, - Optional[Variant[Boolean,String]] $mdomain = undef, - Optional[Variant[String[1],Array[String[1]]]] $userdir = undef, + Optional[String] $modsec_audit_log = undef, + Optional[String] $modsec_audit_log_file = undef, + Optional[String] $modsec_audit_log_pipe = undef, + Array[Hash] $error_documents = [], + Optional[Variant[Stdlib::Absolutepath, Enum['disabled']]] $fallbackresource = undef, + Optional[String] $scriptalias = undef, + Array[Hash] $scriptaliases = [], + Optional[Integer] $limitreqfieldsize = undef, + Optional[Integer] $limitreqfields = undef, + Optional[Integer] $limitreqline = undef, + Optional[Integer] $limitreqbody = undef, + Optional[String] $proxy_dest = undef, + Optional[String] $proxy_dest_match = undef, + Optional[String] $proxy_dest_reverse_match = undef, + Optional[Variant[Array[Hash],Hash]] $proxy_pass = undef, + Optional[Variant[Array[Hash],Hash]] $proxy_pass_match = undef, + Boolean $proxy_requests = false, + String $suphp_addhandler = $apache::params::suphp_addhandler, + Enum['on', 'off'] $suphp_engine = $apache::params::suphp_engine, + Optional[String] $suphp_configpath = $apache::params::suphp_configpath, + Hash $php_flags = {}, + Hash $php_values = {}, + Hash $php_admin_flags = {}, + Hash $php_admin_values = {}, + Array[String] $no_proxy_uris = [], + Array[String] $no_proxy_uris_match = [], + Boolean $proxy_preserve_host = false, + Optional[String] $proxy_add_headers = undef, + Boolean $proxy_error_override = false, + String $redirect_source = '/', + Optional[Variant[Array[String],String]] $redirect_dest = undef, + Optional[Variant[Array[String],String]] $redirect_status = undef, + Optional[Array[String]] $redirectmatch_status = undef, + Optional[Array[String]] $redirectmatch_regexp = undef, + Optional[Array[String]] $redirectmatch_dest = undef, + Optional[String] $headers = undef, + Optional[Array[String]] $request_headers = undef, + Optional[Array[String]] $filters = undef, + Optional[Array] $rewrites = undef, + Optional[String] $rewrite_base = undef, + Optional[Variant[Array[String],String]] $rewrite_rule = undef, + Optional[Variant[Array[String],String]] $rewrite_cond = undef, + Boolean $rewrite_inherit = false, + Array[String] $setenv = [], + Array[String] $setenvif = [], + Array[String] $setenvifnocase = [], + Array $block = [], + Enum['absent', 'present'] $ensure = 'present', + Optional[String] $wsgi_application_group = undef, + Optional[Variant[String,Hash]] $wsgi_daemon_process = undef, + Optional[Hash] $wsgi_daemon_process_options = undef, + Optional[String] $wsgi_import_script = undef, + Optional[Hash] $wsgi_import_script_options = undef, + Optional[String] $wsgi_process_group = undef, + Optional[Hash] $wsgi_script_aliases_match = undef, + Optional[Hash] $wsgi_script_aliases = undef, + Optional[Enum['on', 'off', 'On', 'Off']] $wsgi_pass_authorization = undef, + Optional[Enum['On', 'Off']] $wsgi_chunked_request = undef, + Optional[String] $custom_fragment = undef, + Optional[Hash] $itk = undef, + Optional[String] $action = undef, + Optional[String] $fastcgi_server = undef, + Optional[String] $fastcgi_socket = undef, + Optional[String] $fastcgi_dir = undef, + Optional[Variant[Integer,String]] $fastcgi_idle_timeout = undef, + Variant[Array[String],String] $additional_includes = [], + Boolean $use_optional_includes = $apache::use_optional_includes, + Optional[String] $apache_version = $apache::apache_version, + Optional[Enum['on', 'off', 'nodecode']] $allow_encoded_slashes = undef, + Optional[Pattern[/^[\w-]+ [\w-]+$/]] $suexec_user_group = undef, + + Optional[Boolean] $h2_copy_files = undef, + Optional[Boolean] $h2_direct = undef, + Optional[Boolean] $h2_early_hints = undef, + Optional[Integer] $h2_max_session_streams = undef, + Optional[Boolean] $h2_modern_tls_only = undef, + Optional[Boolean] $h2_push = undef, + Optional[Integer] $h2_push_diary_size = undef, + Array[String] $h2_push_priority = [], + Array[String] $h2_push_resource = [], + Optional[Boolean] $h2_serialize_headers = undef, + Optional[Integer] $h2_stream_max_mem_size = undef, + Optional[Integer] $h2_tls_cool_down_secs = undef, + Optional[Integer] $h2_tls_warm_up_size = undef, + Optional[Boolean] $h2_upgrade = undef, + Optional[Integer] $h2_window_size = undef, + + Optional[Boolean] $passenger_enabled = undef, + Optional[String] $passenger_base_uri = undef, + Optional[Stdlib::Absolutepath] $passenger_ruby = undef, + Optional[Stdlib::Absolutepath] $passenger_python = undef, + Optional[Stdlib::Absolutepath] $passenger_nodejs = undef, + Optional[String] $passenger_meteor_app_settings = undef, + Optional[String] $passenger_app_env = undef, + Optional[Stdlib::Absolutepath] $passenger_app_root = undef, + Optional[String] $passenger_app_group_name = undef, + Optional[String] $passenger_app_start_command = undef, + Optional[Enum['meteor', 'node', 'rack', 'wsgi']] $passenger_app_type = undef, + Optional[String] $passenger_startup_file = undef, + Optional[String] $passenger_restart_dir = undef, + Optional[Enum['direct', 'smart']] $passenger_spawn_method = undef, + Optional[Boolean] $passenger_load_shell_envvars = undef, + Optional[Boolean] $passenger_preload_bundler = undef, + Optional[Boolean] $passenger_rolling_restarts = undef, + Optional[Boolean] $passenger_resist_deployment_errors = undef, + Optional[String] $passenger_user = undef, + Optional[String] $passenger_group = undef, + Optional[Boolean] $passenger_friendly_error_pages = undef, + Optional[Integer] $passenger_min_instances = undef, + Optional[Integer] $passenger_max_instances = undef, + Optional[Integer] $passenger_max_preloader_idle_time = undef, + Optional[Integer] $passenger_force_max_concurrent_requests_per_process = undef, + Optional[Integer] $passenger_start_timeout = undef, + Optional[Enum['process', 'thread']] $passenger_concurrency_model = undef, + Optional[Integer] $passenger_thread_count = undef, + Optional[Integer] $passenger_max_requests = undef, + Optional[Integer] $passenger_max_request_time = undef, + Optional[Integer] $passenger_memory_limit = undef, + Optional[Integer] $passenger_stat_throttle_rate = undef, + Optional[Variant[String,Array[String]]] $passenger_pre_start = undef, + Optional[Boolean] $passenger_high_performance = undef, + Optional[Boolean] $passenger_buffer_upload = undef, + Optional[Boolean] $passenger_buffer_response = undef, + Optional[Boolean] $passenger_error_override = undef, + Optional[Integer] $passenger_max_request_queue_size = undef, + Optional[Integer] $passenger_max_request_queue_time = undef, + Optional[Boolean] $passenger_sticky_sessions = undef, + Optional[String] $passenger_sticky_sessions_cookie_name = undef, + Optional[String] $passenger_sticky_sessions_cookie_attributes = undef, + Optional[Boolean] $passenger_allow_encoded_slashes = undef, + Optional[String] $passenger_app_log_file = undef, + Optional[Boolean] $passenger_debugger = undef, + Optional[Integer] $passenger_lve_min_uid = undef, + Optional[String] $add_default_charset = undef, + Boolean $modsec_disable_vhost = false, + Optional[Variant[Hash, Array]] $modsec_disable_ids = undef, + Optional[Array[String]] $modsec_disable_ips = undef, + Optional[Variant[Hash, Array]] $modsec_disable_msgs = undef, + Optional[Variant[Hash, Array]] $modsec_disable_tags = undef, + Optional[String] $modsec_body_limit = undef, + Optional[Array[Hash]] $jk_mounts = undef, + Boolean $auth_kerb = false, + Enum['on', 'off'] $krb_method_negotiate = 'on', + Enum['on', 'off'] $krb_method_k5passwd = 'on', + Enum['on', 'off'] $krb_authoritative = 'on', + Array[String] $krb_auth_realms = [], + Optional[String] $krb_5keytab = undef, + Optional[Enum['on', 'off']] $krb_local_user_mapping = undef, + Enum['on', 'off'] $krb_verify_kdc = 'on', + String $krb_servicename = 'HTTP', + Enum['on', 'off'] $krb_save_credentials = 'off', + Optional[Enum['on', 'off']] $keepalive = undef, + Optional[Variant[Integer,String]] $keepalive_timeout = undef, + Optional[Variant[Integer,String]] $max_keepalive_requests = undef, + Optional[String] $cas_attribute_prefix = undef, + Optional[String] $cas_attribute_delimiter = undef, + Optional[String] $cas_root_proxied_as = undef, + Boolean $cas_scrub_request_headers = false, + Boolean $cas_sso_enabled = false, + Optional[String] $cas_login_url = undef, + Optional[String] $cas_validate_url = undef, + Boolean $cas_validate_saml = false, + Optional[String] $cas_cookie_path = undef, + Optional[String] $shib_compat_valid_user = undef, + Optional[Enum['On', 'on', 'Off', 'off', 'DNS', 'dns']] $use_canonical_name = undef, + Optional[Variant[String,Array[String]]] $comment = undef, + Hash $define = {}, + Boolean $auth_oidc = false, + Optional[Apache::OIDCSettings] $oidc_settings = undef, + Optional[Variant[Boolean,String]] $mdomain = undef, + Optional[Variant[String[1],Array[String[1]]]] $userdir = undef, ) { # The base class must be included first because it is used by parameter defaults if ! defined(Class['apache']) { diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp index 56e8b1258c..3e6d261b08 100644 --- a/manifests/vhost/custom.pp +++ b/manifests/vhost/custom.pp @@ -16,10 +16,10 @@ # Specifies whether to validate the configuration file before notifying the Apache service. # define apache::vhost::custom ( - $content, - $ensure = 'present', - $priority = '25', - $verify_config = true, + String $content, + String $ensure = 'present', + Variant[Integer,String] $priority = '25', + Boolean $verify_config = true, ) { include apache diff --git a/manifests/vhost/fragment.pp b/manifests/vhost/fragment.pp index 59d3887968..1a298a31ad 100644 --- a/manifests/vhost/fragment.pp +++ b/manifests/vhost/fragment.pp @@ -58,10 +58,10 @@ # define apache::vhost::fragment ( String[1] $vhost, - Optional[Integer[0]] $port = undef, - $priority = undef, - Optional[String] $content = undef, - Integer[0] $order = 900, + Optional[Integer[0]] $port = undef, + Optional[Variant[Integer,String]] $priority = undef, + Optional[String] $content = undef, + Integer[0] $order = 900, ) { # This copies the logic from apache::vhost if $priority { diff --git a/manifests/vhosts.pp b/manifests/vhosts.pp index 6d0fcf27f2..a212a5c31a 100644 --- a/manifests/vhosts.pp +++ b/manifests/vhosts.pp @@ -19,7 +19,7 @@ # `apache::vhost` defined type's parameters. # class apache::vhosts ( - $vhosts = {}, + Hash $vhosts = {}, ) { include apache create_resources('apache::vhost', $vhosts)