From 7f7bd3a7def4fca1f89e7f9a42b57a228d260d91 Mon Sep 17 00:00:00 2001 From: Joris VAN ACOLEYEN Date: Wed, 16 Oct 2024 10:01:03 +0200 Subject: [PATCH 1/3] Remove hardcoded dbCreate --- templates/rundeck-config.properties.epp | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/rundeck-config.properties.epp b/templates/rundeck-config.properties.epp index 477f705e..f9f4605b 100644 --- a/templates/rundeck-config.properties.epp +++ b/templates/rundeck-config.properties.epp @@ -11,7 +11,6 @@ rundeck.api.tokens.duration.max = <%= $rundeck::api_token_max_duration %> quartz.threadPool.threadCount = <%= $rundeck::quartz_job_threadcount %> -dataSource.dbCreate = update <%- $rundeck::database_config.each |$_k, $_v| {-%> dataSource.<%= $_k %> = <%= $_v %> <%- } -%> From 81aaa5dfa0cf689dbd070e54ed30d05ba472be9e Mon Sep 17 00:00:00 2001 From: Joris VAN ACOLEYEN Date: Wed, 16 Oct 2024 10:08:54 +0200 Subject: [PATCH 2/3] Add parameter to set grails config This allows to set more grails setting. --- manifests/init.pp | 3 +++ templates/rundeck-config.properties.epp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 0b932990..27a4ab6e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -55,6 +55,8 @@ # @param framework_config # Hash of properties for configuring the [Rundeck Framework](https://docs.rundeck.com/docs/administration/configuration/config-file-reference.html#framework-properties) # This hash will be merged with the [Rundeck defaults](https://github.com/voxpupuli/puppet-rundeck/blob/master/manifests/config.pp#L8-L20) +# @param grails_config +# A hash of the rundeck grails configuration. # @param gui_config # Hash of properties for customizing the [Rundeck GUI](https://docs.rundeck.com/docs/administration/configuration/gui-customization.html) # @param mail_config @@ -221,6 +223,7 @@ Rundeck::Db_config $database_config = { 'url' => 'jdbc:h2:file:/var/lib/rundeck/data/rundeckdb' }, Hash $feature_config = {}, Hash $framework_config = {}, + Hash $grails_config = {}, Hash $gui_config = {}, Rundeck::Mail_config $mail_config = {}, Hash $security_config = {}, diff --git a/templates/rundeck-config.properties.epp b/templates/rundeck-config.properties.epp index f9f4605b..bb5c747b 100644 --- a/templates/rundeck-config.properties.epp +++ b/templates/rundeck-config.properties.epp @@ -15,6 +15,10 @@ quartz.threadPool.threadCount = <%= $rundeck::quartz_job_threadcount %> dataSource.<%= $_k %> = <%= $_v %> <%- } -%> +<%- $rundeck::grails_config.each |$_k, $_v| {-%> +grails.<%= $_k %> = <%= $_v %> +<%- } -%> + <%- $rundeck::key_storage_config.each |$_i, $_cfg| { -%> rundeck.storage.provider.<%= $_i+1 %>.type = <%= $_cfg['type'] %> rundeck.storage.provider.<%= $_i+1 %>.path = <%= $_cfg['path'] %> From d5b8eb6231d7d7b08777eeb1e91039dfd5e2348c Mon Sep 17 00:00:00 2001 From: Joris VAN ACOLEYEN Date: Wed, 16 Oct 2024 10:13:04 +0200 Subject: [PATCH 3/3] Update reference docs --- REFERENCE.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/REFERENCE.md b/REFERENCE.md index f29c8492..a3c31afa 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -78,6 +78,7 @@ The following parameters are available in the `rundeck` class: * [`database_config`](#-rundeck--database_config) * [`feature_config`](#-rundeck--feature_config) * [`framework_config`](#-rundeck--framework_config) +* [`grails_config`](#-rundeck--grails_config) * [`gui_config`](#-rundeck--gui_config) * [`mail_config`](#-rundeck--mail_config) * [`security_config`](#-rundeck--security_config) @@ -397,6 +398,14 @@ This hash will be merged with the [Rundeck defaults](https://github.com/voxpupul Default value: `{}` +##### `grails_config` + +Data type: `Hash` + +A hash of the rundeck grails configuration. + +Default value: `{}` + ##### `gui_config` Data type: `Hash`