From 4310be965320c0a6b293dedad47d33b743ce7d75 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Thu, 20 Dec 2018 14:29:23 +0100
Subject: [PATCH] Update scripts and config by removing unused env settings

---
 Changelog                              | 1 +
 app/Console/Commands/InstallNntmux.php | 5 -----
 config/nntmux.php                      | 1 -
 misc/update/tmux/monitor.php           | 1 -
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Changelog b/Changelog
index 485744f92..b22972d04 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-12-20 DariusIII
+	* Chg: Update scripts and config by removing unused env settings
 	* Chg: BC! Update database configuration and unify env settings(DB_NAME => DB_DATABASE, DB_USER => DB_USERNAME) and remove unused settings
 	* Chg: BC! Remove nntmux and edit mysql database connection, make mysql default connection
 	* Chg: Add used branch to tmux output
diff --git a/app/Console/Commands/InstallNntmux.php b/app/Console/Commands/InstallNntmux.php
index 62e8951aa..4ce80c6fb 100644
--- a/app/Console/Commands/InstallNntmux.php
+++ b/app/Console/Commands/InstallNntmux.php
@@ -45,11 +45,6 @@ class InstallNntmux extends Command
     {
         $error = false;
 
-        if (env('DB_SYSTEM') !== 'mysql') {
-            $this->error('Invalid database system. Must be: mysql ; Not: '.env('DB_SYSTEM'));
-            $error = true;
-        }
-
         if (! (new Settings())->isDbVersionAtLeast(NN_MINIMUM_MARIA_VERSION) || ! (new Settings())->isDbVersionAtLeast(NN_MINIMUM_MYSQL_VERSION)) {
             $this->error('Version of MariaDB/MySQL used is lower than required version: '.NN_MINIMUM_MARIA_VERSION.PHP_EOL.' Please update your install of Mariadb/MySQL');
             $error = true;
diff --git a/config/nntmux.php b/config/nntmux.php
index c1ea12ad4..13c5c8077 100644
--- a/config/nntmux.php
+++ b/config/nntmux.php
@@ -2,7 +2,6 @@
 
 return [
     'db_name' => env('DB_NAME', 'nntmux'),
-    'db_system' => env('DB_SYSTEM', 'mysql'),
     'items_per_page' => env('ITEMS_PER_PAGE', 50),
     'items_per_cover_page' => env('ITEMS_PER_COVER_PAGE', 20),
     'max_pager_results' => env('MAX_PAGER_RESULTS', 125000),
diff --git a/misc/update/tmux/monitor.php b/misc/update/tmux/monitor.php
index ede278435..3199ef383 100644
--- a/misc/update/tmux/monitor.php
+++ b/misc/update/tmux/monitor.php
@@ -30,7 +30,6 @@ $runVar['paths']['cli'] = NN_ROOT.'cli/';
 $runVar['paths']['scraper'] = NN_MISC.'IRCScraper'.DS.'scrape.php';
 
 $db_name = config('nntmux.db_name');
-$dbtype = config('nntmux.db_system');
 
 $tmux_niceness = Settings::settingValue('site.tmux.niceness') ?? 2;