Updated strongTNC configuration

diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index b84536adf527f81975d3426d8df149ce9691639d..245fc2524591725582374fff815165fb0edd66a5 100755 (executable)
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -51,10 +51,7 @@ do
        if [ "$host" = "alice" ]
        then
                execute "mkdir $LOOPDIR/var/log/apache2/tnc" 0
-               execute "mkdir $LOOPDIR/etc/strongTNC" 0
                execute "mkdir $LOOPDIR/etc/pts" 0
-               execute_chroot "chgrp www-data /etc/strongTNC" 0
-               execute_chroot "chmod g+w /etc/strongTNC" 0
                execute_chroot "chgrp www-data /etc/pts" 0
                execute_chroot "chmod g+w /etc/pts" 0
        fi

diff --git a/testing/scripts/recipes/015_strongTNC.mk b/testing/scripts/recipes/015_strongTNC.mk
index 0dad6c88ecc7974988f0f88ae1e98ae4fc8dc9b4..cc4a94a0bce24b8216bd6209326a63da16846ee0 100644 (file)
--- a/testing/scripts/recipes/015_strongTNC.mk
+++ b/testing/scripts/recipes/015_strongTNC.mk
@@ -19,4 +19,4 @@ $(DEPS): $(PKG)-master
 
 install: $(DEPS)
        pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(PKG)-master/requirements.txt
-       cp -r $(PKG)-master /var/www/tnc && chgrp -R www-data /var/www/tnc
+       cp -r $(PKG)-master /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+w /var/www/tnc /var/www/tnc/django.db

diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/default b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/default
index f6bf635f45b7df1bc3d90ddd9be2bb0054634f1a..6260006123e30a7a21c139d0c56cb839cb433863 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/default
+++ b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/default
@@ -18,6 +18,8 @@ WSGIPythonPath /var/www/tnc
     WSGIApplicationGroup %{GLOBAL}
     WSGIPassAuthorization On
 
+    Alias /static/ /var/www/tnc/static/
+
     ErrorLog ${APACHE_LOG_DIR}/tnc/error.log
     LogLevel warn
     CustomLog ${APACHE_LOG_DIR}/tnc/access.log combined

diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongTNC/settings.ini b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongTNC/settings.ini
index 5d12736eb1d4cc89ee3a27d0b02a0cf4e44be572..5e7b7b556951ef61677f6523e0063fb173ab7e02 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongTNC/settings.ini
+++ b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongTNC/settings.ini
@@ -1,10 +1,10 @@
 [debug]
-DEBUG=1
-TEMPLATE_DEBUG=1
+DEBUG=0
+TEMPLATE_DEBUG=0
 DEBUG_TOOLBAR=0
 
 [db]
-DJANGO_DB_URL=sqlite:////etc/strongTNC/django.db
+DJANGO_DB_URL=sqlite:////var/www/tnc/django.db
 STRONGTNC_DB_URL = sqlite:////etc/pts/config.db
 
 [localization]
@@ -16,4 +16,4 @@ Your Name: alice@strongswan.org
 
 [security]
 SECRET_KEY=strongSwan
-
+ALLOWED_HOSTS=127.0.0.1,10.10.0.1,tnc.strongswan.org,tnc

diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat b/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat
index 6c747778648fedcd8f31f9ac39f1776b91163c21..4ba63d1c5f8cd283779cc67e6b3679fcfd5555e9 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat
+++ b/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat
@@ -9,6 +9,7 @@ dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id
 alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql
 alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
 alice::chgrp www-data /etc/pts/config.db; chmod g+w /etc/pts/config.db
+alice::/var/www/tnc/manage.py setpassword strongSwan strongSwan
 alice::service apache2 start
 alice::ipsec start
 moon::ipsec start

diff --git a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/default b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/default
index f6bf635f45b7df1bc3d90ddd9be2bb0054634f1a..6260006123e30a7a21c139d0c56cb839cb433863 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/default
+++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/default
@@ -18,6 +18,8 @@ WSGIPythonPath /var/www/tnc
     WSGIApplicationGroup %{GLOBAL}
     WSGIPassAuthorization On
 
+    Alias /static/ /var/www/tnc/static/
+
     ErrorLog ${APACHE_LOG_DIR}/tnc/error.log
     LogLevel warn
     CustomLog ${APACHE_LOG_DIR}/tnc/access.log combined

diff --git a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongTNC/settings.ini b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongTNC/settings.ini
index 5d12736eb1d4cc89ee3a27d0b02a0cf4e44be572..5e7b7b556951ef61677f6523e0063fb173ab7e02 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongTNC/settings.ini
+++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongTNC/settings.ini
@@ -1,10 +1,10 @@
 [debug]
-DEBUG=1
-TEMPLATE_DEBUG=1
+DEBUG=0
+TEMPLATE_DEBUG=0
 DEBUG_TOOLBAR=0
 
 [db]
-DJANGO_DB_URL=sqlite:////etc/strongTNC/django.db
+DJANGO_DB_URL=sqlite:////var/www/tnc/django.db
 STRONGTNC_DB_URL = sqlite:////etc/pts/config.db
 
 [localization]
@@ -16,4 +16,4 @@ Your Name: alice@strongswan.org
 
 [security]
 SECRET_KEY=strongSwan
-
+ALLOWED_HOSTS=127.0.0.1,10.10.0.1,tnc.strongswan.org,tnc

diff --git a/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat b/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat
index 0918909fac35153389eedf294a511f52a6197c15..ca8f47db014365539a4f81734a9ad8eaa73a3bcb 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat
+++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat
@@ -9,6 +9,7 @@ dave::cat /etc/tnc_config
 alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql
 alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
 alice::chgrp www-data /etc/pts/config.db; chmod g+w /etc/pts/config.db
+alice::/var/www/tnc/manage.py setpassword strongSwan strongSwan
 alice::service apache2 start
 alice::ipsec start
 alice::sleep 1