merge

CONTRIBUTORS

@@ -18,6 +18,7 @@ Contributors:
 * Marvin Reimer (https://github.com/therealmarv)
 * Mickaël Tricot (https://github.com/mickaeltr)
 * Sylvain Veyrié (https://github.com/turb)
+* Sébastien Fievet (https://github.com/zyegfryed)
 * Thomas B Homburg (https://github.com/homburg)
 * Timo Rantalaiho (https://github.com/timorantalaiho)
 * mxxcon (https://github.com/mxxcon)

README.md

@@ -35,7 +35,6 @@ jenkins_configuration: /etc/default/jenkins
 jenkins_home: /var/lib/jenkins              # Jenkins home location
 jenkins_root: /usr/share/jenkins            # Location of jenkins arch indep files
 
-jenkins_listen_address: 127.0.0.1           # The address Jenkins will listen on
 jenkins_http_host: 127.0.0.1                # Set HTTP host
 jenkins_http_port: 8000                     # Set HTTP port
 jenkins_prefix: "/"
@@ -89,7 +88,8 @@ jenkins_jobs: []                            # Simple manage Jenkins jobs
 jenkins_java: /usr/bin/java
 jenkins_java_args:
   - "-Djava.awt.headless=true"
-jenkins_pidfile: /var/run/jenkins.pid
+  - "-Djenkins.install.runSetupWizard=false"
+jenkins_pidfile: /run/jenkins/jenkins.pid
 jenkins_run_standalone: yes
 jenkins_war: "{{ jenkins_root }}/jenkins.war"
 

defaults/main.yml

@@ -9,7 +9,6 @@ jenkins_become_method: sudo
 jenkins_configuration: /etc/default/jenkins
 jenkins_home: /var/lib/jenkins              # Jenkins home location
 jenkins_root: /usr/share/jenkins            # Location of jenkins arch indep files
-jenkins_listen_address: 127.0.0.1           # The address jenkins listens on
 jenkins_http_host: 127.0.0.1                # Set HTTP host
 jenkins_http_port: 8000                     # Set HTTP port
 jenkins_maxopenfiles: 65535                 # Increase files limit
@@ -63,7 +62,8 @@ jenkins_jobs: []                            # Simple manage Jenkins jobs
 jenkins_java: /usr/bin/java
 jenkins_java_args:
   - "-Djava.awt.headless=true"
-jenkins_pidfile: /var/run/jenkins.pid
+  - "-Djenkins.install.runSetupWizard=false"
+jenkins_pidfile: /run/jenkins/jenkins.pid
 jenkins_run_standalone: yes
 jenkins_war: "{{ jenkins_root }}/jenkins.war"
 

templates/jenkins.j2

@@ -11,24 +11,19 @@ JAVA={{jenkins_java}}
 
 # arguments to pass to java
 JAVA_ARGS="{{ jenkins_java_args|default([])|join(' ') }}"
+
 PIDFILE={{jenkins_pidfile}}
 
-# user id to be invoked as (otherwise will run as root; not wise!)
+# user and group to be invoked as (default to jenkins)
 JENKINS_USER={{jenkins_user}}
 JENKINS_GROUP={{jenkins_group}}
 
-# location of jenkins arch indep files
-JENKINS_ROOT={{jenkins_root}}
-
 # location of the jenkins war file
 JENKINS_WAR={{jenkins_war}}
 
 # jenkins home location
 JENKINS_HOME={{jenkins_home}}
 
-# jenkins /run location
-JENKINS_RUN=/var/run/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.
@@ -39,34 +34,40 @@ JENKINS_LOG={{jenkins_log}}
 
 # OS LIMITS SETUP
 #   comment this out to observe /etc/security/limits.conf
-#   this is on by default because http://github.com/feniix/hudson/commit/d13c08ea8f5a3fa730ba174305e6429b74853927
+#   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={{ jenkins_maxopenfiles }}
 
-# port for AJP connector (disabled by default)
-AJP_PORT=-1
+# 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
+#   might consider benefitial, especially if Jenkins runs in a box that's used for multiple purposes.
+#   Beware that 027 permission would interfere with sudo scripts that run on the master (JENKINS-25065.)
+#
+#   Note also that the particularly sensitive part of $JENKINS_HOME (such as credentials) are always
+#   written without 'others' access. So the umask values only affect job configuration, build records,
+#   that sort of things.
+#
+#   If commented out, the value from the OS is inherited,  which is normally 022 (as of Ubuntu 12.04,
+#   by default umask comes from pam_umask(8) and /etc/login.defs
 
-# Listen address for HTTP connector
-HTTP_HOST={{jenkins_listen_address}}
+# UMASK=027
 
 # port for HTTP connector (default 8080; disable with -1)
 HTTP_PORT={{jenkins_http_port}}
 
-# Listen address for AJP connector
-AJP_HOST={{jenkins_http_host}}
 
-#Custom prefix
+# servlet context, important if you want to use apache proxying
 PREFIX={{jenkins_prefix}}
 
 # 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
+# --argumentsRealm.roles.$ADMIN_USER=admin
 # --webroot=~/.jenkins/war
-JENKINS_ARGS="--webroot=/var/cache/$NAME/war --httpPort=$HTTP_PORT --ajp13Port=$AJP_PORT"
-JENKINS_ARGS="$JENKINS_ARGS --httpListenAddress=$HTTP_HOST --ajp13ListenAddress=$AJP_HOST"
+# --prefix=$PREFIX
+
+JENKINS_ARGS="--webroot=/var/cache/$NAME/war --httpPort=$HTTP_PORT"
 JENKINS_ARGS="$JENKINS_ARGS --prefix=$PREFIX"