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

testing: Start charon before Apache in tnc/tnccs-20-pdp-pt-tls

Browse Source 
The change in c423d0e8a1 ("testing: Fix race in tnc/tnccs-20-pdp-pt-tls
scenario") is not really ideal as now the vici plugin might not yet be
ready when `swanctl --load-creds` is called.  Perhaps starting charon
before Apache causes enough delay.

Once we switch to charon-systemd this isn't a problem anymore as starting the
unit will block until everything is up and ready.  Also, the individual
swanctl calls will be redundant as the default service unit calls --load-all.
But start scripts do run before charon-systemd signals that the daemon is
ready, so using these would work too then.
This commit is contained in:
Tobias Brunner
2016-06-21 17:24:43 +02:00
parent dee01d019b
commit 5a09734c2c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat
+1 -1
View File
@@ -13,8 +13,8 @@ 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::/var/www/tnc/manage.py setpassword strongSwan strongSwan
alice::rm /etc/swanctl/x509/aliceCert.pem alice::rm /etc/swanctl/x509/aliceCert.pem
alice::rm /etc/swanctl/rsa/aliceKey.pem alice::rm /etc/swanctl/rsa/aliceKey.pem
alice::service apache2 start
alice::service charon start alice::service charon start
alice::service apache2 start
alice::swanctl --load-creds alice::swanctl --load-creds
winnetou::ip route add 10.1.0.0/16 via 192.168.0.1 winnetou::ip route add 10.1.0.0/16 via 192.168.0.1
dave::ip route add 10.1.0.0/16 via 192.168.0.1 dave::ip route add 10.1.0.0/16 via 192.168.0.1