diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2016-12-17 18:09:20 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2016-12-17 18:09:20 +0100 |
| commit | 470e61ae77ba1a957dcc9ce68e7a80a444b86581 (patch) | |
| tree | b865e6e50a6e9e438e9f519315b7a8fab4bc1f41 /testing | |
| parent | 3c1e5ad6ce0b462250bed432f871b10e32fbba88 (diff) | |
| download | strongswan-470e61ae77ba1a957dcc9ce68e7a80a444b86581.tar.bz2 strongswan-470e61ae77ba1a957dcc9ce68e7a80a444b86581.tar.xz | |
testing: strongTNC does not come with django.db any more
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/hosts/default/usr/local/bin/init_tnc | 15 | ||||
| -rw-r--r-- | testing/scripts/recipes/015_strongTNC.mk | 2 | ||||
| -rw-r--r-- | testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat | 2 | ||||
| -rw-r--r-- | testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat | 2 |
4 files changed, 18 insertions, 3 deletions
diff --git a/testing/hosts/default/usr/local/bin/init_tnc b/testing/hosts/default/usr/local/bin/init_tnc new file mode 100755 index 000000000..49084e477 --- /dev/null +++ b/testing/hosts/default/usr/local/bin/init_tnc @@ -0,0 +1,15 @@ +#!/bin/sh + +cd /var/www/tnc + +if [ -f django.db ] +then + exit 0 +fi + +./manage.py migrate --database meta +./manage.py setpassword strongSwan strongSwan +./manage.py collectstatic --noinput + +chmod g+w django.db +exit 0 diff --git a/testing/scripts/recipes/015_strongTNC.mk b/testing/scripts/recipes/015_strongTNC.mk index cc4a94a0b..419d60bb1 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 && chmod g+w /var/www/tnc /var/www/tnc/django.db + cp -r $(PKG)-master /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+sw /var/www/tnc diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat b/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat index 36c7cc6a2..385cc305a 100644 --- a/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat @@ -16,7 +16,7 @@ alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql alice::sed -i "s:DEBIAN_VERSION:\`cat /etc/debian_version\`:" /etc/pts/data1.sql alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db alice::chgrp -R www-data /etc/db.d/config.db; chmod -R g+w /etc/db.d/config.db -alice::/var/www/tnc/manage.py setpassword strongSwan strongSwan +alice::/usr/local/bin/init_tnc alice::service apache2 start alice::service charon start moon::service charon start 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 860a6c342..17951e811 100644 --- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat @@ -10,7 +10,7 @@ alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql alice::sed -i "s:DEBIAN_VERSION:\`cat /etc/debian_version\`:" /etc/pts/data1.sql alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db alice::chgrp -R www-data /etc/db.d/config.db; chmod -R g+w /etc/db.d/config.db -alice::/var/www/tnc/manage.py setpassword strongSwan strongSwan +alice::/usr/local/bin/init_tnc alice::rm /etc/swanctl/x509/aliceCert.pem alice::rm /etc/swanctl/rsa/aliceKey.pem alice::service charon start |