testing: Serve images in testresults via mod_rewrite and not a symlink

diff --git a/testing/do-tests b/testing/do-tests
index d0d1ead887e953ec1bca110c0c96c94207a7dde1..f460d49885f9cb948113d22898b20dceb9440f94 100755 (executable)
--- a/testing/do-tests
+++ b/testing/do-tests
@@ -934,7 +934,6 @@ HTDOCS="/var/www"
 
 ssh $SSHCONF root@${ipv4_winnetou} mkdir -p $HTDOCS/testresults > /dev/null 2>&1
 scp $SSHCONF -r $TODAYDIR root@${ipv4_winnetou}:$HTDOCS/testresults > /dev/null 2>&1
-ssh $SSHCONF root@${ipv4_winnetou} ln -s $HTDOCS/images $HTDOCS/testresults/$TESTDATE/images > /dev/null 2>&1
 echo
 echo "The results are available in $TODAYDIR"
 echo "or via the link http://$ipv4_winnetou/testresults/$TESTDATE"

diff --git a/testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf b/testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf
index 933589906f3443ae3fa61dea9e33c496f36ce2cc..03f93ad2e5ec7a8a2c3e808a3adada3540511f3e 100644 (file)
--- a/testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf
+++ b/testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf
@@ -6,6 +6,9 @@
                 Options Indexes FollowSymLinks MultiViews
         </Directory>
 
+        RewriteEngine on
+        RewriteRule "^/testresults/.+/images/(.*)" "/images/$1" [PT]
+
         LogLevel warn
         ErrorLog ${APACHE_LOG_DIR}/error.log
         CustomLog ${APACHE_LOG_DIR}/access.log combined

diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index e2ec422b11718e659042abdfba4a06be9957f4fa..8fd101003da1689540874ed245a609884a560c1d 100755 (executable)
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -61,6 +61,7 @@ do
                execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0
                execute "cp -rf $DIR/../images $LOOPDIR/var/www/" 0
                execute_chroot "a2enmod -q cgid" 0
+               execute_chroot "a2enmod -q rewrite" 0
                execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0
                execute_chroot "/etc/openssl/generate-crl" 0
                execute_chroot "rm -rf /var/lib/ldap/*" 0