From c2a74446357b30c2ca349bc217a10225b92cd4be Mon Sep 17 00:00:00 2001 From: Ramesh Sencha Date: Fri, 22 Sep 2023 18:05:46 +0530 Subject: [PATCH] (CAT-1449) - Cleanup for deprecated content from module --- HISTORY.md | 27 ++++ REFERENCE.md | 226 +++++++++-------------------- manifests/init.pp | 29 +--- manifests/mod/passenger.pp | 197 ++++++++++--------------- manifests/vhost.pp | 37 +---- spec/acceptance/vhost_spec.rb | 9 -- spec/classes/mod/passenger_spec.rb | 22 ++- spec/defines/vhost_spec.rb | 10 -- templates/mod/passenger.conf.epp | 54 +++---- templates/vhost/_scriptalias.erb | 16 +- 10 files changed, 206 insertions(+), 421 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 3d6897f091..e40ff27df2 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,30 @@ +## 11.0.0 +### Summary +This is release where have done cleanup as well as some feature addition. +#### Added +- Parameters for `apache::mod::passenger`: + - `passenger_max_request_queue_time` + - `passenger_admin_panel_url` + - `passenger_admin_panel_auth_type` + - `passenger_admin_panel_username` + - `passenger_admin_panel_password` + - `passenger_app_log_file` + - `passenger_dump_config_manifest` +#### Removed +- Parameters for `apache::mod::passenger`: + - `rails_ruby` + - `rails_base_uri` + - `rack_base_uri` + - `rails_user_switching` + - `rails_default_user` + - `rails_allow_mod_rewrite` + - `rails_spawn_method` + - `rails_auto_detect` + - `rack_auto_detect` + - `wsgi_auto_detect` + - `rails_app_spawner_idle_time` + - `rails_framework_app_spawner_idle_time` + ## 3.2.0 ### Summary This is a clean release to prepare for several planned backwards incompatible changes. diff --git a/REFERENCE.md b/REFERENCE.md index d09159549b..3f1f477807 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -75,6 +75,8 @@ mod-pagespeed-stable package. The module does however require that the package b or be installable using the system's default package provider. You should ensure that this pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail. * [`apache::mod::passenger`](#apache--mod--passenger): Installs `mod_pasenger`. +> **Note**: This module does not install the passenger gem. You must install the gem yourself. +> **Note**: This module support Passenger 5.0.0 and higher. * [`apache::mod::perl`](#apache--mod--perl): Installs `mod_perl`. * [`apache::mod::peruser`](#apache--mod--peruser): Installs `mod_peruser`. * [`apache::mod::php`](#apache--mod--php): Installs `mod_php`. @@ -217,7 +219,6 @@ The following parameters are available in the `apache` class: * [`default_ssl_key`](#-apache--default_ssl_key) * [`default_ssl_reload_on_change`](#-apache--default_ssl_reload_on_change) * [`default_ssl_vhost`](#-apache--default_ssl_vhost) -* [`default_type`](#-apache--default_type) * [`default_vhost`](#-apache--default_vhost) * [`dev_packages`](#-apache--dev_packages) * [`docroot`](#-apache--docroot) @@ -279,7 +280,6 @@ The following parameters are available in the `apache` class: * [`limitreqfieldsize`](#-apache--limitreqfieldsize) * [`limitreqline`](#-apache--limitreqline) * [`ip`](#-apache--ip) -* [`purge_vdir`](#-apache--purge_vdir) * [`conf_enabled`](#-apache--conf_enabled) * [`vhost_enable_dir`](#-apache--vhost_enable_dir) * [`manage_vhost_enable_dir`](#-apache--manage_vhost_enable_dir) @@ -463,16 +463,6 @@ apache::vhost { 'default-ssl': Default value: `false` -##### `default_type` - -Data type: `String` - -_Apache 2.2 only_. Sets the MIME `content-type` sent if the server cannot otherwise -determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and -newer, and is only for backwards compatibility in configuration files. - -Default value: `'none'` - ##### `default_vhost` Data type: `Boolean` @@ -1090,15 +1080,6 @@ Specifies the ip address Default value: `undef` -##### `purge_vdir` - -Data type: `Boolean` - -Removes all other Apache configs and virtual hosts.
-> **Note**: This parameter is deprecated in favor of the `purge_configs` parameter.
- -Default value: `false` - ##### `conf_enabled` Data type: `Optional[Stdlib::Absolutepath]` @@ -4443,10 +4424,15 @@ The following parameters are available in the `apache::mod::passenger` class: * [`mod_package`](#-apache--mod--passenger--mod_package) * [`mod_package_ensure`](#-apache--mod--passenger--mod_package_ensure) * [`mod_path`](#-apache--mod--passenger--mod_path) +* [`passenger_admin_panel_url`](#-apache--mod--passenger--passenger_admin_panel_url) +* [`passenger_admin_panel_auth_type`](#-apache--mod--passenger--passenger_admin_panel_auth_type) +* [`passenger_admin_panel_username`](#-apache--mod--passenger--passenger_admin_panel_username) +* [`passenger_admin_panel_password`](#-apache--mod--passenger--passenger_admin_panel_password) * [`passenger_allow_encoded_slashes`](#-apache--mod--passenger--passenger_allow_encoded_slashes) * [`passenger_anonymous_telemetry_proxy`](#-apache--mod--passenger--passenger_anonymous_telemetry_proxy) * [`passenger_app_env`](#-apache--mod--passenger--passenger_app_env) * [`passenger_app_group_name`](#-apache--mod--passenger--passenger_app_group_name) +* [`passenger_app_log_file`](#-apache--mod--passenger--passenger_app_log_file) * [`passenger_app_root`](#-apache--mod--passenger--passenger_app_root) * [`passenger_app_type`](#-apache--mod--passenger--passenger_app_type) * [`passenger_base_uri`](#-apache--mod--passenger--passenger_base_uri) @@ -4465,6 +4451,7 @@ The following parameters are available in the `apache::mod::passenger` class: * [`passenger_disable_log_prefix`](#-apache--mod--passenger--passenger_disable_log_prefix) * [`passenger_disable_security_update_check`](#-apache--mod--passenger--passenger_disable_security_update_check) * [`passenger_enabled`](#-apache--mod--passenger--passenger_enabled) +* [`passenger_dump_config_manifest`](#-apache--mod--passenger--passenger_dump_config_manifest) * [`passenger_error_override`](#-apache--mod--passenger--passenger_error_override) * [`passenger_file_descriptor_log_file`](#-apache--mod--passenger--passenger_file_descriptor_log_file) * [`passenger_fly_with`](#-apache--mod--passenger--passenger_fly_with) @@ -4486,6 +4473,7 @@ The following parameters are available in the `apache::mod::passenger` class: * [`passenger_max_request_queue_size`](#-apache--mod--passenger--passenger_max_request_queue_size) * [`passenger_max_request_time`](#-apache--mod--passenger--passenger_max_request_time) * [`passenger_max_requests`](#-apache--mod--passenger--passenger_max_requests) +* [`passenger_max_request_queue_time`](#-apache--mod--passenger--passenger_max_request_queue_time) * [`passenger_memory_limit`](#-apache--mod--passenger--passenger_memory_limit) * [`passenger_meteor_app_settings`](#-apache--mod--passenger--passenger_meteor_app_settings) * [`passenger_min_instances`](#-apache--mod--passenger--passenger_min_instances) @@ -4515,22 +4503,11 @@ The following parameters are available in the `apache::mod::passenger` class: * [`passenger_use_global_queue`](#-apache--mod--passenger--passenger_use_global_queue) * [`passenger_user`](#-apache--mod--passenger--passenger_user) * [`passenger_user_switching`](#-apache--mod--passenger--passenger_user_switching) -* [`rack_auto_detect`](#-apache--mod--passenger--rack_auto_detect) * [`rack_autodetect`](#-apache--mod--passenger--rack_autodetect) -* [`rack_base_uri`](#-apache--mod--passenger--rack_base_uri) * [`rack_env`](#-apache--mod--passenger--rack_env) -* [`rails_allow_mod_rewrite`](#-apache--mod--passenger--rails_allow_mod_rewrite) -* [`rails_app_spawner_idle_time`](#-apache--mod--passenger--rails_app_spawner_idle_time) -* [`rails_auto_detect`](#-apache--mod--passenger--rails_auto_detect) * [`rails_autodetect`](#-apache--mod--passenger--rails_autodetect) -* [`rails_base_uri`](#-apache--mod--passenger--rails_base_uri) -* [`rails_default_user`](#-apache--mod--passenger--rails_default_user) * [`rails_env`](#-apache--mod--passenger--rails_env) * [`rails_framework_spawner_idle_time`](#-apache--mod--passenger--rails_framework_spawner_idle_time) -* [`rails_ruby`](#-apache--mod--passenger--rails_ruby) -* [`rails_spawn_method`](#-apache--mod--passenger--rails_spawn_method) -* [`rails_user_switching`](#-apache--mod--passenger--rails_user_switching) -* [`wsgi_auto_detect`](#-apache--mod--passenger--wsgi_auto_detect) ##### `manage_repo` @@ -4589,6 +4566,39 @@ Specifies a path to the module. Do not manually set this parameter without a spe Default value: `undef` +##### `passenger_admin_panel_url` + +Data type: `Optional[String]` + +Specifies a Fuse Panel URL that the Passenger to to enable monitoring, administering, analysis and troubleshooting of this Passenger instance and apps. + +Default value: `undef` + +##### `passenger_admin_panel_auth_type` + +Data type: `Optional[Enum['basic']]` + +Specifies the authentication type to use for the Fuse Panel. Currently it support only basic type of authentiction. +Ref : https://www.phusionpassenger.com/library/config/apache/reference/#passengeradminpanelauthtype + +Default value: `undef` + +##### `passenger_admin_panel_username` + +Data type: `Optional[String]` + +The username that Passenger should use when connecting to the Fuse Panel with basic authentication. + +Default value: `undef` + +##### `passenger_admin_panel_password` + +Data type: `Optional[String]` + +The password that Passenger should use when connecting to the Fuse Panel with basic authentication. + +Default value: `undef` + ##### `passenger_allow_encoded_slashes` Data type: `Optional[Apache::OnOff]` @@ -4626,6 +4636,14 @@ Sets the name of the application group that the current application should belon Default value: `undef` +##### `passenger_app_log_file` + +Data type: `Optional[String]` + +File path to application specifile log file. By default passenger will write all application log messages to the Passenger log file. + +Default value: `undef` + ##### `passenger_app_root` Data type: `Optional[String]` @@ -4772,6 +4790,14 @@ Toggles whether Passenger should be enabled for that particular context. Default value: `undef` +##### `passenger_dump_config_manifest` + +Data type: `Optional[String]` + +Dumps the configuration manifest to the given file. + +Default value: `undef` + ##### `passenger_error_override` Data type: `Optional[Apache::OnOff]` @@ -4945,6 +4971,15 @@ The maximum number of requests an application process will process. Default value: `undef` +##### `passenger_max_request_queue_time` + +Data type: `Optional[Integer]` + +The maximum amount of time, in seconds, that a request may be queued before Passenger will return an error. +This option specifies the maximum time a request may spend in that queue. If a request in the queue reaches this specified limit, then Passenger will send a "504 Gateway Timeout" error for that request. + +Default value: `undef` + ##### `passenger_memory_limit` Data type: `Optional[Integer]` @@ -5179,14 +5214,6 @@ Toggles whether to attempt to enable user account sandboxing, also known as user Default value: `undef` -##### `rack_auto_detect` - -Data type: `Optional[String]` - -This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead. - -Default value: `undef` - ##### `rack_autodetect` Data type: `Optional[String]` @@ -5195,14 +5222,6 @@ This option has been removed in version 4.0.0 as part of an optimization. You sh Default value: `undef` -##### `rack_base_uri` - -Data type: `Optional[String]` - -Deprecated in 3.0.0 in favor of PassengerBaseURI. - -Default value: `undef` - ##### `rack_env` Data type: `Optional[String]` @@ -5211,30 +5230,6 @@ Alias for PassengerAppEnv. Default value: `undef` -##### `rails_allow_mod_rewrite` - -Data type: `Optional[String]` - -This option doesn't do anything anymore since version 4.0.0. - -Default value: `undef` - -##### `rails_app_spawner_idle_time` - -Data type: `Optional[String]` - -This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime. - -Default value: `undef` - -##### `rails_auto_detect` - -Data type: `Optional[String]` - -This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead. - -Default value: `undef` - ##### `rails_autodetect` Data type: `Optional[String]` @@ -5243,22 +5238,6 @@ This option has been removed in version 4.0.0 as part of an optimization. You sh Default value: `undef` -##### `rails_base_uri` - -Data type: `Optional[String]` - -Deprecated in 3.0.0 in favor of PassengerBaseURI. - -Default value: `undef` - -##### `rails_default_user` - -Data type: `Optional[String]` - -Deprecated in 3.0.0 in favor of PassengerDefaultUser - -Default value: `undef` - ##### `rails_env` Data type: `Optional[String]` @@ -5276,38 +5255,6 @@ altogether. You should use smart spawning instead. Default value: `undef` -##### `rails_ruby` - -Data type: `Optional[String]` - -Deprecated in 3.0.0 in favor of PassengerRuby. - -Default value: `undef` - -##### `rails_spawn_method` - -Data type: `Optional[String]` - -Deprecated in 3.0.0 in favor of PassengerSpawnMethod. - -Default value: `undef` - -##### `rails_user_switching` - -Data type: `Optional[String]` - -Deprecated in 3.0.0 in favor of PassengerUserSwitching. - -Default value: `undef` - -##### `wsgi_auto_detect` - -Data type: `Optional[String]` - -This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead. - -Default value: `undef` - ### `apache::mod::perl` Installs `mod_perl`. @@ -7753,7 +7700,6 @@ The following parameters are available in the `apache::vhost` defined type: * [`rewrite_cond`](#-apache--vhost--rewrite_cond) * [`rewrite_inherit`](#-apache--vhost--rewrite_inherit) * [`scriptalias`](#-apache--vhost--scriptalias) -* [`scriptaliases`](#-apache--vhost--scriptaliases) * [`serveradmin`](#-apache--vhost--serveradmin) * [`serveraliases`](#-apache--vhost--serveraliases) * [`servername`](#-apache--vhost--servername) @@ -7947,11 +7893,6 @@ a corresponding context, such as `` or the `aliases` parameter. As described in the `mod_alias` documentation, add more specific `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more general ones to avoid shadowing.
-> **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because -you can precisely control the order of various alias directives. Defining `ScriptAliases` -using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after -*all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` -directives. This often causes problems; for example, this could cause problems with Nagios.
If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`, the `Alias` directive might not be able to honor the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details. @@ -9761,39 +9702,6 @@ Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as Default value: `undef` -##### `scriptaliases` - -Data type: `Array[Hash]` - -> **Note**: This parameter is deprecated in favor of the `aliases` parameter.
-Passes an array of hashes to the virtual host to create either ScriptAlias or -ScriptAliasMatch statements per the `mod_alias` documentation. -``` puppet -scriptaliases => [ - { - alias => '/myscript', - path => '/usr/share/myscript', - }, - { - aliasmatch => '^/foo(.*)', - path => '/usr/share/fooscripts$1', - }, - { - aliasmatch => '^/bar/(.*)', - path => '/usr/share/bar/wrapper.sh/$1', - }, - { - alias => '/neatscript', - path => '/usr/share/neatscript', - }, -] -``` -The ScriptAlias and ScriptAliasMatch directives are created in the order specified. -As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases -before more general ones to avoid shadowing. - -Default value: `[]` - ##### `serveradmin` Data type: `Optional[String]` diff --git a/manifests/init.pp b/manifests/init.pp index dc23d7ab68..4a76ce62d6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -105,11 +105,6 @@ # ``` # **Note**: SSL virtual hosts only respond to HTTPS queries. # -# @param default_type -# _Apache 2.2 only_. Sets the MIME `content-type` sent if the server cannot otherwise -# determine an appropriate `content-type`. This directive is deprecated in Apache 2.4 and -# newer, and is only for backwards compatibility in configuration files. -# # @param default_vhost # Configures a default virtual host when the class is declared.
# To configure customized virtual hosts, set this parameter's @@ -423,10 +418,6 @@ # # @param ip # Specifies the ip address -# -# @param purge_vdir -# Removes all other Apache configs and virtual hosts.
-# > **Note**: This parameter is deprecated in favor of the `purge_configs` parameter.
# # @param conf_enabled # Whether the additional config files in `/etc/apache2/conf-enabled` should be managed. @@ -472,7 +463,6 @@ Optional[Stdlib::Absolutepath] $default_ssl_crl = undef, Optional[String] $default_ssl_crl_check = undef, Boolean $default_ssl_reload_on_change = false, - String $default_type = 'none', Optional[Variant[Array, String]] $dev_packages = $apache::params::dev_packages, Optional[String] $ip = undef, Boolean $service_enable = true, @@ -481,7 +471,6 @@ Optional[String] $service_restart = undef, Boolean $purge_configs = true, Optional[Boolean] $purge_vhost_dir = undef, - Boolean $purge_vdir = false, Optional[String[1]] $serveradmin = undef, Apache::OnOff $sendfile = 'On', Optional[Apache::OnOff] $ldap_verify_server_cert = undef, @@ -599,17 +588,9 @@ service_restart => $service_restart, } - # Deprecated backwards-compatibility - if $purge_vdir { - warning('Class[\'apache\'] parameter purge_vdir is deprecated in favor of purge_configs') - $purge_confd = $purge_vdir - } else { - $purge_confd = $purge_configs - } - # Set purge vhostd appropriately if $purge_vhost_dir == undef { - $purge_vhostd = $purge_confd + $purge_vhostd = $purge_configs } else { $purge_vhostd = $purge_vhost_dir } @@ -627,8 +608,8 @@ file { $confd_dir: ensure => directory, recurse => true, - purge => $purge_confd, - force => $purge_confd, + purge => $purge_configs, + force => $purge_configs, notify => Class['Apache::Service'], require => Package['httpd'], } @@ -637,8 +618,8 @@ file { $conf_enabled: ensure => directory, recurse => true, - purge => $purge_confd, - force => $purge_confd, + purge => $purge_configs, + force => $purge_configs, notify => Class['Apache::Service'], require => Package['httpd'], } diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp index 68fcd62abb..3f931eb9d1 100644 --- a/manifests/mod/passenger.pp +++ b/manifests/mod/passenger.pp @@ -1,5 +1,7 @@ # @summary # Installs `mod_pasenger`. +# > **Note**: This module does not install the passenger gem. You must install the gem yourself. +# > **Note**: This module support Passenger 5.0.0 and higher. # # @param manage_repo # Toggle whether to manage yum repo if on a RedHat node. @@ -23,6 +25,19 @@ # @param mod_path # Specifies a path to the module. Do not manually set this parameter without a special reason. # +# @param passenger_admin_panel_url +# Specifies a Fuse Panel URL that the Passenger to to enable monitoring, administering, analysis and troubleshooting of this Passenger instance and apps. +# +# @param passenger_admin_panel_auth_type +# Specifies the authentication type to use for the Fuse Panel. Currently it support only basic type of authentiction. +# Ref : https://www.phusionpassenger.com/library/config/apache/reference/#passengeradminpanelauthtype +# +# @param passenger_admin_panel_username +# The username that Passenger should use when connecting to the Fuse Panel with basic authentication. +# +# @param passenger_admin_panel_password +# The password that Passenger should use when connecting to the Fuse Panel with basic authentication. +# # @param passenger_allow_encoded_slashes # Toggle whether URLs with encoded slashes (%2f) can be used (by default Apache does not support this). # @@ -40,6 +55,9 @@ # @param passenger_app_group_name # Sets the name of the application group that the current application should belong to. # +# @param passenger_app_log_file +# File path to application specifile log file. By default passenger will write all application log messages to the Passenger log file. +# # @param passenger_app_root # Path to the application root which allows access independent from the DocumentRoot. # @@ -96,6 +114,9 @@ # @param passenger_enabled # Toggles whether Passenger should be enabled for that particular context. # +# @param passenger_dump_config_manifest +# Dumps the configuration manifest to the given file. +# # @param passenger_error_override # Toggles whether Apache will intercept and handle responses with HTTP status codes of 400 and higher. # @@ -164,6 +185,10 @@ # @param passenger_max_requests # The maximum number of requests an application process will process. # +# @param passenger_max_request_queue_time +# The maximum amount of time, in seconds, that a request may be queued before Passenger will return an error. +# This option specifies the maximum time a request may spend in that queue. If a request in the queue reaches this specified limit, then Passenger will send a "504 Gateway Timeout" error for that request. +# # @param passenger_memory_limit # The maximum amount of memory that an application process may use, in megabytes. # @@ -253,36 +278,15 @@ # @param passenger_user_switching # Toggles whether to attempt to enable user account sandboxing, also known as user switching. # -# @param rack_auto_detect -# This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead. -# # @param rack_autodetect # This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead. # -# @param rack_base_uri -# Deprecated in 3.0.0 in favor of PassengerBaseURI. -# # @param rack_env # Alias for PassengerAppEnv. # -# @param rails_allow_mod_rewrite -# This option doesn't do anything anymore since version 4.0.0. -# -# @param rails_app_spawner_idle_time -# This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime. -# -# @param rails_auto_detect -# This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead. -# # @param rails_autodetect # This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead. # -# @param rails_base_uri -# Deprecated in 3.0.0 in favor of PassengerBaseURI. -# -# @param rails_default_user -# Deprecated in 3.0.0 in favor of PassengerDefaultUser -# # @param rails_env # Alias for PassengerAppEnv. # @@ -290,18 +294,6 @@ # This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed # altogether. You should use smart spawning instead. # -# @param rails_ruby -# Deprecated in 3.0.0 in favor of PassengerRuby. -# -# @param rails_spawn_method -# Deprecated in 3.0.0 in favor of PassengerSpawnMethod. -# -# @param rails_user_switching -# Deprecated in 3.0.0 in favor of PassengerUserSwitching. -# -# @param wsgi_auto_detect -# This option has been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead. -# # @note # In Passenger source code you can strip out what are all the available options by looking in # - src/apache2_module/Configuration.cpp @@ -329,6 +321,12 @@ Optional[String] $mod_package = undef, Optional[String] $mod_package_ensure = undef, Optional[String] $mod_path = undef, + Optional[Integer] $passenger_max_request_queue_time = undef, + Optional[String] $passenger_admin_panel_url = undef, + Optional[Enum['basic']] $passenger_admin_panel_auth_type = undef, + Optional[String] $passenger_admin_panel_username = undef, + Optional[String] $passenger_admin_panel_password = undef, + Optional[String] $passenger_app_log_file = undef, Optional[Apache::OnOff] $passenger_allow_encoded_slashes = undef, Optional[String] $passenger_anonymous_telemetry_proxy = undef, Optional[String] $passenger_app_env = undef, @@ -351,6 +349,7 @@ Optional[Boolean] $passenger_disable_log_prefix = undef, Optional[Apache::OnOff] $passenger_disable_security_update_check = undef, Optional[Apache::OnOff] $passenger_enabled = undef, + Optional[String] $passenger_dump_config_manifest = undef, Optional[Apache::OnOff] $passenger_error_override = undef, Optional[String] $passenger_file_descriptor_log_file = undef, Optional[String] $passenger_fly_with = undef, @@ -401,22 +400,11 @@ Optional[String] $passenger_use_global_queue = undef, Optional[String] $passenger_user = undef, Optional[Apache::OnOff] $passenger_user_switching = undef, - Optional[String] $rack_auto_detect = undef, Optional[String] $rack_autodetect = undef, - Optional[String] $rack_base_uri = undef, Optional[String] $rack_env = undef, - Optional[String] $rails_allow_mod_rewrite = undef, - Optional[String] $rails_app_spawner_idle_time = undef, - Optional[String] $rails_auto_detect = undef, Optional[String] $rails_autodetect = undef, - Optional[String] $rails_base_uri = undef, - Optional[String] $rails_default_user = undef, Optional[String] $rails_env = undef, Optional[String] $rails_framework_spawner_idle_time = undef, - Optional[String] $rails_ruby = undef, - Optional[String] $rails_spawn_method = undef, - Optional[String] $rails_user_switching = undef, - Optional[String] $wsgi_auto_detect = undef, ) inherits apache::params { include apache if $passenger_installed_version { @@ -659,6 +647,10 @@ if (versioncmp($passenger_installed_version, '3.0.0') < 0) { fail("Passenger config option :: passenger_resist_deployment_errors is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported") } + + if (versioncmp($passenger_installed_version, '5.2.0') > 0) { + fail('REMOVED PASSENGER OPTION :: passenger_resist_deployment_errors :: -- no message on the current passenger reference webpage -- ') + } } if $passenger_resolve_symlinks_in_document_root { if (versioncmp($passenger_installed_version, '3.0.0') < 0) { @@ -750,14 +742,6 @@ fail("Passenger config option :: passenger_thread_count is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported") } } - if $passenger_use_global_queue { - if (versioncmp($passenger_installed_version, '4.0.0') > 0) { - fail('REMOVED PASSENGER OPTION :: passenger_use_global_queue :: -- no message on the current passenger reference webpage -- ') - } - if (versioncmp($passenger_installed_version, '2.0.4') < 0) { - fail("Passenger config option :: passenger_use_global_queue is not introduced until version 2.0.4 :: ${passenger_installed_version} is the version reported") - } - } if $passenger_user { if (versioncmp($passenger_installed_version, '4.0.0') < 0) { fail("Passenger config option :: passenger_user is not introduced until version 4.0.0 :: ${passenger_installed_version} is the version reported") @@ -768,74 +752,49 @@ fail("Passenger config option :: passenger_user_switching is not introduced until version 3.0.0 :: ${passenger_installed_version} is the version reported") } } - if ($rack_auto_detect or $rack_autodetect) { - if (versioncmp($passenger_installed_version, '4.0.0') > 0) { - fail('REMOVED PASSENGER OPTION :: rack_auto_detect :: These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.') - } - } - if $rack_base_uri { - if (versioncmp($passenger_installed_version, '3.0.0') > 0) { - warning('DEPRECATED PASSENGER OPTION :: rack_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.') - } - } if $rack_env { if (versioncmp($passenger_installed_version, '2.0.0') < 0) { fail("Passenger config option :: rack_env is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported") } } - if $rails_allow_mod_rewrite { - if (versioncmp($passenger_installed_version, '4.0.0') > 0) { - warning("DEPRECATED PASSENGER OPTION :: rails_allow_mod_rewrite :: This option doesn't do anything anymore in since version 4.0.0.") - } - } - if $rails_app_spawner_idle_time { - if (versioncmp($passenger_installed_version, '4.0.0') > 0) { - fail('REMOVED PASSENGER OPTION :: rails_app_spawner_idle_time :: This option has been removed in version 4.0.0, and replaced with PassengerMaxPreloaderIdleTime.') - } - } - if ($rails_auto_detect or $rails_autodetect) { - if (versioncmp($passenger_installed_version, '4.0.0') > 0) { - fail('REMOVED PASSENGER OPTION :: rails_auto_detect :: These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.') - } - } - if $rails_base_uri { - if (versioncmp($passenger_installed_version, '3.0.0') > 0) { - warning('DEPRECATED PASSENGER OPTION :: rails_base_uri :: Deprecated in 3.0.0 in favor of PassengerBaseURI.') + if $rails_env { + if (versioncmp($passenger_installed_version, '2.0.0') < 0) { + fail("Passenger config option :: rails_env is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported") } } - if $rails_default_user { - if (versioncmp($passenger_installed_version, '3.0.0') > 0) { - warning('DEPRECATED PASSENGER OPTION :: rails_default_user :: Deprecated in 3.0.0 in favor of PassengerDefaultUser.') + if $passenger_max_request_queue_time { + if (versioncmp($passenger_installed_version, '5.1.12') < 0) { + fail("Passenger config option :: passenger_base_uri is not introduced until version 5.1.12 :: ${passenger_installed_version} is the version reported") } } - if $rails_env { - if (versioncmp($passenger_installed_version, '2.0.0') < 0) { - fail("Passenger config option :: rails_env is not introduced until version 2.0.0 :: ${passenger_installed_version} is the version reported") + if $passenger_admin_panel_url { + if (versioncmp($passenger_installed_version, '5.2.2') < 0) { + fail("Passenger config option :: passenger_base_uri is not introduced until version 5.2.2 :: ${passenger_installed_version} is the version reported") } } - if $rails_framework_spawner_idle_time { - if (versioncmp($passenger_installed_version, '4.0.0') > 0) { - fail('REMOVED PASSENGER OPTION :: rails_framework_spawner_idle_time :: This option is no longer available in version 4.0.0. There is no alternative because framework spawning has been removed altogether. You should use smart spawning instead.') + if $passenger_admin_panel_auth_type { + if (versioncmp($passenger_installed_version, '5.2.2') < 0) { + fail("Passenger config option :: passenger_base_uri is not introduced until version 5.2.2 :: ${passenger_installed_version} is the version reported") } } - if $rails_ruby { - if (versioncmp($passenger_installed_version, '3.0.0') > 0) { - warning('DEPRECATED PASSENGER OPTION :: rails_ruby :: Deprecated in 3.0.0 in favor of PassengerRuby.') + if $passenger_admin_panel_username { + if (versioncmp($passenger_installed_version, '5.2.2') < 0) { + fail("Passenger config option :: passenger_base_uri is not introduced until version 5.2.2 :: ${passenger_installed_version} is the version reported") } } - if $rails_spawn_method { - if (versioncmp($passenger_installed_version, '3.0.0') > 0) { - warning('DEPRECATED PASSENGER OPTION :: rails_spawn_method :: Deprecated in 3.0.0 in favor of PassengerSpawnMethod.') + if $passenger_admin_panel_password { + if (versioncmp($passenger_installed_version, '5.2.2') < 0) { + fail("Passenger config option :: passenger_base_uri is not introduced until version 5.2.2 :: ${passenger_installed_version} is the version reported") } } - if $rails_user_switching { - if (versioncmp($passenger_installed_version, '3.0.0') > 0) { - warning('DEPRECATED PASSENGER OPTION :: rails_user_switching :: Deprecated in 3.0.0 in favor of PassengerUserSwitching.') + if $passenger_dump_config_manifest { + if (versioncmp($passenger_installed_version, '5.2.2') < 0) { + fail("Passenger config option :: passenger_base_uri is not introduced until version 5.2.2 :: ${passenger_installed_version} is the version reported") } } - if $wsgi_auto_detect { - if (versioncmp($passenger_installed_version, '4.0.0') > 0) { - fail('REMOVED PASSENGER OPTION :: wsgi_auto_detect :: These options have been removed in version 4.0.0 as part of an optimization. You should use PassengerEnabled instead.') + if $passenger_app_log_file { + if (versioncmp($passenger_installed_version, '5.3.0') < 0) { + fail("Passenger config option :: passenger_base_uri is not introduced until version 5.3.0 :: ${passenger_installed_version} is the version reported") } } } @@ -899,8 +858,13 @@ } # Template uses: + # - $passenger_admin_panel_url : since 5.2.2 + # - $passenger_admin_panel_auth_type : since 5.2.2 + # - $passenger_admin_panel_username : since 5.2.2 + # - $passenger_admin_panel_password : since 5.2.2 # - $passenger_allow_encoded_slashes : since 4.0.0. # - $passenger_app_env : since 4.0.0. + # - $passenger_app_log_file : since 5.3.0 # - $passenger_app_group_name : since 4.0.0. # - $passenger_app_root : since 4.0.0. # - $passenger_app_type : since 4.0.25. @@ -915,6 +879,7 @@ # - $passenger_default_ruby : since 4.0.0. # - $passenger_default_user : since 3.0.0. # - $passenger_disable_security_update_check : since 5.1.0. + # - $passenger_dump_config_manifest : since 5.2.2 # - $passenger_enabled : since 4.0.0. # - $passenger_error_override : since 4.0.24. # - $passenger_file_descriptor_log_file : since 5.0.5. @@ -934,6 +899,7 @@ # - $passenger_max_pool_size : since 1.0.0. # - $passenger_max_preloader_idle_time : since 4.0.0. # - $passenger_max_request_queue_size : since 4.0.15. + # - $passenger_max_request_queue_time : since 5.1.12 # - $passenger_max_request_time : since 3.0.0. # - $passenger_max_requests : since 3.0.0. # - $passenger_memory_limit : since 3.0.0. @@ -963,26 +929,20 @@ # - $passenger_use_global_queue : since 2.0.4.Deprecated in 4.0.0. # - $passenger_user : since 4.0.0. # - $passenger_user_switching : since 3.0.0. - # - $rack_auto_detect : since unkown. Deprecated in 4.0.0. - # - $rack_base_uri : since unkown. Deprecated in 3.0.0. # - $rack_env : since 2.0.0. - # - $rails_allow_mod_rewrite : since unkown. Deprecated in 4.0.0. - # - $rails_app_spawner_idle_time : since unkown. Deprecated in 4.0.0. - # - $rails_auto_detect : since unkown. Deprecated in 4.0.0. - # - $rails_base_uri : since unkown. Deprecated in 3.0.0. - # - $rails_default_user : since unkown. Deprecated in 3.0.0. # - $rails_env : since 2.0.0. # - $rails_framework_spawner_idle_time : since unkown. Deprecated in 4.0.0. - # - $rails_ruby : since unkown. Deprecated in 3.0.0. - # - $rails_spawn_method : since unkown. Deprecated in 3.0.0. - # - $rails_user_switching : since unkown. Deprecated in 3.0.0. - # - $wsgi_auto_detect : since unkown. Deprecated in 4.0.0. # - $rails_autodetect : this options is only for backward compatiblity with older versions of this class # - $rack_autodetect : this options is only for backward compatiblity with older versions of this class $parameters = { + 'passenger_admin_panel_url' => $passenger_admin_panel_url, + 'passenger_admin_panel_auth_type' => $passenger_admin_panel_auth_type, + 'passenger_admin_panel_username' => $passenger_admin_panel_username, + 'passenger_admin_panel_password' => $passenger_admin_panel_password, 'passenger_allow_encoded_slashes' => $passenger_allow_encoded_slashes, 'passenger_anonymous_telemetry_proxy' => $passenger_anonymous_telemetry_proxy, 'passenger_app_env' => $passenger_app_env, + 'passenger_app_log_file' => $passenger_app_log_file, 'passenger_app_group_name' => $passenger_app_group_name, 'passenger_app_root' => $passenger_app_root, 'passenger_app_type' => $passenger_app_type, @@ -999,6 +959,7 @@ 'passenger_disable_anonymous_telemetry' => $passenger_disable_anonymous_telemetry, 'passenger_disable_log_prefix' => $passenger_disable_log_prefix, 'passenger_disable_security_update_check' => $passenger_disable_security_update_check, + 'passenger_dump_config_manifest' => $passenger_dump_config_manifest, 'passenger_enabled' => $passenger_enabled, 'passenger_error_override' => $passenger_error_override, 'passenger_file_descriptor_log_file' => $passenger_file_descriptor_log_file, @@ -1018,6 +979,7 @@ 'passenger_max_pool_size' => $passenger_max_pool_size, 'passenger_max_preloader_idle_time' => $passenger_max_preloader_idle_time, 'passenger_max_request_queue_size' => $passenger_max_request_queue_size, + 'passenger_max_request_queue_time' => $passenger_max_request_queue_time, 'passenger_max_request_time' => $passenger_max_request_time, 'passenger_max_requests' => $passenger_max_requests, 'passenger_memory_limit' => $passenger_memory_limit, @@ -1049,20 +1011,9 @@ 'passenger_use_global_queue' => $passenger_use_global_queue, 'passenger_user' => $passenger_user, 'passenger_user_switching' => $passenger_user_switching, - 'rack_auto_detect' => $rack_auto_detect, - 'rack_base_uri' => $rack_base_uri, 'rack_env' => $rack_env, - 'rails_allow_mod_rewrite' => $rails_allow_mod_rewrite, - 'rails_app_spawner_idle_time' => $rails_app_spawner_idle_time, - 'rails_auto_detect' => $rails_auto_detect, - 'rails_base_uri' => $rails_base_uri, - 'rails_default_user' => $rails_default_user, 'rails_env' => $rails_env, 'rails_framework_spawner_idle_time' => $rails_framework_spawner_idle_time, - 'rails_ruby' => $rails_ruby, - 'rails_spawn_method' => $rails_spawn_method, - 'rails_user_switching' => $rails_user_switching, - 'wsgi_auto_detect' => $wsgi_auto_detect, 'rails_autodetect' => $rails_autodetect, 'rack_autodetect' => $rack_autodetect, } diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 00d0de7213..034ea36873 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -96,11 +96,6 @@ # the `aliases` parameter. As described in the `mod_alias` documentation, add more specific # `alias`, `aliasmatch`, `scriptalias` or `scriptaliasmatch` parameters before the more # general ones to avoid shadowing.
-# > **Note**: Use the `aliases` parameter instead of the `scriptaliases` parameter because -# you can precisely control the order of various alias directives. Defining `ScriptAliases` -# using the `scriptaliases` parameter means *all* `ScriptAlias` directives will come after -# *all* `Alias` directives, which can lead to `Alias` directives shadowing `ScriptAlias` -# directives. This often causes problems; for example, this could cause problems with Nagios.
# If `apache::mod::passenger` is loaded and `PassengerHighPerformance` is `true`, the `Alias` # directive might not be able to honor the `PassengerEnabled => off` statement. See # [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details. @@ -1095,34 +1090,6 @@ # Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', such as # '/usr/scripts'. # -# @param scriptaliases -# > **Note**: This parameter is deprecated in favor of the `aliases` parameter.
-# Passes an array of hashes to the virtual host to create either ScriptAlias or -# ScriptAliasMatch statements per the `mod_alias` documentation. -# ``` puppet -# scriptaliases => [ -# { -# alias => '/myscript', -# path => '/usr/share/myscript', -# }, -# { -# aliasmatch => '^/foo(.*)', -# path => '/usr/share/fooscripts$1', -# }, -# { -# aliasmatch => '^/bar/(.*)', -# path => '/usr/share/bar/wrapper.sh/$1', -# }, -# { -# alias => '/neatscript', -# path => '/usr/share/neatscript', -# }, -# ] -# ``` -# The ScriptAlias and ScriptAliasMatch directives are created in the order specified. -# As with [Alias and AliasMatch](#aliases) directives, specify more specific aliases -# before more general ones to avoid shadowing. -# # @param serveradmin # Specifies the email address Apache displays when it renders one of its error pages. # @@ -1811,7 +1778,6 @@ Variant[Array[Hash], String] $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, @@ -2552,9 +2518,8 @@ } # Template uses: - # - $scriptaliases # - $scriptalias - if ($scriptalias or !empty($scriptaliases)) and $ensure == 'present' { + if $scriptalias and $ensure == 'present' { include apache::mod::alias concat::fragment { "${name}-scriptalias": diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb index 33ef85e21e..c49d993556 100644 --- a/spec/acceptance/vhost_spec.rb +++ b/spec/acceptance/vhost_spec.rb @@ -816,10 +816,6 @@ class { 'apache': } docroot => '/tmp', proxy_dest => 'http://testproxy', } - apache::vhost { 'test.scriptaliases': - docroot => '/tmp', - scriptaliases => [{ alias => '/myscript', path => '/usr/share/myscript', }], - } apache::vhost { 'test.aliases': docroot => '/tmp', aliases => [ @@ -930,11 +926,6 @@ class { 'apache': } it { is_expected.to contain 'ProxyPass / http://testproxy/' } end - describe file("#{apache_hash['vhost_dir']}/25-test.scriptaliases.conf") do - it { is_expected.to be_file } - it { is_expected.to contain 'ScriptAlias /myscript "/usr/share/myscript"' } - end - describe file("#{apache_hash['vhost_dir']}/25-test.aliases.conf") do it { is_expected.to be_file } it { is_expected.to contain 'Alias /image "/ftp/pub/image"' } diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb index 2805e8c53c..1b2aff7a35 100644 --- a/spec/classes/mod/passenger_spec.rb +++ b/spec/classes/mod/passenger_spec.rb @@ -27,8 +27,13 @@ passenger_config_options = { 'passenger_allow_encoded_slashes' => { type: 'OnOff', pass_opt: :PassengerAllowEncodedSlashes }, 'passenger_anonymous_telemetry_proxy' => { type: 'String', pass_opt: :PassengerAnonymousTelemetryProxy }, + 'passenger_admin_panel_url' => { type: 'String', pass_opt: :PassengerAdminPanelUrl }, + 'passenger_admin_panel_auth_type' => { type: 'String', pass_opt: :PassengerAdminPanelAuthType }, + 'passenger_admin_panel_username' => { type: 'String', pass_opt: :PassengerAdminPanelUsername }, + 'passenger_admin_panel_password' => { type: 'String', pass_opt: :PassengerAdminPanelPassword }, 'passenger_app_env' => { type: 'String', pass_opt: :PassengerAppEnv }, 'passenger_app_group_name' => { type: 'String', pass_opt: :PassengerAppGroupName }, + 'passenger_app_log_file' => { type: 'String', pass_opt: :PassengerAppLogFile }, 'passenger_app_root' => { type: 'FullPath', pass_opt: :PassengerAppRoot }, 'passenger_app_type' => { type: 'String', pass_opt: :PassengerAppType }, 'passenger_base_uri' => { type: 'URI', pass_opt: :PassengerBaseURI }, @@ -44,6 +49,7 @@ 'passenger_disable_anonymous_telemetry' => { type: 'Boolean', pass_opt: :PassengerDisableAnonymousTelemetry }, 'passenger_disable_log_prefix' => { type: 'Boolean', pass_opt: :PassengerDisableLogPrefix }, 'passenger_disable_security_update_check' => { type: 'OnOff', pass_opt: :PassengerDisableSecurityUpdateCheck }, + 'passenger_dump_config_manifest' => { type: 'String', pass_opt: :PassengerDumpConfigManifest }, 'passenger_enabled' => { type: 'OnOff', pass_opt: :PassengerEnabled }, 'passenger_error_override' => { type: 'OnOff', pass_opt: :PassengerErrorOverride }, 'passenger_file_descriptor_log_file' => { type: 'FullPath', pass_opt: :PassengerFileDescriptorLogFile }, @@ -63,6 +69,7 @@ 'passenger_max_pool_size' => { type: 'Integer', pass_opt: :PassengerMaxPoolSize }, 'passenger_max_preloader_idle_time' => { type: 'Integer', pass_opt: :PassengerMaxPreloaderIdleTime }, 'passenger_max_request_queue_size' => { type: 'Integer', pass_opt: :PassengerMaxRequestQueueSize }, + 'passenger_max_request_queue_time' => { type: 'Integer', pass_opt: :PassengerMaxRequestQueueTime }, 'passenger_max_request_time' => { type: 'Integer', pass_opt: :PassengerMaxRequestTime }, 'passenger_max_requests' => { type: 'Integer', pass_opt: :PassengerMaxRequests }, 'passenger_memory_limit' => { type: 'Integer', pass_opt: :PassengerMemoryLimit }, @@ -94,22 +101,11 @@ 'passenger_use_global_queue' => { type: 'String', pass_opt: :PassengerUseGlobalQueue }, 'passenger_user' => { type: 'String', pass_opt: :PassengerUser }, 'passenger_user_switching' => { type: 'OnOff', pass_opt: :PassengerUserSwitching }, - 'rack_auto_detect' => { type: 'String', pass_opt: :RackAutoDetect }, 'rack_autodetect' => { type: 'String', pass_opt: :RackAutoDetect }, - 'rack_base_uri' => { type: 'String', pass_opt: :RackBaseURI }, 'rack_env' => { type: 'String', pass_opt: :RackEnv }, - 'rails_allow_mod_rewrite' => { type: 'String', pass_opt: :RailsAllowModRewrite }, - 'rails_app_spawner_idle_time' => { type: 'String', pass_opt: :RailsAppSpawnerIdleTime }, - 'rails_auto_detect' => { type: 'String', pass_opt: :RailsAutoDetect }, 'rails_autodetect' => { type: 'String', pass_opt: :RailsAutoDetect }, - 'rails_base_uri' => { type: 'String', pass_opt: :RailsBaseURI }, - 'rails_default_user' => { type: 'String', pass_opt: :RailsDefaultUser }, 'rails_env' => { type: 'String', pass_opt: :RailsEnv }, - 'rails_framework_spawner_idle_time' => { type: 'String', pass_opt: :RailsFrameworkSpawnerIdleTime }, - 'rails_ruby' => { type: 'String', pass_opt: :RailsRuby }, - 'rails_spawn_method' => { type: 'String', pass_opt: :RailsSpawnMethod }, - 'rails_user_switching' => { type: 'String', pass_opt: :RailsUserSwitching }, - 'wsgi_auto_detect' => { type: 'String', pass_opt: :WsgiAutoDetect } + 'rails_framework_spawner_idle_time' => { type: 'String', pass_opt: :RailsFrameworkSpawnerIdleTime } } passenger_config_options.each do |config_option, config_hash| puppetized_config_option = config_option @@ -242,7 +238,7 @@ let :params do { passenger_installed_version: '5.0.0', - rails_ruby: '/some/path/to/ruby' + passenger_ruby: '/some/path/to/ruby' } end diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb index 4fa39cf40f..5f6172e21a 100644 --- a/spec/defines/vhost_spec.rb +++ b/spec/defines/vhost_spec.rb @@ -324,16 +324,6 @@ 'error_documents' => 'true', 'fallbackresource' => '/index.php', 'scriptalias' => '/usr/lib/cgi-bin', - 'scriptaliases' => [ - { - 'alias' => '/myscript', - 'path' => '/usr/share/myscript' - }, - { - 'aliasmatch' => '^/foo(.*)', - 'path' => '/usr/share/fooscripts$1' - }, - ], 'limitreqfieldsize' => 8190, 'limitreqfields' => 100, 'limitreqline' => 8190, diff --git a/templates/mod/passenger.conf.epp b/templates/mod/passenger.conf.epp index e550805506..e09dabb4ee 100644 --- a/templates/mod/passenger.conf.epp +++ b/templates/mod/passenger.conf.epp @@ -7,12 +7,27 @@ <%- if $passenger_anonymous_telemetry_proxy { -%> PassengerAnonymousTelemetryProxy <%= $passenger_anonymous_telemetry_proxy %> <%- } -%> + <%- if $passenger_admin_panel_url { -%> + PassengerAdminPanelUrl <%= $passenger_admin_panel_url %> + <%- } -%> + <%- if $passenger_admin_panel_auth_type { -%> + PassengerAdminPanelAuthType <%= $passenger_admin_panel_auth_type %> + <%- } -%> + <%- if $passenger_admin_panel_username { -%> + PassengerAdminPanelUsername <%= $passenger_admin_panel_username %> + <%- } -%> + <%- if $passenger_admin_panel_password { -%> + PassengerAdminPanelPassword <%= $passenger_admin_panel_password %> + <%- } -%> <%- if $passenger_app_env { -%> PassengerAppEnv <%= $passenger_app_env %> <%- } -%> <%- if $passenger_app_group_name { -%> PassengerAppGroupName <%= $passenger_app_group_name %> <%- } -%> + <%- if $passenger_app_log_file { -%> + PassengerAppLogFile <%= $passenger_app_log_file %> + <%- } -%> <%- if $passenger_app_root { -%> PassengerAppRoot "<%= $passenger_app_root %>" <%- } -%> @@ -58,6 +73,9 @@ <%- if $passenger_disable_security_update_check { -%> PassengerDisableSecurityUpdateCheck <%= $passenger_disable_security_update_check %> <%- } -%> + <%- if $passenger_dump_config_manifest { -%> + PassengerDumpConfigManifest <%= $passenger_dump_config_manifest %> + <%- } -%> <%- if $passenger_enabled { -%> PassengerEnabled <%= $passenger_enabled %> <%- } -%> @@ -115,6 +133,9 @@ <%- if $passenger_max_request_queue_size { -%> PassengerMaxRequestQueueSize <%= $passenger_max_request_queue_size %> <%- } -%> + <%- if $passenger_max_request_queue_time { -%> + PassengerMaxRequestQueueTime <%= $passenger_max_request_queue_time %> + <%- } -%> <%- if $passenger_max_request_time { -%> PassengerMaxRequestTime <%= $passenger_max_request_time %> <%- } -%> @@ -210,48 +231,15 @@ <%- if $passenger_user_switching { -%> PassengerUserSwitching <%= $passenger_user_switching %> <%- } -%> - <%- if $rack_auto_detect { -%> - RackAutoDetect <%= $rack_auto_detect %> - <%- } -%> - <%- if $rack_base_uri { -%> - RackBaseURI <%= $rack_base_uri %> - <%- } -%> <%- if $rack_env { -%> RackEnv <%= $rack_env %> <%- } -%> - <%- if $rails_allow_mod_rewrite { -%> - RailsAllowModRewrite <%= $rails_allow_mod_rewrite %> - <%- } -%> - <%- if $rails_app_spawner_idle_time { -%> - RailsAppSpawnerIdleTime <%= $rails_app_spawner_idle_time %> - <%- } -%> - <%- if $rails_auto_detect { -%> - RailsAutoDetect <%= $rails_auto_detect %> - <%- } -%> - <%- if $rails_base_uri { -%> - RailsBaseURI <%= $rails_base_uri %> - <%- } -%> - <%- if $rails_default_user { -%> - RailsDefaultUser <%= $rails_default_user %> - <%- } -%> <%- if $rails_env { -%> RailsEnv <%= $rails_env %> <%- } -%> <%- if $rails_framework_spawner_idle_time { -%> RailsFrameworkSpawnerIdleTime <%= $rails_framework_spawner_idle_time %> <%- } -%> - <%- if $rails_ruby { -%> - RailsRuby <%= $rails_ruby %> - <%- } -%> - <%- if $rails_spawn_method { -%> - RailsSpawnMethod <%= $rails_spawn_method %> - <%- } -%> - <%- if $rails_user_switching { -%> - RailsUserSwitching <%= $rails_user_switching %> - <%- } -%> - <%- if $wsgi_auto_detect { -%> - WsgiAutoDetect <%= $wsgi_auto_detect %> - <%- } -%> <%- if $rails_autodetect { -%> RailsAutoDetect <%= $rails_autodetect %> <%- } -%> diff --git a/templates/vhost/_scriptalias.erb b/templates/vhost/_scriptalias.erb index ffa69f932e..95b939f200 100644 --- a/templates/vhost/_scriptalias.erb +++ b/templates/vhost/_scriptalias.erb @@ -1,14 +1,2 @@ -<%- aliases = @scriptaliases -%> - ## Script alias directives -<%# Combine scriptalias and scriptaliases into a single data structure -%> -<%# for backward compatibility and ease of implementation -%> -<%- aliases << { 'alias' => '/cgi-bin', 'path' => @scriptalias } if @scriptalias -%> -<%- aliases.each do |salias| -%> - <%- if salias["path"] != '' -%> - <%- if salias["alias"] and salias["alias"] != '' -%> - ScriptAlias <%= salias['alias'] %> "<%= salias['path'] %>" - <%- elsif salias["aliasmatch"] and salias["aliasmatch"] != '' -%> - ScriptAliasMatch <%= salias['aliasmatch'] %> "<%= salias['path'] %>" - <%- end -%> - <%- end -%> -<%- end -%> +## Script alias directives + ScriptAlias /cgi-bin "<%= @scriptalias %>"