Optional values are now actually optional

Author: MotorTruck1221

cli/cli.rb

@@ -7,10 +7,14 @@
 require_relative '../ruby/db.rb'
 
 settings = YAML.load_file(File.join(File.dirname(__FILE__), '../config/settings.yml'))
-$host = ENV['DB_HOST'] || settings['database']['host'].to_s 
-$user = ENV['DB_USERNAME'] || settings['database']['username'].to_s
-$password = ENV['DB_PASSWORD'] || settings['database']['password'].to_s
-$database = ENV['DB_DATABASE'] || settings['database']['dbname'].to_s
+$host = settings['database']['host'].to_s if settings['database']
+$user = settings['database']['username'].to_s if settings['database']
+$password = settings['database']['password'].to_s if settings['database']
+$database = settings['database']['dbname'].to_s if settings['database']
+$host = ENV['DB_HOST'] if ENV['DB_HOST']
+$user = ENV['DB_USER'] if ENV['DB_USER']
+$password = ENV['DB_PASS'] if ENV['DB_PASS']
+$database = ENV['DB_NAME'] if ENV['DB_NAME']
 
 class RubyCLI < Thor
   desc "start", "Start the server"

docker/docker-compose.build.yml

@@ -4,7 +4,7 @@ services:
     image: ruby:latest
     build:
       context: .
-      target: normal
+      target: node
     container_name: ruby
     restart: unless-stopped
     ports:

docker/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 services:
   ruby:
     restart: unless-stopped
-    image: 'motortruck1221/ruby:latest'
+    image: 'motortruck1221/ruby-node:latest'
     ports:
       #DO NOT CHANGE 9294!
       - your port here:9294

ruby/auth.rb

@@ -13,13 +13,15 @@ def call(env)
       #  session[:auth] = true
       #  session[:uid] = SecureRandom.alphanumeric(2048)
        # return [302, {'Location' => '/'}, []]
-      if Settings.corlink.enabled == "true" && Settings.private == "false"
-        auth = params['unlock']
-        req = HTTParty.post("#{Settings.corlink.url}", headers: { 'Content-Type' => 'application/json', 'Authorization' => "Bearer #{Settings.corlink.apiKey}", 'Key' => "#{auth}" })
-        if req.code == 200
-          session[:auth] = true
-          session[:uid] = SecureRandom.alphanumeric(2048)
-          return [302, {'Location' => '/'}, []]
+      if Settings.corlink != nil
+        if Settings.corlink.enabled == "true" && Settings.private == "false"
+          auth = params['unlock']
+          req = HTTParty.post("#{Settings.corlink.url}", headers: { 'Content-Type' => 'application/json', 'Authorization' => "Bearer #{Settings.corlink.apiKey}", 'Key' => "#{auth}" })
+          if req.code == 200
+            session[:auth] = true
+            session[:uid] = SecureRandom.alphanumeric(2048)
+            return [302, {'Location' => '/'}, []]
+          end
         end
       else 
         if Settings.private == "false" && params['unlock'] == '' || params['unlock'] == 'unlock' || params['unlock'] == 'true' || params['unlock'] == ' '