Release v7.0.0

OSC · Jan 9, 2025 · 0ba762d · 0ba762d
1 parent 714587b
commit 0ba762d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v7.0.0](https://github.com/osc/puppet-module-openondemand/tree/v7.0.0) (2025-01-09)
+
+[Full Changelog](https://github.com/osc/puppet-module-openondemand/compare/v6.1.0...v7.0.0)
+
+### Changed
+
+- Support OnDemand 4.0 [\#169](https://github.com/OSC/puppet-module-openondemand/pull/169) ([treydock](https://github.com/treydock))
+
 ## [v6.1.0](https://github.com/osc/puppet-module-openondemand/tree/v6.1.0) (2024-12-11)
 
 [Full Changelog](https://github.com/osc/puppet-module-openondemand/compare/v6.0.0...v6.1.0)
@@ -255,18 +263,10 @@ All notable changes to this project will be documented in this file. The format
 
 [Full Changelog](https://github.com/osc/puppet-module-openondemand/compare/v2.7.0...v2.8.0)
 
-### Added
-
-- Support nightly repos [\#66](https://github.com/OSC/puppet-module-openondemand/pull/66) ([treydock](https://github.com/treydock))
-
 ## [v2.7.0](https://github.com/osc/puppet-module-openondemand/tree/v2.7.0) (2021-08-09)
 
 [Full Changelog](https://github.com/osc/puppet-module-openondemand/compare/v2.6.0...v2.7.0)
 
-### Added
-
-- Add nginx\_stage\_nginx\_file\_upload\_max and nginx\_stage\_configs [\#65](https://github.com/OSC/puppet-module-openondemand/pull/65) ([treydock](https://github.com/treydock))
-
 ## [v2.6.0](https://github.com/osc/puppet-module-openondemand/tree/v2.6.0) (2021-08-03)
 
 [Full Changelog](https://github.com/osc/puppet-module-openondemand/compare/v2.5.0...v2.6.0)

diff --git a/REFERENCE.md b/REFERENCE.md
@@ -74,7 +74,6 @@ The following parameters are available in the `openondemand` class:
 * [`install_apps`](#-openondemand--install_apps)
 * [`declare_apache`](#-openondemand--declare_apache)
 * [`apache_user`](#-openondemand--apache_user)
-* [`apache_scls`](#-openondemand--apache_scls)
 * [`generator_insecure`](#-openondemand--generator_insecure)
 * [`listen_addr_port`](#-openondemand--listen_addr_port)
 * [`servername`](#-openondemand--servername)
@@ -83,6 +82,7 @@ The following parameters are available in the `openondemand` class:
 * [`disable_logs`](#-openondemand--disable_logs)
 * [`logroot`](#-openondemand--logroot)
 * [`use_rewrites`](#-openondemand--use_rewrites)
+* [`http_redirect_host`](#-openondemand--http_redirect_host)
 * [`use_maintenance`](#-openondemand--use_maintenance)
 * [`maintenance_ip_allowlist`](#-openondemand--maintenance_ip_allowlist)
 * [`maintenance_source`](#-openondemand--maintenance_source)
@@ -138,7 +138,6 @@ The following parameters are available in the `openondemand` class:
 * [`nginx_stage_ondemand_title`](#-openondemand--nginx_stage_ondemand_title)
 * [`nginx_stage_pun_custom_env`](#-openondemand--nginx_stage_pun_custom_env)
 * [`nginx_stage_app_root`](#-openondemand--nginx_stage_app_root)
-* [`nginx_stage_scl_env`](#-openondemand--nginx_stage_scl_env)
 * [`nginx_stage_app_request_regex`](#-openondemand--nginx_stage_app_request_regex)
 * [`nginx_stage_min_uid`](#-openondemand--nginx_stage_min_uid)
 * [`nginx_stage_passenger_pool_idle_time`](#-openondemand--nginx_stage_passenger_pool_idle_time)
@@ -182,7 +181,7 @@ Data type: `String`
 
 The release of OnDemand repo
 
-Default value: `'3.1'`
+Default value: `'4.0'`
 
 ##### <a name="-openondemand--repo_baseurl_prefix"></a>`repo_baseurl_prefix`
 
@@ -328,14 +327,6 @@ Name of the Apache user
 
 Default value: `'apache'`
 
-##### <a name="-openondemand--apache_scls"></a>`apache_scls`
-
-Data type: `String`
-
-SCLs to load when starting Apache service
-
-Default value: `'httpd24'`
-
 ##### <a name="-openondemand--generator_insecure"></a>`generator_insecure`
 
 Data type: `Boolean`
@@ -402,6 +393,14 @@ ood_portal.yml use_rewrites
 
 Default value: `true`
 
+##### <a name="-openondemand--http_redirect_host"></a>`http_redirect_host`
+
+Data type: `String`
+
+ood_portal.yml http_redirect_host
+
+Default value: `'%{HTTP_HOST}'`
+
 ##### <a name="-openondemand--use_maintenance"></a>`use_maintenance`
 
 Data type: `Boolean`
@@ -843,14 +842,6 @@ nginx_stage.yml app_root
 
 Default value: `{}`
 
-##### <a name="-openondemand--nginx_stage_scl_env"></a>`nginx_stage_scl_env`
-
-Data type: `String`
-
-nginx_stage.yml scl_env
-
-Default value: `'ondemand'`
-
 ##### <a name="-openondemand--nginx_stage_app_request_regex"></a>`nginx_stage_app_request_regex`
 
 Data type: `Optional[Openondemand::Nginx_stage_namespace_config]`

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "osc-openondemand",
-  "version": "6.1.0",
+  "version": "7.0.0",
   "author": "osc",
   "summary": "Open OnDemand Puppet module",
   "license": "Apache-2.0",