Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Changes to --cert_chain_file param #89

Merged
merged 1 commit into from

3 participants

@nikhilben

Here is the updated code. Changed '--cert_chain_file' to '--cert_file' . @skade & @stevegraham Please check if this can be merged.

@stevegraham
Owner

hey there, can you rebase my master branch against yours? I can't merge yours into my branch locally to run the tests :)

@nikhilben

Done :+1:

@stevegraham
Owner

hey @nikhil. this now merges cleanly but the specs are not passing, specifically the ssl_integration_spec. can you investigate and rebase your commits into a single atomic commit for this pull request? thanks!

@nikhilben

Will have a look into this soon.

@nikhilben

@stevegraham I have a few changes, check if the specs are passing. I have no idea on building slanger from scratch - I wished if I could test my changes :). I have kept the actual '-- cert_chain_file' as it, but using '--cert_file' should work. Thanks.

@markburns
Collaborator

Also just to re-iterate what Stevie said, you need to squash these commits into a single commit:

http://stackoverflow.com/questions/5667884/how-to-squash-commits-in-git-after-they-have-been-pushed

@nikhilben

Thanks a ton @markburns . Will go through it.

@nikhilben nikhilben Changed certificate chain file param
Changed certificate chain file param

Changed certificate chain file param

Changed certificate chain file param

Changed to cert_file

added .idea to ignored entries
f8195a9
@markburns
Collaborator

Didn't notice you'd squashed these commits

@markburns markburns merged commit 4ae086c into stevegraham:master
@stevegraham
Owner

He hadn't fixed the ssl_integration_spec problem at the time of last activity. This will probz need to be reverted. Will check later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 12, 2013
  1. @nikhilben

    Changed certificate chain file param

    nikhilben authored
    Changed certificate chain file param
    
    Changed certificate chain file param
    
    Changed certificate chain file param
    
    Changed to cert_file
    
    added .idea to ignored entries
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 3 deletions.
  1. +1 −0  .gitignore
  2. +1 −1  README.md
  3. +2 −2 bin/slanger
View
1  .gitignore
@@ -7,3 +7,4 @@
*.swl
.rbx/
*.rdb
+.idea
View
2  README.md
@@ -138,7 +138,7 @@ Slanger supports several configuration options, which can be supplied as command
-b or --webhook_url URL for webhooks. This argument is optional, if given webhook callbacks will be made http://pusher.com/docs/webhooks
--c or --cert_chain_file Certificate chain file or the Certificate file for SSL support. This argument is optional, if given, SSL will be enabled
+-c or --cert_file Certificate file for SSL support. This argument is optional, if given, SSL will be enabled
-v or --[no-]verbose This makes Slanger run verbosely, meaning WebSocket frames will be echoed to STDOUT. Useful for debugging
</pre>
View
4 bin/slanger
@@ -50,7 +50,7 @@ OptionParser.new do |opts|
options[:webhook_url] = p
end
- opts.on '-c', '--cert_chain_file FILE', "Certificate chain file for SSL transport" do |p|
+ opts.on '-c', '--cert_file FILE', "Certificate file for SSL transport" do |p|
options[:tls_options] ||= {}
options[:tls_options][:cert_chain_file] = p
end
@@ -76,7 +76,7 @@ end
if options[:tls_options]
[:cert_chain_file, :private_key_file].each do |param|
raise RuntimeError.new "--#{param} does not exist at `#{options[:tls_options][param]}`" unless File.exists? options[:tls_options][param]
- raise RuntimeError.new "Both --cert_chain_file and --private_key_file need to be specified" unless options[:tls_options][param]
+ raise RuntimeError.new "Both --cert_file and --private_key_file need to be specified" unless options[:tls_options][param]
end
end
Something went wrong with that request. Please try again.