diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2014-07-11 07:23:31 +0200 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2014-07-11 07:23:31 +0200 |
| commit | 81c63b0eed39432878f78727f60a1e7499645199 (patch) | |
| tree | 82387d8fecd1c20788fd8bd784a9b0bde091fb6b /testing/scripts | |
| parent | c5ebfc7b9c16551fe825dc1d79c3f7e2f096f6c9 (diff) | |
| download | vyos-strongswan-81c63b0eed39432878f78727f60a1e7499645199.tar.gz vyos-strongswan-81c63b0eed39432878f78727f60a1e7499645199.zip | |
Imported Upstream version 5.2.0
Diffstat (limited to 'testing/scripts')
| -rwxr-xr-x | testing/scripts/build-baseimage | 4 | ||||
| -rwxr-xr-x | testing/scripts/build-guestimages | 9 | ||||
| -rw-r--r-- | testing/scripts/recipes/014_swid_generator.mk | 16 | ||||
| -rw-r--r-- | testing/scripts/recipes/015_strongTNC.mk | 22 |
4 files changed, 49 insertions, 2 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index b6b8854ab..956fc93ca 100755 --- a/testing/scripts/build-baseimage +++ b/testing/scripts/build-baseimage @@ -17,7 +17,9 @@ INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev INC=$INC,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core INC=$INC,less,acpid,acpi-support-base,libldns-dev,libunbound-dev,dnsutils,screen INC=$INC,gnat,gprbuild,libahven3-dev,libxmlada4.1-dev,libgmpada3-dev -INC=$INC,libalog0.4.1-base-dev,hostapd,libsoup2.4-dev +INC=$INC,libalog0.4.1-base-dev,hostapd,libsoup2.4-dev,ca-certificates,unzip +INC=$INC,python,python-setuptools,python-dev,python-pip +INC=$INC,libjson0-dev,libxslt1-dev,libapache2-mod-wsgi SERVICES="apache2 dbus isc-dhcp-server slapd bind9" INC=$INC,${SERVICES// /,} diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages index f7fb1f85c..245fc2524 100755 --- a/testing/scripts/build-guestimages +++ b/testing/scripts/build-guestimages @@ -48,7 +48,14 @@ do execute "cp -rf $HOSTSDIR/default/* $LOOPDIR" 0 execute_chroot "ldconfig" 0 - if [ "$host" = "winnetou" ] + if [ "$host" = "alice" ] + then + execute "mkdir $LOOPDIR/var/log/apache2/tnc" 0 + execute "mkdir $LOOPDIR/etc/pts" 0 + execute_chroot "chgrp www-data /etc/pts" 0 + execute_chroot "chmod g+w /etc/pts" 0 + fi + if [ "$host" = "winnetou" ] then execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0 execute "cp -rf $DIR/../images $LOOPDIR/var/www/" 0 diff --git a/testing/scripts/recipes/014_swid_generator.mk b/testing/scripts/recipes/014_swid_generator.mk new file mode 100644 index 000000000..589146906 --- /dev/null +++ b/testing/scripts/recipes/014_swid_generator.mk @@ -0,0 +1,16 @@ +#!/usr/bin/make + +PKG = swidGenerator +ZIP = $(PKG)-master.zip +SRC = https://github.com/strongswan/$(PKG)/archive/master.zip + +all: install + +$(ZIP): + wget --ca-directory="/usr/share/ca-certificates/mozilla" $(SRC) -O $(ZIP) + +$(PKG)-master: $(ZIP) + unzip $(ZIP) + +install: $(PKG)-master + cd $(PKG)-master && python setup.py install diff --git a/testing/scripts/recipes/015_strongTNC.mk b/testing/scripts/recipes/015_strongTNC.mk new file mode 100644 index 000000000..cc4a94a0b --- /dev/null +++ b/testing/scripts/recipes/015_strongTNC.mk @@ -0,0 +1,22 @@ +#!/usr/bin/make + +PKG = strongTNC +ZIP = $(PKG)-master.zip +SRC = https://github.com/strongswan/$(PKG)/archive/master.zip +DEPS = $(PKG)-deps + +all: install + +$(ZIP): + wget --ca-directory=/usr/share/ca-certificates/mozilla/ $(SRC) -O $(ZIP) + +$(PKG)-master: $(ZIP) + unzip -u $(ZIP) + +$(DEPS): $(PKG)-master + mkdir -p $(DEPS) + pip install --download $(DEPS) -r $(PKG)-master/requirements.txt + +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 |