denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Use venv for strongTNC

Browse Source 
Also updated to a newer version to fix dependency issues.
This commit is contained in:
Tobias Brunner
2023-07-13 10:48:53 +02:00
parent 9b8f26b407
commit 21bf3e41f9
6 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/hosts/default/usr/local/bin/init_tnc
+2
View File
@@ -7,6 +7,8 @@ then
exit 0 exit 0
fi fi
. /usr/local/venvs/tnc/bin/activate
./manage.py migrate --database meta ./manage.py migrate --database meta
./manage.py setpassword strongSwan strongSwan ./manage.py setpassword strongSwan strongSwan
./manage.py collectstatic --noinput ./manage.py collectstatic --noinput
testing/scripts/build-baseimage
+1 -1
View File
@@ -19,7 +19,7 @@ INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libltdl-dev,wget,gnupg,man-db
INC=$INC,libboost-thread-dev,libboost-system-dev,git,iperf,htop,valgrind,strace INC=$INC,libboost-thread-dev,libboost-system-dev,git,iperf,htop,valgrind,strace
INC=$INC,gnat,gprbuild,acpid,acpi-support-base,libldns-dev,libunbound-dev INC=$INC,gnat,gprbuild,acpid,acpi-support-base,libldns-dev,libunbound-dev
INC=$INC,dnsutils,libsoup2.4-dev,ca-certificates,unzip,libsystemd-dev INC=$INC,dnsutils,libsoup2.4-dev,ca-certificates,unzip,libsystemd-dev
INC=$INC,python3,python3-setuptools,python3-dev,python3-pip,python3-daemon, INC=$INC,python3,python3-setuptools,python3-dev,python3-daemon,python3-venv,
INC=$INC,apt-transport-https,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3 INC=$INC,apt-transport-https,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3
INC=$INC,libxerces-c-dev INC=$INC,libxerces-c-dev
case "$BASEIMGSUITE" in case "$BASEIMGSUITE" in
testing/scripts/recipes/015_strongTNC.mk
+4 -2
View File
@@ -1,11 +1,12 @@
#!/usr/bin/make #!/usr/bin/make
PKG = strongTNC PKG = strongTNC
REV = 1.0 REV = 1.0.2
DIR = $(PKG)-$(REV) DIR = $(PKG)-$(REV)
ZIP = $(PKG)-$(REV).zip ZIP = $(PKG)-$(REV).zip
SRC = https://github.com/strongswan/$(PKG)/archive/$(REV).zip SRC = https://github.com/strongswan/$(PKG)/archive/$(REV).zip
DEPS = $(PKG)-deps DEPS = $(PKG)-deps
VENV = /usr/local/venvs/tnc
all: install all: install
@@ -22,5 +23,6 @@ $(ZIP):
@touch $@ @touch $@
install: .$(PKG)-deps-$(REV) install: .$(PKG)-deps-$(REV)
pip3 install --no-index --find-links=file://`pwd`/$(DEPS) -r $(DIR)/requirements.txt python3 -m venv $(VENV)
$(VENV)/bin/pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(DIR)/requirements.txt
cp -r $(DIR) /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+sw /var/www/tnc cp -r $(DIR) /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+sw /var/www/tnc
testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/alice/etc/apache2/sites-available/000-default.conf
+1
View File
@@ -1,3 +1,4 @@
WSGIPythonHome /usr/local/venvs/tnc
WSGIPythonPath /var/www/tnc WSGIPythonPath /var/www/tnc
<VirtualHost *:80> <VirtualHost *:80>
testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/000-default.conf
+1
View File
@@ -1,3 +1,4 @@
WSGIPythonHome /usr/local/venvs/tnc
WSGIPythonPath /var/www/tnc WSGIPythonPath /var/www/tnc
<VirtualHost *:80> <VirtualHost *:80>
testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/000-default.conf
+1
View File
@@ -1,3 +1,4 @@
WSGIPythonHome /usr/local/venvs/tnc
WSGIPythonPath /var/www/tnc WSGIPythonPath /var/www/tnc
<VirtualHost *:80> <VirtualHost *:80>