Fix getting slave.jar with authentication
diff --git a/jenkins/files/init.d/jenkins-slave b/jenkins/files/init.d/jenkins-slave
index 9aa98f3..ac23bd6 100644
--- a/jenkins/files/init.d/jenkins-slave
+++ b/jenkins/files/init.d/jenkins-slave
@@ -36,7 +36,7 @@
function start() {
# Get slave.jar from master
- [ -f ${JENKINS_HOME}/slave.jar ] || wget -O ${JENKINS_HOME}/slave.jar -q ${JENKINS_URL}/jnlpJars/slave.jar
+ [ -f ${JENKINS_HOME}/slave.jar ] || wget --username=${JENKINS_LOGIN} --password=${JENKINS_PASSWORD} -O ${JENKINS_HOME}/slave.jar -q ${JENKINS_URL}/jnlpJars/slave.jar
if start-stop-daemon -c ${JENKINS_USER} -d ${JENKINS_HOME} --background --start --quiet --oknodo -m --pidfile ${PIDFILE} --exec ${COMMAND} -- ${COMMAND_ARGS}; then
log_end_msg 0 || true
diff --git a/jenkins/files/jenkins-slave b/jenkins/files/jenkins-slave
index 396aff3..928fb49 100644
--- a/jenkins/files/jenkins-slave
+++ b/jenkins/files/jenkins-slave
@@ -26,7 +26,11 @@
# jenkins /run location
JENKINS_RUN=/var/run/jenkins
-# URL of jenkins server to connect to
+# Authentication to jenkins master
+JENKINS_LOGIN="{{ slave.user.name }}"
+JENKINS_PASSWORD="{{ slave.user.password }}"
+
+# URL of jenkins server to connect to
JENKINS_URL="{{ slave.master.protocol }}://{{ slave.master.host }}:{{ slave.master.port }}"
# Name of slave configuration to use at JENKINS_URL
@@ -47,4 +51,4 @@
MAXOPENFILES=8192
# Arguments to pass to jenkins slave on startup
-JENKINS_ARGS="-jnlpUrl $JENKINS_URL/computer/$JENKINS_HOSTNAME/slave-agent.jnlp -jnlpCredentials {{ slave.user.name }}:{{ slave.user.password }}"
+JENKINS_ARGS="-jnlpUrl ${JENKINS_URL}/computer/$JENKINS_HOSTNAME/slave-agent.jnlp -jnlpCredentials ${JENKINS_USER}:${JENKINS_PASSWORD}"