Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64282
Change subject: contint: jenkins slave user had no home
......................................................................
contint: jenkins slave user had no home
The jenkins-slave user was being created but since we do not want puppet
to manage its home (we want to clean it up manually) we have to create
it manually.
Added file dependencies to create home and the user .ssh directory and
adjusted the requirements.
Change-Id: Ic7e24ddba89841af6f515bae11d077955827ca85
---
M modules/jenkins/manifests/slave.pp
1 file changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/64282/1
diff --git a/modules/jenkins/manifests/slave.pp
b/modules/jenkins/manifests/slave.pp
index 5e1478d..6e4d2b6 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -28,6 +28,24 @@
system => true,
}
+ # Since home is not managed (we want to be manually clean up the home
+ # directory), create the home dir "manually":
+ file { $home:
+ ensure => directory,
+ owner => $user,
+ group => $user,
+ mode => '0755',
+ }
+ # And the .ssh sub directory
+ file { "${home}/.ssh":
+ ensure => directory,
+ owner => $user,
+ group => $user,
+ mode => '0700',
+ require => File [$home],
+ }
+
+ # Finally publish the Jenkins master authorized key
ssh_authorized_key { $ssh_key_name:
ensure => present,
user => $user,
@@ -35,6 +53,7 @@
key => $ssh_authorized_key,
target => "${home}/.ssh/authorized_keys",
options => $ssh_key_options,
+ require => File["${home}/.ssh"],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/64282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7e24ddba89841af6f515bae11d077955827ca85
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
