diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-05-05 12:19:40 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-05-05 12:19:40 -0500 |
| commit | 5af19899486decd3374fdbcf776afee64047884d (patch) | |
| tree | c9093c39721e591d137ec7091fa3cf5f8274b517 | |
| parent | d9379eaf7c10563738c34a09964421b9762f0a1b (diff) | |
| parent | 394feb13af6ebb3f102fdd440f5050a79c2c3e8e (diff) | |
| download | vyatta-op-vpn-5af19899486decd3374fdbcf776afee64047884d.tar.gz vyatta-op-vpn-5af19899486decd3374fdbcf776afee64047884d.zip | |
Merge branch 'napa' of git.vyatta.com:/git/vyatta-op-vpn into napa
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | scripts/gen_local_rsa_key.pl | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a0ed378..d5a5d54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-op-vpn (0.13.68) unstable; urgency=low + + * Fix Bug 7010 Update commands to save/retrieve files from /config + + -- Mohit Mehta <mohit@vyatta.com> Wed, 04 May 2011 17:44:05 -0700 + vyatta-op-vpn (0.13.67) unstable; urgency=low * Fix perlcritic error diff --git a/scripts/gen_local_rsa_key.pl b/scripts/gen_local_rsa_key.pl index 9bf914c..4f800ab 100755 --- a/scripts/gen_local_rsa_key.pl +++ b/scripts/gen_local_rsa_key.pl @@ -27,7 +27,7 @@ use strict; use warnings; use lib "/opt/vyatta/share/perl5/"; use Vyatta::VPN::Util; - +use Vyatta::Misc qw(get_short_config_path); # Defaults my $bits = 2192; @@ -93,7 +93,10 @@ $cmd = "/usr/lib/ipsec/newhostkey --output $local_key_file --bits $bits"; # $cmd .= " --random $device"; -print "Generating rsa-key to $local_key_file\n"; +# when presenting to users, show shortened /config path +my $shortened_cfg_path_file = get_short_config_path($local_key_file); +print "Generating rsa-key to $shortened_cfg_path_file\n"; + vpn_debug $cmd; $rc = system($cmd); if ($rc != 0) { |