Gemfile

@@ -100,13 +100,13 @@ group :production do

                   gem 'rack'
              

                 end
              

                 
              

                -# This hack needs some explanation.  When on Heroku in production, use the pg, unicorn, and rails12factor gems.
              

                +# This hack needs some explanation.  When on Heroku, use the pg, unicorn, and rails12factor gems.
              

                 # When not on Heroku, we still want our Gemfile.lock to include these gems, so we scope them to
              

                 # an unsupported platform.
              

                -if ENV['ON_HEROKU'] || ENV['HEROKU_POSTGRESQL_ROSE_URL']
              

                -  gem 'pg', group: :production
              

                -  gem 'unicorn', group: :production
              

                -  gem 'rails_12factor', group: :production
              

                +if ENV['ON_HEROKU'] || ENV['HEROKU_POSTGRESQL_ROSE_URL'] || File.read(File.join(File.dirname(__FILE__), 'Procfile')) =~ /intended for Heroku/
              

                +  gem 'pg'
              

                +  gem 'unicorn'
              

                +  gem 'rails_12factor'
              

                 else
              

                   gem 'pg', platform: :ruby_18
              

                   gem 'unicorn', platform: :ruby_18
              

Procfile

@@ -6,8 +6,8 @@ jobs: bundle exec rails runner bin/threaded.rb

                 # web: bundle exec unicorn -c config/unicorn/production.rb
              

                 # jobs: bundle exec rails runner bin/threaded.rb
              

                 
              

                -# Old version with seperate processes for each component (use this if you have issues with the threaded version)
              

                +# Old version with separate processes (use this if you have issues with the threaded version)
              

                 # web: bundle exec rails server
              

                 # schedule: bundle exec rails runner bin/schedule.rb
              

                 # twitter: bundle exec rails runner bin/twitter_stream.rb
              

                -# dj: bundle exec script/delayed_job run
              

                +# dj: bundle exec script/delayed_job run
              

bin/setup_heroku

@@ -45,7 +45,7 @@ def grab_heroku_config!

                 end
              

                 
              

                 def set_value(key, value, options = {})
              

                -  unless $config[key] == value
              

                +  if $config[key].nil? || $config[key] == '' || ($config[key] != value && options[:force] != false)
              

                     puts "Setting #{key} to #{value}" unless options[:silent]
              

                     puts capture("heroku config:set #{key}=#{value}")
              

                   end
              
@@ -94,10 +94,10 @@ unless $config['APP_SECRET_TOKEN']

                 end
              

                 
              

                 set_value 'BUILDPACK_URL', "https://github.com/ddollar/heroku-buildpack-multi.git"
              

                -set_value 'PROCFILE_PATH', "deployment/heroku/Procfile.heroku"
              

                +set_value 'PROCFILE_PATH', "deployment/heroku/Procfile.heroku", force: false
              

                 set_value 'ON_HEROKU', "true"
              

                 set_value 'FORCE_SSL', "true"
              

                -set_value 'DOMAIN', "#{app_name}.herokuapp.com"
              

                +set_value 'DOMAIN', "#{app_name}.herokuapp.com", force: false
              

                 
              

                 unless $config['INVITATION_CODE']
              

                   puts "You need to set an invitation code for your Huginn instance.  If you plan to share this instance, you will"
              

deployment/heroku/Procfile.heroku

@@ -1 +1,4 @@

                +# This Procfile is intended for Heroku, and is detected by the Gemfile.  DO NOT REMOVE THIS LINE!
              

                +
              

                +# deployment/heroku/unicorn.rb is a special Unicorn config file that also spawns workers.
              

                 web: bundle exec unicorn -p $PORT -c ./deployment/heroku/unicorn.rb
              

deployment/heroku/unicorn.rb

@@ -5,7 +5,8 @@ timeout 15

                 preload_app true
              

                 
              

                 # Note that this will only work correctly when running Heroku with ONE web worker.
              

                -# If you want to run more than one, use the standard Huginn Procfile instead with separate web and job entries.
              

                +# If you want to run more than one, use the standard Huginn Procfile instead, with separate web and job entries.
              

                +# You'll need to set the Heroku config variable PROCFILE_PATH to 'Procfile'.
              

                 Thread.new do
              

                   worker_pid = nil
              

                   while true
              
@@ -14,7 +15,7 @@ Thread.new do

                       puts "New threaded worker PID: #{worker_pid}"
              

                     end
              

                 
              

                -    sleep 30
              

                +    sleep 45
              

                 
              

                     if ENV['DOMAIN']
              

                       force_ssl = ENV['FORCE_SSL'].present? && ENV['FORCE_SSL'] == 'true'