Permalink
Browse files

Merge branch 'master' of github.com:ryanb/private_pub

  • Loading branch information...
2 parents 4ce7e5a + 189cbd8 commit 122cb8445c4a8a3316281716dcb842ca33185d34 @ryanb committed Aug 20, 2012
Showing with 3 additions and 0 deletions.
  1. +2 −0 lib/generators/private_pub/templates/private_pub.ru
  2. +1 −0 lib/private_pub.rb
@@ -4,5 +4,7 @@ require "yaml"
require "faye"
require "private_pub"
+Faye::WebSocket.load_adapter('thin')
+
PrivatePub.load_config(File.expand_path("../config/private_pub.yml", __FILE__), ENV["RAILS_ENV"] || "development")
run PrivatePub.faye_app
View
@@ -1,5 +1,6 @@
require "digest/sha1"
require "net/http"
+require "net/https"
require "private_pub/faye_extension"
require "private_pub/engine" if defined? Rails

0 comments on commit 122cb84

Please sign in to comment.