diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2014-06-11 18:09:48 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2014-06-11 18:12:34 +0200 |
| commit | cda2a1e4dc2a1ab571a9d3fb140cb539694e0645 (patch) | |
| tree | 785c87e9307bf5c7927ed8fe3bd347027717bed8 | |
| parent | d643f2cf91413b51a06f9b0a538408616e49837e (diff) | |
| download | strongswan-cda2a1e4dc2a1ab571a9d3fb140cb539694e0645.tar.bz2 strongswan-cda2a1e4dc2a1ab571a9d3fb140cb539694e0645.tar.xz | |
Updated strongTNC configuration
8 files changed, 15 insertions, 12 deletions
diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages index b84536adf..245fc2524 100755 --- 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 0dad6c88e..cc4a94a0b 100644 --- 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 f6bf635f4..626000612 100644 --- 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 5d12736eb..5e7b7b556 100644 --- 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 6c7477786..4ba63d1c5 100644 --- 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 f6bf635f4..626000612 100644 --- 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 5d12736eb..5e7b7b556 100644 --- 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 0918909fa..ca8f47db0 100644 --- 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 |