Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken secring references in dev-camput and dev-camget. Fix dev-pass-camput. 

Change-Id: I35102e5fa955d8aa58d7aa25c043245b2ec54231
This commit is contained in:
Brad Fitzpatrick 2012-05-14 01:07:04 +10:00
parent cb7e5aa474
commit fb4f8992c3
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-camget
View File

@ -26,7 +26,7 @@ my $camget = build_bin("./cmd/camget");
$ENV{"CAMLI_CONFIG_DIR"} = "$Bin/config/dev-client-dir";
# Respected by env expansions in config/dev-client-dir/config
$ENV{"CAMLI_SECRET_RING"} = "$Bin/lib/go/camli/jsonsign/testdata/test-secring.gpg";
$ENV{"CAMLI_SECRET_RING"} = "$Bin/pkg/jsonsign/testdata/test-secring.gpg";
$ENV{"CAMLI_KEYID"} = "26F5ABDA";
$ENV{"CAMLI_DEV_KEYBLOBS"} = "$Bin/config/dev-client-dir/keyblobs";
$ENV{CAMLI_AUTH} = "userpass:camlistore:pass3179";

8
dev-camput
View File

@ -26,7 +26,7 @@ my $camput = build_bin("./cmd/camput");
$ENV{"CAMLI_CONFIG_DIR"} = "$Bin/config/dev-client-dir";
# Respected by env expansions in config/dev-client-dir/config
$ENV{"CAMLI_SECRET_RING"} = "$Bin/lib/go/camli/jsonsign/testdata/test-secring.gpg";
$ENV{"CAMLI_SECRET_RING"} = "$Bin/pkg/jsonsign/testdata/test-secring.gpg";
$ENV{"CAMLI_KEYID"} = "26F5ABDA";
$ENV{"CAMLI_DEV_KEYBLOBS"} = "$Bin/config/dev-client-dir/keyblobs";
$ENV{"CAMLI_AUTH"} = "userpass:camlistore:pass3179";
@ -34,6 +34,12 @@ my $blobserver = "http://localhost:3179/bs";
if ($opt_tls) {
$blobserver =~ s/^http/https/;
}
if ($ENV{"CAMLI_WANT_CAMPUT_PASSWORD"}) { # Set by dev-pass-camput
$ENV{"CAMLI_SECRET_RING"} = "$Bin/pkg/jsonsign/testdata/password-foo-secring.gpg";
$ENV{"CAMLI_KEYID"} = "C7C3E176";
$ENV{"CAMLI_DEV_KEYBLOBS"} = "$Bin/config/dev-client-dir/keyblobs";
print "**\n** Note: password is \"foo\"\n**\n";
}
exec("$camput",
"--verbose",

19
dev-pass-camput
View File

@ -3,19 +3,6 @@
use strict;
use FindBin qw($Bin);
system("$Bin/build.pl", "camput") and die "failed to build camput";
# Respected by camli/osutil:
$ENV{"CAMLI_CONFIG_DIR"} = "$Bin/config/dev-client-dir";
# Respected by env expansions in config/dev-client-dir/config
$ENV{"CAMLI_SECRET_RING"} = "$Bin/lib/go/camli/jsonsign/testdata/password-foo-secring.gpg";
$ENV{"CAMLI_KEYID"} = "C7C3E176";
$ENV{"CAMLI_DEV_KEYBLOBS"} = "$Bin/config/dev-client-dir/keyblobs";
print "**\n** Note: password is \"foo\"\n**\n";
system("$Bin/clients/go/camput/camput",
"--verbose",
"--blobserver=http://localhost:3179/bs",
"--password=pass3179",
@ARGV);
$ENV{"CAMLI_WANT_CAMPUT_PASSWORD"} = 1;
exec("$Bin/dev-camput", @ARGV);
die "failed to find/run $Bin/dev-camput";