testing: Show config files of FreeRADIUS 3.0 in test results

diff --git a/testing/do-tests b/testing/do-tests
index 8c471c128b68272f5f05c5e7eb6095589f5d5d18..77d5eccdf1bb77a9da470bb0db45afdd9f77e20a 100755 (executable)
--- a/testing/do-tests
+++ b/testing/do-tests
@@ -689,13 +689,22 @@ do
        do
            eval HOSTLOGIN=root@\$ipv4_${host}
 
-           for file in clients.conf eap.conf radiusd.conf proxy.conf users
+               RADIUS_DIR=/etc/freeradius/3.0
+               RADIUS_EAP_FILE=mods-enabled/eap
+               RADIUS_EAP_NAME=eap
+               if [ "$BASEIMGSUITE" == "jessie" ]
+               then
+                       RADIUS_DIR=/etc/freeradius
+                       RADIUS_EAP_FILE=eap.conf
+                       RADIUS_EAP_NAME=eap.conf
+               fi
+
+               for file in clients.conf radiusd.conf proxy.conf users sites-enabled/default sites-enabled/inner-tunnel $RADIUS_EAP_FILE
            do
-               scp $SSHCONF $HOSTLOGIN:/etc/freeradius/$file \
-                   $TESTRESULTDIR/${host}.$file  > /dev/null 2>&1
+               scp $SSHCONF $HOSTLOGIN:$RADIUS_DIR/$file \
+                   $TESTRESULTDIR/${host}.$(basename $file) > /dev/null 2>&1
            done
 
-
            scp $SSHCONF $HOSTLOGIN:/var/log/freeradius/radius.log \
                $TESTRESULTDIR/${host}.radius.log  > /dev/null 2>&1
 
@@ -708,11 +717,13 @@ do
          <ul>
            <li><a href="$host.clients.conf">clients.conf</a></li>
            <li><a href="$host.radiusd.conf">radiusd.conf</a></li>
+           <li><a href="$host.$RADIUS_EAP_NAME">$RADIUS_EAP_NAME</a></li>
          </ul>
        </td>
        <td valign="top">
          <ul>
-           <li><a href="$host.eap.conf">eap.conf</a></li>
+           <li><a href="$host.default">sites-enabled/default</a></li>
+           <li><a href="$host.inner-tunnel">sites-enabled/inner-tunnel</a></li>
            <li><a href="$host.radius.log">radius.log</a></li>
          </ul>
       </td>

diff --git a/testing/hosts/winnetou/etc/apache2/conf-enabled/testresults-as-text.conf b/testing/hosts/winnetou/etc/apache2/conf-enabled/testresults-as-text.conf
index 68438a65665812a22904209561d7df6caca711fe..e362e138c5072d5758c4da822cd3c12cb295d378 100644 (file)
--- a/testing/hosts/winnetou/etc/apache2/conf-enabled/testresults-as-text.conf
+++ b/testing/hosts/winnetou/etc/apache2/conf-enabled/testresults-as-text.conf
@@ -2,3 +2,4 @@ AddType text/plain .conf .log .sql .users
 AddType text/plain .secrets .listall .statusall
 AddType text/plain .conns .certs .sas .pools .authorities .stats
 AddType text/plain .policy .state .route .iptables .iptables-save
+AddType text/plain .eap .default .inner-tunnel