This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 7d7ce10 bin/slave-sync.sh: turns out that git pull --rebase is actually behaving well, I just made a mistake. new 72c1f2e bin/slave-start-prepare.sh: drop --insecure parameter to cURL. new 39bf3cb bin/slave-start-prepare.sh: use parameters -J and -O to save the contents to a file. new bab75b0 bin/slave-start-prepare.sh: terminate script with "exec java". The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/slave-start-prepare.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 72c1f2eeb893506f835a4750b20bde5f721b0e1e Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Sep 8 02:29:03 2017 +0200 bin/slave-start-prepare.sh: drop --insecure parameter to cURL. We're now using a certificate that is trusted by the system, so connections should work without that parameter. --- bin/slave-start-prepare.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/slave-start-prepare.sh b/bin/slave-start-prepare.sh index 290b62c..ab16b57 100755 --- a/bin/slave-start-prepare.sh +++ b/bin/slave-start-prepare.sh @@ -31,12 +31,15 @@ fi rm -f -- "slave.jar" +# This comment is only for documentation - we're not using self-signed +# certificates any longer and thus don't need the --insecure option. +# Keeping the comment for documentation, though. # Even though we pin the certificate's public key, the --insecure option # is needed since our certificate (currently) is self-signed, which leads to # curl rejecting the certificate. # This is okay, since curl still checks for the pubkey hash and aborts the # connection if the server's pubkey hash doesn't match the pinned one, even # when calling it with the --insecure parameter. -curl -R --pinnedpubkey "${ssl_hash}" --insecure "https://${host}/jnlpJars/slave.jar" +curl -R --pinnedpubkey "${ssl_hash}" "https://${host}/jnlpJars/slave.jar" java -jar "slave.jar" -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit bab75b09a22acdf9e024c242f9af78294a45dde5 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Sep 8 02:31:23 2017 +0200 bin/slave-start-prepare.sh: terminate script with "exec java". --- bin/slave-start-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/slave-start-prepare.sh b/bin/slave-start-prepare.sh index 50cf254..94d1ef0 100755 --- a/bin/slave-start-prepare.sh +++ b/bin/slave-start-prepare.sh @@ -42,4 +42,4 @@ rm -f -- "slave.jar" # when calling it with the --insecure parameter. curl -R --pinnedpubkey "${ssl_hash}" -JO "https://${host}/jnlpJars/slave.jar" -java -jar "slave.jar" +exec java -jar "slave.jar" -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 39bf3cbeaff182c9140b694da1516bc1a86c6675 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Sep 8 02:30:27 2017 +0200 bin/slave-start-prepare.sh: use parameters -J and -O to save the contents to a file. With -J, the file name is obtained via a server header if possible. --- bin/slave-start-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/slave-start-prepare.sh b/bin/slave-start-prepare.sh index ab16b57..50cf254 100755 --- a/bin/slave-start-prepare.sh +++ b/bin/slave-start-prepare.sh @@ -40,6 +40,6 @@ rm -f -- "slave.jar" # This is okay, since curl still checks for the pubkey hash and aborts the # connection if the server's pubkey hash doesn't match the pinned one, even # when calling it with the --insecure parameter. -curl -R --pinnedpubkey "${ssl_hash}" "https://${host}/jnlpJars/slave.jar" +curl -R --pinnedpubkey "${ssl_hash}" -JO "https://${host}/jnlpJars/slave.jar" java -jar "slave.jar" -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
-
git-admin＠x2go.org