Allow environment variables in the configuration file#75
Allow environment variables in the configuration file#75IamNaN wants to merge 6 commits intoryanb:masterfrom
Conversation
|
Also, I required yaml in private_pub.rb because tests weren't passing without it, even before this pull request. |
There was a problem hiding this comment.
I think it's not related to this pull request :)
There was a problem hiding this comment.
You are correct. I was experimenting with puma rack hijacking. I'm surprised this is here.
There was a problem hiding this comment.
Fixed. My bad, I thought the pull request was for the commit when I submitted the pull request, not my branch's head.
On May 24, 2013, at 5:16 AM, Vasiliy Ermolovich notifications@github.com wrote:
In lib/generators/private_pub/templates/private_pub.ru:
@@ -4,7 +4,7 @@ require "yaml"
require "faye"
require "private_pub"-Faye::WebSocket.load_adapter('thin')
+Faye::WebSocket.load_adapter('puma')
I think it's not related to this pull request :)—
Reply to this email directly or view it on GitHub.
|
This would have been interesting, Changing adapter to puma still gives a 19:39:24 privpub.1 | /Users/Jordan/.rvm/gems/ruby-2.0.0-head@books/gems/rack-1.5.2/lib/rack/handler/thin.rb:1:in `require': cannot load such file -- thin (LoadError) Where/ How to overrule this? |
|
@ryanb How about merging this pull request. Having a similar need to use the Environment variables on production.. |
|
+1 |
This eases deployment by allowing environment variables in private_pub.yml.
Because Faye needs to run in production mode, the yaml file's
productionblock gets used for both development and production, making private_pub hard to deploy.This change also forces signature_expiration to an integer regardless of how it is entered in the configuration, and it adds tests.