[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: schroot: split the fstab between default ones and jenkins-specific entries

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
3223e978 by Mattia Rizzolo at 2018-05-09T14:21:22+02:00
schroot: split the fstab between default ones and jenkins-specific entries

Also, this is coming from the current sid package.
No actual changes are in here, just re-arrenging.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
d27b06a6 by Mattia Rizzolo at 2018-05-09T14:21:34+02:00
sync file from the newest jenkins 2.107.3 package

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- hosts/common/etc/schroot/default/fstab
- hosts/jenkins/etc/default/jenkins


Changes:

=====================================
hosts/common/etc/schroot/default/fstab
=====================================
--- a/hosts/common/etc/schroot/default/fstab
+++ b/hosts/common/etc/schroot/default/fstab
@@ -2,23 +2,27 @@
 # Note that the mount point will be prefixed by the chroot path
 # (CHROOT_PATH)
 #
-# <file system>	<mount point>	<type>	<options>	<dump>	<pass>
-/proc		/proc		none    rw,bind        0       0
-/sys		/sys		none    rw,bind        0       0
+# <file system> <mount point>   <type>  <options>       <dump>  <pass>
+/proc           /proc           none    rw,bind         0       0
+/sys            /sys            none    rw,bind         0       0
 /dev            /dev            none    rw,bind         0       0
-/dev/pts	/dev/pts	none	rw,bind		0	0
-/home		/home		none	rw,bind		0	0
-/tmp		/tmp		none	rw,bind		0	0
-/srv/reproducible-results	/srv/reproducible-results	none	rw,bind		0	0
-/srv/d-i	/srv/d-i	none	rw,bind		0	0
-/srv/jenkins	/srv/jenkins	none	rw,bind		0	0
-/srv/live-build	/srv/live-build	none	rw,bind		0	0
+/dev/pts        /dev/pts        none    rw,bind         0       0
+/home           /home           none    rw,bind         0       0
+/tmp            /tmp            none    rw,bind         0       0
 
 # It may be desirable to have access to /run, especially if you wish
 # to run additional services in the chroot.  However, note that this
 # may potentially cause undesirable behaviour on upgrades, such as
 # killing services on the host.
-#/run		/run		none	rw,bind		0	0
-#/run/lock	/run/lock	none	rw,bind		0	0
-/dev/shm	/dev/shm	none	rw,bind		0	0
-/run/shm	/run/shm	none	rw,bind		0	0
+#/run           /run            none    rw,bind         0       0
+#/run/lock      /run/lock       none    rw,bind         0       0
+/dev/shm       /dev/shm        none    rw,bind         0       0
+/run/shm       /run/shm        none    rw,bind         0       0
+
+
+# jenkins-specific stuff:
+# <file system> <mount point>   <type>  <options>       <dump>  <pass>
+/srv/reproducible-results /srv/reproducible-results none rw,bind 0 0
+/srv/d-i        /srv/d-i        none    rw,bind         0        0
+/srv/jenkins    /srv/jenkins    none    rw,bind         0        0
+/srv/live-build /srv/live-build none    rw,bind         0        0


=====================================
hosts/jenkins/etc/default/jenkins
=====================================
--- a/hosts/jenkins/etc/default/jenkins
+++ b/hosts/jenkins/etc/default/jenkins
@@ -51,6 +51,10 @@ RUN_STANDALONE=true
 JENKINS_LOG=/var/log/$NAME/$NAME.log
 #JENKINS_LOG=daemon.info
 
+# Whether to enable web access logging or not.
+# Set to "yes" to enable logging to /var/log/$NAME/access_log
+JENKINS_ENABLE_ACCESS_LOG="no"
+
 # 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



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/1b3a1ab0b86299a1c2684b6ac3cde4557563dcf6...d27b06a6244d53e8564e63e5e550b1881a2cffdd

---
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/1b3a1ab0b86299a1c2684b6ac3cde4557563dcf6...d27b06a6244d53e8564e63e5e550b1881a2cffdd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20180509/1af3ec60/attachment-0001.html>