Unverified Commit 1d361f09 authored by Holger Levsen's avatar Holger Levsen
Browse files

apply our configuration changes again

parent 183b4cb6
...@@ -7,9 +7,10 @@ NAME=jenkins ...@@ -7,9 +7,10 @@ NAME=jenkins
JAVA=/usr/bin/java JAVA=/usr/bin/java
# arguments to pass to java # arguments to pass to java
JAVA_ARGS="-Djava.awt.headless=true" # Allow graphs etc. to work even when an X server is present #JAVA_ARGS="-Djava.awt.headless=true" # Allow graphs etc. to work even when an X server is present
#JAVA_ARGS="-Xmx256m" #JAVA_ARGS="-Xmx256m"
#JAVA_ARGS="-Djava.net.preferIPv4Stack=true" # make jenkins listen on IPv4 address #JAVA_ARGS="-Djava.net.preferIPv4Stack=true" # make jenkins listen on IPv4 address
JAVA_ARGS="-Djava.awt.headless=true -Xmx3072m -XX:MaxPermSize=384m"
PIDFILE=/var/run/$NAME/$NAME.pid PIDFILE=/var/run/$NAME/$NAME.pid
...@@ -37,7 +38,7 @@ JENKINS_LOG=/var/log/$NAME/$NAME.log ...@@ -37,7 +38,7 @@ JENKINS_LOG=/var/log/$NAME/$NAME.log
# this is on by default because http://github.com/jenkinsci/jenkins/commit/2fb288474e980d0e7ff9c4a3b768874835a3e92e # this is on by default because http://github.com/jenkinsci/jenkins/commit/2fb288474e980d0e7ff9c4a3b768874835a3e92e
# reported that Ubuntu's PAM configuration doesn't include pam_limits.so, and as a result the # of file # reported that Ubuntu's PAM configuration doesn't include pam_limits.so, and as a result the # of file
# descriptors are forced to 1024 regardless of /etc/security/limits.conf # descriptors are forced to 1024 regardless of /etc/security/limits.conf
MAXOPENFILES=8192 MAXOPENFILES=32768
# set the umask to control permission bits of files that Jenkins creates. # set the umask to control permission bits of files that Jenkins creates.
# 027 makes files read-only for group and inaccessible for others, which some security sensitive users # 027 makes files read-only for group and inaccessible for others, which some security sensitive users
...@@ -52,6 +53,7 @@ MAXOPENFILES=8192 ...@@ -52,6 +53,7 @@ MAXOPENFILES=8192
# by default umask comes from pam_umask(8) and /etc/login.defs # by default umask comes from pam_umask(8) and /etc/login.defs
# UMASK=027 # UMASK=027
UMASK=022
# port for HTTP connector (default 8080; disable with -1) # port for HTTP connector (default 8080; disable with -1)
HTTP_PORT=8080 HTTP_PORT=8080
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment