diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-06-20 18:31:13 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-06-21 17:24:43 +0200 |
| commit | 5a09734c2cabe419419496a36445be65f8791e10 (patch) | |
| tree | 339e3cbe378fdcffba560c54d951fae119f74fbb /testing/tests/tnc | |
| parent | dee01d019ba9743b2784b417155601d10c173a66 (diff) | |
| download | strongswan-5a09734c2cabe419419496a36445be65f8791e10.tar.bz2 strongswan-5a09734c2cabe419419496a36445be65f8791e10.tar.xz | |
testing: Start charon before Apache in tnc/tnccs-20-pdp-pt-tls
The change in c423d0e8a124 ("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.
Diffstat (limited to 'testing/tests/tnc')
| -rw-r--r-- | testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat | 2 |
1 files changed, 1 insertions, 1 deletions
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 918dd5383..860a6c342 100644 --- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat @@ -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::rm /etc/swanctl/x509/aliceCert.pem alice::rm /etc/swanctl/rsa/aliceKey.pem -alice::service apache2 start alice::service charon start +alice::service apache2 start alice::swanctl --load-creds 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 |