Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes for first-time usage #1

Merged
merged 1 commit into from
Jul 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ GEM
rest-client (>= 1.4.2)
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
ci_reporter (2.0.0)
builder (>= 2.1.2)
ci_reporter_rspec (1.0.0)
ci_reporter (~> 2.0)
rspec (>= 2.14, < 4)
concurrent-ruby (1.0.2)
conjur-api (4.25.1)
activesupport
Expand Down Expand Up @@ -264,6 +269,7 @@ DEPENDENCIES
base32-crockford
bcrypt-ruby (~> 3.0.0)
byebug
ci_reporter_rspec
conjur-appliance-logging!
conjur-cli
conjur-debify
Expand Down
2 changes: 1 addition & 1 deletion dev/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ docker-compose build

if [ ! -f data_key ]; then
echo "Generating data key"
docker-compose run --rm --entrypoint possum possum data-key generate > data_key
docker-compose run --no-deps --rm --entrypoint possum possum data-key generate > data_key
fi

export POSSUM_DATA_KEY="$(cat data_key)"
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/generate-data-key.rake
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ task :"generate-data-key" do
require 'slosilo'
require 'base64'
key = Base64.strict_encode64(Slosilo::Symmetric.new.random_key)
puts key
print key
end