Skip to content

Commit

Permalink
Merge pull request #553 from Joris29/dbcreate
Browse files Browse the repository at this point in the history
Allow setting Grails configuration in `rundeck-config.properties`
  • Loading branch information
kenyon authored Oct 18, 2024
2 parents 9091582 + d5b8eb6 commit 964c667
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
9 changes: 9 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -397,6 +398,14 @@ This hash will be merged with the [Rundeck defaults](https://github.com/voxpupul

Default value: `{}`

##### <a name="-rundeck--grails_config"></a>`grails_config`

Data type: `Hash`

A hash of the rundeck grails configuration.

Default value: `{}`

##### <a name="-rundeck--gui_config"></a>`gui_config`

Data type: `Hash`
Expand Down
3 changes: 3 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = {},
Expand Down
5 changes: 4 additions & 1 deletion templates/rundeck-config.properties.epp
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ 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 %>
<%- } -%>

<%- $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'] %>
Expand Down

0 comments on commit 964c667

Please sign in to comment.