updates for 3.1 (#227)

* add 3.1 ood_portal.yml configs

* rm centos:7 support

* fix this template and add test cases for this feature

* make this a real file

* add support for 3.1 (and 3.0) ondemand.d configs

.github/workflows/tests.yml

@@ -26,7 +26,6 @@ jobs:
       max-parallel: 4
       matrix:
         image:
-          - 'centos:7'
           - 'centos:8'
           - 'rockylinux:8'
           - 'rockylinux:9'

defaults/main/.ondemand.yml → defaults/main/ondemand.yml

@@ -68,3 +68,28 @@
 #   - profile: "team1"
 #     title: "Team 1"
 #     icon: "fas://user"
+
+files_enable_shell_button: true
+bc_dynamic_js: false
+bc_clean_old_dirs: false
+bc_clean_old_dirs_days: 30
+host_based_profiles: false
+disable_bc_shell: false
+cancel_session_enabled: false
+
+# module_file_dir: null
+# user_settings_file: ~/.config/ondemand/settings.yml
+# facl_domain: null
+# auto_groups_filter: null
+
+bc_simple_auto_accounts: false
+remote_files_enabled: false
+remote_files_validation: false
+upload_enabled: true
+download_enabled: true
+hide_app_version: false
+
+# globus_endpoints: null
+# google_analytics_tag_id: null
+
+motd_render_html: false

molecule/default/fixtures/config/ood_portal.yml.custom.apache2

@@ -43,6 +43,13 @@ port: 80
 # Default: null (no SSL support)
 # Default: null (no SSL support)
 
+# Disable logging entirely. With this you can have custom log directives
+# in a seperate configuration file.
+# Example:
+#     disable_logs: true
+# Default: false (logs are enabled)
+#disable_logs: false
+
 # Root directory of log files (can be relative ServerRoot)
 # Example:
 #     logroot: '/path/to/my/logs'
@@ -163,6 +170,26 @@ auth:
 - 'RequestHeader unset Authorization'
 - 'Require valid-user'
 
+# List of custom apache directives to apply to the entire vhost.
+# Note this is an array of strings.
+# Example:
+#     custom_vhost_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+custom_vhost_directives:
+- '<Location "/test">'
+- '  SetEnv SPECIAL_PATH /foo/bin'
+- '</Location>'
+
+# List of custom apache directives to apply to the Locations.
+# Note this is an array of strings.
+# Example:
+#     custom_location_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+custom_location_directives:
+- 'SetEnv SPECIAL_PATH /foo/bin'
+
 # Redirect user to the following URI when accessing root URI
 # Example:
 #     root_uri: '/my_uri'

molecule/default/fixtures/config/ood_portal.yml.custom.httpd

@@ -43,6 +43,13 @@ port: 80
 # Default: null (no SSL support)
 # Default: null (no SSL support)
 
+# Disable logging entirely. With this you can have custom log directives
+# in a seperate configuration file.
+# Example:
+#     disable_logs: true
+# Default: false (logs are enabled)
+#disable_logs: false
+
 # Root directory of log files (can be relative ServerRoot)
 # Example:
 #     logroot: '/path/to/my/logs'
@@ -163,6 +170,26 @@ auth:
 - 'RequestHeader unset Authorization'
 - 'Require valid-user'
 
+# List of custom apache directives to apply to the entire vhost.
+# Note this is an array of strings.
+# Example:
+#     custom_vhost_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+custom_vhost_directives:
+- '<Location "/test">'
+- '  SetEnv SPECIAL_PATH /foo/bin'
+- '</Location>'
+
+# List of custom apache directives to apply to the Locations.
+# Note this is an array of strings.
+# Example:
+#     custom_location_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+custom_location_directives:
+- 'SetEnv SPECIAL_PATH /foo/bin'
+
 # Redirect user to the following URI when accessing root URI
 # Example:
 #     root_uri: '/my_uri'

molecule/default/fixtures/config/ood_portal.yml.custom.httpd24-httpd

@@ -43,6 +43,13 @@ port: 80
 # Default: null (no SSL support)
 # Default: null (no SSL support)
 
+# Disable logging entirely. With this you can have custom log directives
+# in a seperate configuration file.
+# Example:
+#     disable_logs: true
+# Default: false (logs are enabled)
+#disable_logs: false
+
 # Root directory of log files (can be relative ServerRoot)
 # Example:
 #     logroot: '/path/to/my/logs'
@@ -163,6 +170,26 @@ auth:
 - 'RequestHeader unset Authorization'
 - 'Require valid-user'
 
+# List of custom apache directives to apply to the entire vhost.
+# Note this is an array of strings.
+# Example:
+#     custom_vhost_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+custom_vhost_directives:
+- '<Location "/test">'
+- '  SetEnv SPECIAL_PATH /foo/bin'
+- '</Location>'
+
+# List of custom apache directives to apply to the Locations.
+# Note this is an array of strings.
+# Example:
+#     custom_location_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+custom_location_directives:
+- 'SetEnv SPECIAL_PATH /foo/bin'
+
 # Redirect user to the following URI when accessing root URI
 # Example:
 #     root_uri: '/my_uri'

molecule/default/fixtures/config/ood_portal.yml.default.apache2

@@ -42,6 +42,13 @@ port: 80
 # Default: null (no SSL support)
 # Default: null (no SSL support)
 
+# Disable logging entirely. With this you can have custom log directives
+# in a seperate configuration file.
+# Example:
+#     disable_logs: true
+# Default: false (logs are enabled)
+#disable_logs: false
+
 # Root directory of log files (can be relative ServerRoot)
 # Example:
 #     logroot: '/path/to/my/logs'
@@ -161,6 +168,22 @@ auth:
 - 'RequestHeader unset Authorization'
 - 'Require valid-user'
 
+# List of custom apache directives to apply to the entire vhost.
+# Note this is an array of strings.
+# Example:
+#     custom_vhost_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_vhost_directives: []
+
+# List of custom apache directives to apply to the Locations.
+# Note this is an array of strings.
+# Example:
+#     custom_location_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_location_directives: []
+
 # Redirect user to the following URI when accessing root URI
 # Example:
 #     root_uri: '/my_uri'

molecule/default/fixtures/config/ood_portal.yml.default.httpd

@@ -42,6 +42,13 @@ port: 80
 # Default: null (no SSL support)
 # Default: null (no SSL support)
 
+# Disable logging entirely. With this you can have custom log directives
+# in a seperate configuration file.
+# Example:
+#     disable_logs: true
+# Default: false (logs are enabled)
+#disable_logs: false
+
 # Root directory of log files (can be relative ServerRoot)
 # Example:
 #     logroot: '/path/to/my/logs'
@@ -161,6 +168,22 @@ auth:
 - 'RequestHeader unset Authorization'
 - 'Require valid-user'
 
+# List of custom apache directives to apply to the entire vhost.
+# Note this is an array of strings.
+# Example:
+#     custom_vhost_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_vhost_directives: []
+
+# List of custom apache directives to apply to the Locations.
+# Note this is an array of strings.
+# Example:
+#     custom_location_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_location_directives: []
+
 # Redirect user to the following URI when accessing root URI
 # Example:
 #     root_uri: '/my_uri'

molecule/default/fixtures/config/ood_portal.yml.default.httpd24-httpd

@@ -42,6 +42,13 @@ port: 80
 # Default: null (no SSL support)
 # Default: null (no SSL support)
 
+# Disable logging entirely. With this you can have custom log directives
+# in a seperate configuration file.
+# Example:
+#     disable_logs: true
+# Default: false (logs are enabled)
+#disable_logs: false
+
 # Root directory of log files (can be relative ServerRoot)
 # Example:
 #     logroot: '/path/to/my/logs'
@@ -161,6 +168,22 @@ auth:
 - 'RequestHeader unset Authorization'
 - 'Require valid-user'
 
+# List of custom apache directives to apply to the entire vhost.
+# Note this is an array of strings.
+# Example:
+#     custom_vhost_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_vhost_directives: []
+
+# List of custom apache directives to apply to the Locations.
+# Note this is an array of strings.
+# Example:
+#     custom_location_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_location_directives: []
+
 # Redirect user to the following URI when accessing root URI
 # Example:
 #     root_uri: '/my_uri'

molecule/default/fixtures/config/ood_portal.yml.oidc.apache2

@@ -42,6 +42,13 @@ port: 80
 # Default: null (no SSL support)
 # Default: null (no SSL support)
 
+# Disable logging entirely. With this you can have custom log directives
+# in a seperate configuration file.
+# Example:
+#     disable_logs: true
+# Default: false (logs are enabled)
+#disable_logs: false
+
 # Root directory of log files (can be relative ServerRoot)
 # Example:
 #     logroot: '/path/to/my/logs'
@@ -162,6 +169,22 @@ auth:
 - 'RequestHeader unset Authorization'
 - 'Require valid-user'
 
+# List of custom apache directives to apply to the entire vhost.
+# Note this is an array of strings.
+# Example:
+#     custom_vhost_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_vhost_directives: []
+
+# List of custom apache directives to apply to the Locations.
+# Note this is an array of strings.
+# Example:
+#     custom_location_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_location_directives: []
+
 # Redirect user to the following URI when accessing root URI
 # Example:
 #     root_uri: '/my_uri'

molecule/default/fixtures/config/ood_portal.yml.oidc.httpd

@@ -42,6 +42,13 @@ port: 80
 # Default: null (no SSL support)
 # Default: null (no SSL support)
 
+# Disable logging entirely. With this you can have custom log directives
+# in a seperate configuration file.
+# Example:
+#     disable_logs: true
+# Default: false (logs are enabled)
+#disable_logs: false
+
 # Root directory of log files (can be relative ServerRoot)
 # Example:
 #     logroot: '/path/to/my/logs'
@@ -162,6 +169,22 @@ auth:
 - 'RequestHeader unset Authorization'
 - 'Require valid-user'
 
+# List of custom apache directives to apply to the entire vhost.
+# Note this is an array of strings.
+# Example:
+#     custom_vhost_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_vhost_directives: []
+
+# List of custom apache directives to apply to the Locations.
+# Note this is an array of strings.
+# Example:
+#     custom_location_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_location_directives: []
+
 # Redirect user to the following URI when accessing root URI
 # Example:
 #     root_uri: '/my_uri'

molecule/default/fixtures/config/ood_portal.yml.oidc.httpd24-httpd

@@ -42,6 +42,13 @@ port: 80
 # Default: null (no SSL support)
 # Default: null (no SSL support)
 
+# Disable logging entirely. With this you can have custom log directives
+# in a seperate configuration file.
+# Example:
+#     disable_logs: true
+# Default: false (logs are enabled)
+#disable_logs: false
+
 # Root directory of log files (can be relative ServerRoot)
 # Example:
 #     logroot: '/path/to/my/logs'
@@ -162,6 +169,22 @@ auth:
 - 'RequestHeader unset Authorization'
 - 'Require valid-user'
 
+# List of custom apache directives to apply to the entire vhost.
+# Note this is an array of strings.
+# Example:
+#     custom_vhost_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_vhost_directives: []
+
+# List of custom apache directives to apply to the Locations.
+# Note this is an array of strings.
+# Example:
+#     custom_location_directives:
+#       - 'SetEnv SPECIAL_ENV_VAR custom'
+# Default: [] (no custom directives)
+#custom_location_directives: []
+
 # Redirect user to the following URI when accessing root URI
 # Example:
 #     root_uri: '/my_uri'