Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove jjb custom scripting"
[releng/builder.git]
/
jenkins-scripts
/
basic_settings.sh
diff --git
a/jenkins-scripts/basic_settings.sh
b/jenkins-scripts/basic_settings.sh
index cfc077d8785a5035a15b6c6868a1f8c613b5a810..bca93210b8e01a949bc1950b392dbbb34eb4b97b 100755
(executable)
--- a/
jenkins-scripts/basic_settings.sh
+++ b/
jenkins-scripts/basic_settings.sh
@@
-1,26
+1,23
@@
#!/bin/bash
#Increase limits
#!/bin/bash
#Increase limits
-cat <<EOF > /etc/security/limits.d/jenkins
-jenkins
soft nofile
16000
-jenkins
hard nofile
16000
+cat <<EOF > /etc/security/limits.d/jenkins
.conf
+jenkins
soft nofile
16000
+jenkins
hard nofile
16000
EOF
cat <<EOSSH >> /etc/ssh/ssh_config
EOF
cat <<EOSSH >> /etc/ssh/ssh_config
+Host *
+ ServerAliveInterval 60
# we don't want to do SSH host key checking on Rackspace spin-up systems
# Dallas (ODL)
# we don't want to do SSH host key checking on Rackspace spin-up systems
# Dallas (ODL)
-Host 10.
30.11
.*
+Host 10.
29.12.* 10.29.13.* 10.29.14.* 10.29.15
.*
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
-# Dallas (ODLForge)
-Host 10.30.12.*
- StrictHostKeyChecking no
- UserKnownHostsFile /dev/null
-
-# Chicago (ODL)
-Host 10.30.32.*
+# Private Cloud (ODL)
+Host 10.29.8.* 10.29.9.* 10.29.10.* 10.29.11.*
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
EOSSH
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
EOSSH