Updated strongTNC configuration
authorAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 11 Jun 2014 16:09:48 +0000 (18:09 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 11 Jun 2014 16:12:34 +0000 (18:12 +0200)
testing/scripts/build-guestimages
testing/scripts/recipes/015_strongTNC.mk
testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/default
testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongTNC/settings.ini
testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat
testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/default
testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongTNC/settings.ini
testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat

index b84536a..245fc25 100755 (executable)
@@ -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
index 0dad6c8..cc4a94a 100644 (file)
@@ -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
index f6bf635..6260006 100644 (file)
@@ -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
index 5d12736..5e7b7b5 100644 (file)
@@ -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
index 6c74777..4ba63d1 100644 (file)
@@ -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
index f6bf635..6260006 100644 (file)
@@ -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
index 5d12736..5e7b7b5 100644 (file)
@@ -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
index 0918909..ca8f47d 100644 (file)
@@ -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