Skip to content

Commit

Permalink
Merge pull request #271 from dustinak/master
Browse files Browse the repository at this point in the history
This adds a boolean class parameter to the rundeck class to allow people
  • Loading branch information
jyaworski authored Oct 10, 2016
2 parents 3a4ac63 + 64faadd commit 5c096e0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
5 changes: 5 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@
# [*session_timeout*]
# Session timeout is an expired time limit for a logged in Rundeck GUI user which as been inactive for a period of time.
#
# [*sshkey_manage*]
# Should this module manage the sshkey used by rundeck at all.
#
# [*ssl_enabled*]
# Enable ssl for the rundeck web application.
#
Expand Down Expand Up @@ -195,6 +198,7 @@
$keystore = $rundeck::params::keystore,
$keystore_password = $rundeck::params::keystore_password,
$mail_config = $rundeck::params::mail_config,
$sshkey_manage = $rundeck::params::sshkey_manage,
$ssl_keyfile = $rundeck::params::ssl_keyfile,
$ssl_certfile = $rundeck::params::ssl_certfile,
$manage_default_admin_policy = $rundeck::params::manage_default_admin_policy,
Expand Down Expand Up @@ -237,6 +241,7 @@

validate_array($auth_types)
validate_hash($auth_config)
validate_bool($sshkey_manage)
validate_bool($ssl_enabled)
validate_hash($projects)
validate_string($projects_organization)
Expand Down
10 changes: 7 additions & 3 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,16 @@
}
}

File[$rdeck_home] ~> File[$framework_config['framework.ssh.keypath']]

file { $rdeck_home:
ensure => directory,
} ~>
file { $framework_config['framework.ssh.keypath']:
mode => '0600',
}

if $::rundeck::sshkey_manage {
file { $framework_config['framework.ssh.keypath']:
mode => '0600',
}
}

file { $rundeck::service_logs_dir:
Expand Down
2 changes: 2 additions & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,8 @@

$java_home = undef

$sshkey_manage = true

$ssl_enabled = false
$ssl_port = '4443'

Expand Down

0 comments on commit 5c096e0

Please sign in to comment.