Fix heroku 1 click

.do/deploy.template.yaml

@@ -10,7 +10,7 @@ spec:
       value: enabled
       scope: RUN_TIME
     git:
-      branch: develop
+      branch: fix-heroku-1-click
       repo_clone_url: https://github.com/dradis/dradis-ce.git
     name: web
     run_command: ./bin/setup

CHANGELOG

@@ -4,6 +4,7 @@
   - Upgraded gems:
     - nokogiri, rails
   - Bugs fixes:
+    - Digital Ocean: Fix one click deploy button
     - Tylium: Fix redirection when updating an issue or content block
     - Bug tracker items:
       - [item]

Gemfile

@@ -213,7 +213,7 @@ end
 #
 
 # Base framework classes required by other plugins
-gem 'dradis-plugins', github: 'dradis/dradis-plugins', branch: 'fix/template-caching'
+gem 'dradis-plugins', github: 'dradis/dradis-plugins', branch: 'do/add-preprovision-db'
 
 gem 'dradis-api', path: 'engines/dradis-api'
 

Gemfile.lock

@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/dradis/dradis-plugins.git
-  revision: e69d1f42c85f647662307019b8b492152a5c3c29
-  branch: fix/template-caching
+  revision: 3d7ab379ee8c12c22020746222d4998e128f2c17
+  branch: do/add-preprovision-db
   specs:
     dradis-plugins (4.11.0)
 

README.md

@@ -6,7 +6,6 @@
 
 Dradis is an open-source collaboration framework, tailored to InfoSec teams.
 
-<a href="https://heroku.com/deploy?template=https://github.com/dradis/dradis-ce/tree/develop" target="_blank"><img src="https://www.herokucdn.com/deploy/button.svg" height="40"></a>
 <a href="https://cloud.digitalocean.com/apps/new?repo=https://github.com/dradis/dradis-ce/tree/develop" target="_blank"><img src="https://www.deploytodo.com/do-btn-blue.svg" height="40"></a>
 
 To try Dradis Community, you can deploy your own instance (you will need accounts in the cloud providers to get started).

config/cable.yml

@@ -1,10 +1,11 @@
 development:
-  adapter: async
+  adapter: <%= defined?(Dradis::Pro) ? 'redis' : 'async' %>
+  url: <%= ENV.fetch('REDIS_URL') { 'redis://localhost:6379/1' } %>
 
 test:
   adapter: test
 
 production:
-  adapter: redis
-  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  adapter: <%= defined?(Dradis::Pro) ? 'redis' : 'async' %>
+  url: <%= ENV.fetch('REDIS_URL') { 'redis://localhost:6379/1' } %>
   channel_prefix: dradispro_production

config/environments/production.rb

@@ -59,7 +59,7 @@
   config.log_tags = [ :request_id ]
 
   # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
+  config.cache_store = :memory_store, { size: 64.megabytes }
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
   # config.active_job.queue_adapter     = :resque