From 6c9dbd53693643bcdadfb9a68048919a28300264 Mon Sep 17 00:00:00 2001
From: Aaron Manaloto <mail@aapomm.io>
Date: Mon, 28 Nov 2022 17:47:47 +0800
Subject: [PATCH] Revert changes

---
 .do/deploy.template.yaml |  3 ++-
 .gitignore               |  1 +
 config/database.yml      | 36 ------------------------------------
 config/unicorn.rb        | 22 ----------------------
 4 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 config/database.yml
 delete mode 100644 config/unicorn.rb

diff --git a/.do/deploy.template.yaml b/.do/deploy.template.yaml
index 9d1497b21..aca304932 100644
--- a/.do/deploy.template.yaml
+++ b/.do/deploy.template.yaml
@@ -10,6 +10,7 @@ spec:
       value: enabled
       scope: RUN_TIME
     git:
-      branch: fix-heroku-1-click
+      branch: develop
       repo_clone_url: https://github.com/dradis/dradis-ce.git
     name: web
+    run_command: ./bin/setup
diff --git a/.gitignore b/.gitignore
index e3229c284..b618c7c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 # Rails stuff
 /db/*.sqlite3
 /db/*.sqlite3-*
+/config/database.yml
 /config/secrets.yml
 /config/smtp.yml
 /log/*
diff --git a/config/database.yml b/config/database.yml
deleted file mode 100644
index 196f708f8..000000000
--- a/config/database.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-#
-default: &default
- adapter: sqlite3
- pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
- timeout: 5000
-
-development:
- <<: *default
- database: db/development.sqlite3
-
-# MySQL version - make sure the mysql2 gem is included in your Gemfile
-# If you uncomment this development: block, comment the previous one.
-# development:
-#   adapter: mysql2
-#   encoding: utf8
-#   collation: utf8_bin
-#   database: dradis_dev
-#   username: root
-#   socket: /tmp/mysql.sock
-
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
- <<: *default
- database: db/test.sqlite3
-
-production:
- <<: *default
- database: db/production.sqlite3
diff --git a/config/unicorn.rb b/config/unicorn.rb
deleted file mode 100644
index f6e59b8f2..000000000
--- a/config/unicorn.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-worker_processes Integer(ENV["WEB_CONCURRENCY"] || 3)
-timeout 15
-preload_app true
-
-before_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
-    Process.kill 'QUIT', Process.pid
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.connection.disconnect!
-end
-
-after_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-end