summaryrefslogtreecommitdiff
path: root/vm-data/jenkins.customize
diff options
context:
space:
mode:
Diffstat (limited to 'vm-data/jenkins.customize')
-rwxr-xr-xvm-data/jenkins.customize14
1 files changed, 11 insertions, 3 deletions
diff --git a/vm-data/jenkins.customize b/vm-data/jenkins.customize
index b181303..a372aea 100755
--- a/vm-data/jenkins.customize
+++ b/vm-data/jenkins.customize
@@ -62,9 +62,17 @@ install -m 0600 vm-data/jenkins.host-key "$rootdir/etc/ssh/ssh_host_rsa_key"
install -m 0644 vm-data/jenkins.host-key.pub \
"$rootdir/etc/ssh/ssh_host_rsa_key.pub"
-# Install the worker user key into Jenkins's allowed_keys file.
+# Install the Jenkins user ssh key.
mkdir -m 0700 "$rootdir/var/lib/jenkins/.ssh"
-cp vm-data/worker.user-key.pub "$rootdir/var/lib/jenkins/.ssh/authorized_keys"
-chmod 0600 "$rootdir/var/lib/jenkins/.ssh/authorized_keys"
+install -m 0600 vm-data/jenkins.user-key \
+ "$rootdir/var/lib/jenkins/.ssh/id_rsa"
+install -m 0644 vm-data/jenkins.user-key.pub \
+ "$rootdir/var/lib/jenkins/.ssh/id_rsa.pub"
+
+# Install the worker user key into Jenkins's allowed_keys file.
+install -m 0600 vm-data/worker.user-key.pub \
+ "$rootdir/var/lib/jenkins/.ssh/authorized_keys"
+
+# Make sure the Jenkins .ssh directory, with contents, is all owned by Jenkins.
chroot "$rootdir" chown -R jenkins:jenkins /var/lib/jenkins/.ssh/.