summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMatt Taggart <taggart@riseup.net>2014-04-29 12:33:37 -0700
committerMatt Taggart <taggart@riseup.net>2015-04-16 21:08:45 +0000
commit6547ba79591886544af4eaab88b65215d579d857 (patch)
tree520dbe9b580f92e542ae8d1ecf1d6c6c73724dd2 /manifests
parent95947b5213b58be61563f966e2fb3a0cf3a072c1 (diff)
switch to using a more standard storage location on the puppetmaster, and make sure it exists, work around bug with /var/lib/puppet/modules, drop monitoring user/group
Diffstat (limited to 'manifests')
-rw-r--r--manifests/agent/generate_sshkey.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp
index fb7ce11..6f88f35 100644
--- a/manifests/agent/generate_sshkey.pp
+++ b/manifests/agent/generate_sshkey.pp
@@ -6,10 +6,10 @@ define check_mk::agent::generate_sshkey (
# name of the authorized_keys file
$authfile = undef,
# dir on the puppetmaster where keys are stored
- $ssh_key_basepath = '/etc/puppet/modules/keys/files/check_mk_keys',
- # user and group to run the agent as
- $user = 'monitoring',
- $group = 'monitoring',
+ # FIXME: need a way to ensure this dir is setup on the puppetmaster correctly
+ #$ssh_key_basepath = "${common::moduledir::module_dir_path}/check_mk/keys",
+ # for now use a dir we know works
+ $ssh_key_basepath = '/etc/puppet/modules/check_mk/keys',
$check_mk_tag = 'check_mk_sshkey'
){