From 305f6543bdbd0d1c6569ca15e0db01bc9900bbb3 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Wed, 29 Apr 2015 15:36:49 +0000 Subject: [PATCH] Adds jenkins default file This change moves the jenkins file from system-config. Change-Id: I87849efa7a40f3ac62e90e2d763a2836b6d91aab Depends-On: I7316dba6cb333bf0821eacde8341601409a4453d --- files/jenkins.default | 62 +++++++++++++++++++++++++++++++++++++++++++ manifests/master.pp | 8 ++++++ 2 files changed, 70 insertions(+) create mode 100644 files/jenkins.default diff --git a/files/jenkins.default b/files/jenkins.default new file mode 100644 index 0000000..ce455a6 --- /dev/null +++ b/files/jenkins.default @@ -0,0 +1,62 @@ +# defaults for jenkins continuous integration server + +# pulled in from the init script; makes things easier. +NAME=jenkins + +# location of java +JAVA=/usr/bin/java + +# arguments to pass to java +#JAVA_ARGS="-Xmx256m" +#JAVA_ARGS="-Djava.net.preferIPv4Stack=true" # make jenkins listen on IPv4 address +# Disable compression as zip deflation threads eat CPU time. +# https://issues.jenkins-ci.org/browse/JENKINS-14362 +JAVA_ARGS="-Xloggc:/var/log/jenkins/gc.log -XX:+PrintGCDetails -Xmx12g -Dorg.kohsuke.stapler.compression.CompressionFilter.disabled=true -Djava.util.logging.config.file=/var/lib/jenkins/logger.conf" + +PIDFILE=/var/run/jenkins/jenkins.pid + +# user id to be invoked as (otherwise will run as root; not wise!) +JENKINS_USER=jenkins + +# location of the jenkins war file +JENKINS_WAR=/usr/share/jenkins/jenkins.war + +# jenkins home location +JENKINS_HOME=/var/lib/jenkins + +# set this to false if you don't want Hudson to run by itself +# in this set up, you are expected to provide a servlet container +# to host jenkins. +RUN_STANDALONE=true + +# log location. this may be a syslog facility.priority +JENKINS_LOG=/var/log/jenkins/$NAME.log +#HUDSON_LOG=daemon.info + +# OS LIMITS SETUP +# comment this out to observe /etc/security/limits.conf +# 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 +# descriptors are forced to 1024 regardless of /etc/security/limits.conf +MAXOPENFILES=8192 + +# port for HTTP connector (default 8080; disable with -1) +HTTP_PORT=8080 + +# port for AJP connector (disabled by default) +AJP_PORT=-1 + +# servlet context, important if you want to use apache proxying +PREFIX=/jenkins + +# arguments to pass to jenkins. +# --javahome=$JAVA_HOME +# --httpPort=$HTTP_PORT (default 8080; disable with -1) +# --httpsPort=$HTTP_PORT +# --ajp13Port=$AJP_PORT +# --argumentsRealm.passwd.$ADMIN_USER=[password] +# --argumentsRealm.$ADMIN_USER=admin +# --webroot=~/.jenkins/war +# --prefix=$PREFIX + +JENKINS_ARGS="--webroot=/var/cache/jenkins/war --httpPort=$HTTP_PORT --ajp13Port=$AJP_PORT" diff --git a/manifests/master.pp b/manifests/master.pp index f07e232..e640156 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -125,6 +125,14 @@ class jenkins::master( command => 'apt-get update', } + file { '/etc/default/jenkins': + ensure => present, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/jenkins/jenkins.default', + } + file { '/var/lib/jenkins': ensure => directory, owner => 'jenkins',