denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tobias Brunner
2016-08-29 18:11:42 +02:00
parent 528c40017e
commit cf6042453f
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/do-tests
-1
View File
@@ -934,7 +934,6 @@ HTDOCS="/var/www"
ssh $SSHCONF root@${ipv4_winnetou} mkdir -p $HTDOCS/testresults > /dev/null 2>&1 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 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
echo "The results are available in $TODAYDIR" echo "The results are available in $TODAYDIR"
echo "or via the link http://$ipv4_winnetou/testresults/$TESTDATE" echo "or via the link http://$ipv4_winnetou/testresults/$TESTDATE"
testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf
+3
View File
@@ -6,6 +6,9 @@
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
</Directory> </Directory>
RewriteEngine on
RewriteRule "^/testresults/.+/images/(.*)" "/images/$1" [PT]
LogLevel warn LogLevel warn
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined CustomLog ${APACHE_LOG_DIR}/access.log combined
testing/scripts/build-guestimages
+1
View File
@@ -61,6 +61,7 @@ do
execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0 execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0
execute "cp -rf $DIR/../images $LOOPDIR/var/www/" 0 execute "cp -rf $DIR/../images $LOOPDIR/var/www/" 0
execute_chroot "a2enmod -q cgid" 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 "ln -s /etc/openssl/certs /var/www/certs" 0
execute_chroot "/etc/openssl/generate-crl" 0 execute_chroot "/etc/openssl/generate-crl" 0
execute_chroot "rm -rf /var/lib/ldap/*" 0 execute_chroot "rm -rf /var/lib/ldap/*" 0