From 8cd2edb5218c5005be6cdb472ca96c389fdcec11 Mon Sep 17 00:00:00 2001
From: Hub Feenix Member <info@hubfeenix.fi>
Date: Tue, 3 Jan 2023 21:29:29 +0200
Subject: [PATCH] fix staging, commands, demonizable puma (4.x)

---
 .gitignore            | 1 +
 Gemfile               | 2 +-
 Gemfile.lock          | 4 ++--
 bin/kill              | 3 +++
 bin/staging           | 3 +++
 config/application.rb | 2 ++
 6 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100755 bin/kill
 create mode 100755 bin/staging

diff --git a/.gitignore b/.gitignore
index 7fde95c..f4cc5a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+nohup.out
 
 /app/assets/builds/*
 !/app/assets/builds/.keep
diff --git a/Gemfile b/Gemfile
index a57e25e..fb2eea6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ group :development, :test do
   gem "mina"
   gem 'guard-minitest'
   gem 'guard' # NOTE: this is necessary in newer versions
-  gem "puma", "~> 5.0"
+  gem "puma" ,  "~> 4.0"
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 84b3559..74f40b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -271,7 +271,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.1)
-    puma (5.6.5)
+    puma (4.3.12)
       nio4r (~> 2.0)
     pundit (2.3.0)
       activesupport (>= 3.0.0)
@@ -428,7 +428,7 @@ DEPENDENCIES
   mina
   passenger
   pg (~> 1.1)
-  puma (~> 5.0)
+  puma (~> 4.0)
   rails (~> 7.0)
   ruby2js!
   sassc-rails
diff --git a/bin/kill b/bin/kill
new file mode 100755
index 0000000..a75baf6
--- /dev/null
+++ b/bin/kill
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+kill -9 `cat tmp/pids/server.pid`
diff --git a/bin/staging b/bin/staging
new file mode 100755
index 0000000..6b5652e
--- /dev/null
+++ b/bin/staging
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+exec ./bin/rails s -b 0.0.0.0 -p 3000 -d
diff --git a/config/application.rb b/config/application.rb
index 8ecf5d9..25a10ee 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -23,6 +23,8 @@ module HubfeenixFi
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 7.0
 
+    config.hosts << "green-machine.local" #our "staging"
+
     # Configuration for the application, engines, and railties goes here.
     #
     # These settings can be overridden in specific environments using the files