diff options
| -rwxr-xr-x | bin/cd_tester.sh | 2 | ||||
| -rw-r--r-- | d-i-preseed-cfgs/squeeze-test-debian-edu-standalone-preseed.cfg (renamed from userContent/squeeze-test-debian-edu-standalone-preseed.cfg) | 0 | ||||
| -rw-r--r-- | d-i-preseed-cfgs/wheezy-debian-edu-workstation-preseed.cfg (renamed from userContent/wheezy-debian-edu-workstation-preseed.cfg) | 0 | ||||
| -rw-r--r-- | d-i-preseed-cfgs/wheezy-lxde-preseed.cfg (renamed from userContent/wheezy-lxde-preseed.cfg) | 0 | ||||
| -rw-r--r-- | etc/apache2/sites-available/jenkins.debian.net | 3 | ||||
| -rwxr-xr-x | update_jdn.sh | 2 |
6 files changed, 5 insertions, 2 deletions
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh index 808400cf..b230b9ac 100755 --- a/bin/cd_tester.sh +++ b/bin/cd_tester.sh @@ -108,7 +108,7 @@ bootstrap() { QEMU_BOOT="-boot d" QEMU_WEBSERVER=http://10.0.2.2/ # preseeding related variables - PRESEED_PATH=userContent + PRESEED_PATH=d-i-preseed-cfgs PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}-preseed.cfg" INST_LOCALE="locale=en_US" INST_KEYMAP="keymap=us" diff --git a/userContent/squeeze-test-debian-edu-standalone-preseed.cfg b/d-i-preseed-cfgs/squeeze-test-debian-edu-standalone-preseed.cfg index 1fb36097..1fb36097 100644 --- a/userContent/squeeze-test-debian-edu-standalone-preseed.cfg +++ b/d-i-preseed-cfgs/squeeze-test-debian-edu-standalone-preseed.cfg diff --git a/userContent/wheezy-debian-edu-workstation-preseed.cfg b/d-i-preseed-cfgs/wheezy-debian-edu-workstation-preseed.cfg index 284d1e13..284d1e13 100644 --- a/userContent/wheezy-debian-edu-workstation-preseed.cfg +++ b/d-i-preseed-cfgs/wheezy-debian-edu-workstation-preseed.cfg diff --git a/userContent/wheezy-lxde-preseed.cfg b/d-i-preseed-cfgs/wheezy-lxde-preseed.cfg index 1b97f968..1b97f968 100644 --- a/userContent/wheezy-lxde-preseed.cfg +++ b/d-i-preseed-cfgs/wheezy-lxde-preseed.cfg diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net index 0a6f3d09..fe3a0192 100644 --- a/etc/apache2/sites-available/jenkins.debian.net +++ b/etc/apache2/sites-available/jenkins.debian.net @@ -30,6 +30,9 @@ RewriteCond %{QUERY_STRING} token RewriteRule ^ - [F] + # map /d-i-preseed-cfgs to /UserContent/d-i-preseed-cfgs + RewriteRule ^/etc/apache2/sites-available/jenkins.debian.net/.*$ /userContent/d-i-preseed-cfgs/$2 [R] + ProxyRequests Off <Proxy *> Order deny,allow diff --git a/update_jdn.sh b/update_jdn.sh index ac90a651..080bc1c7 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -61,7 +61,7 @@ cd $BASEDIR cp -r bin logparse job-cfg /srv/jenkins/ cp procmailrc /var/lib/jenkins/.procmailrc explain "Jenkins updated." -cp -r README INSTALL TODO userContent/* /var/lib/jenkins/userContent/ +cp -r README INSTALL TODO d-i-preseed-cfgs userContent/* /var/lib/jenkins/userContent/ cd /var/lib/jenkins/userContent/ ASCIIDOC_PARAMS="-a numbered -a data-uri -a iconsdir=/etc/asciidoc/images/icons -a scriptsdir=/etc/asciidoc/javascripts -b html5 -a toc -a toclevels=4 -a icons -a stylesheet=$(pwd)/theme/debian-asciidoc.css" asciidoc $ASCIIDOC_PARAMS -o about.html README |