diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:35:44 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:35:44 +0200 |
| commit | c2f8d1a44defeadefcda560ba8a3883e25e24831 (patch) | |
| tree | 1eead2a9118b556932ca10e398d8d94f510b70ac /templates/generate/vpn/x509 | |
| parent | a88aa2e1a16e1ac1af1fa3b19cb2b88c7783af37 (diff) | |
| parent | 9324923d31d389110e2ab882a035982e2b269417 (diff) | |
| download | vyatta-op-vpn-lithium.tar.gz vyatta-op-vpn-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
lib/OPMode.pm
scripts/vyatta-show-ipsec-status.pl
templates/show/vpn/ipsec/sa/node.def
templates/show/vpn/ipsec/sa/peer/node.def
templates/show/vpn/ipsec/status/node.def
Diffstat (limited to 'templates/generate/vpn/x509')
| -rw-r--r-- | templates/generate/vpn/x509/key-pair/node.tag/node.def.in (renamed from templates/generate/vpn/x509/key-pair/node.tag/node.def) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/generate/vpn/x509/key-pair/node.tag/node.def b/templates/generate/vpn/x509/key-pair/node.tag/node.def.in index 9882df8..2c87956 100644 --- a/templates/generate/vpn/x509/key-pair/node.tag/node.def +++ b/templates/generate/vpn/x509/key-pair/node.tag/node.def.in @@ -1,4 +1,4 @@ help: Generate x509 key-pair run: - sudo /opt/vyatta/sbin/vyatta-gen-x509-keypair.sh $5 + sudo @SBINDIR@/vyatta-gen-x509-keypair $5 allowed: echo -n '<common-name>' |