From eacc5dd3c3deb46db46959336c155b1739a192ba Mon Sep 17 00:00:00 2001
From: Dedushka <dedushka1@protonmail.com>
Date: Sun, 17 Jan 2021 16:50:35 -0500
Subject: [PATCH] Revert "Remove secrets, require `instance-config.secret.php`"

This reverts commit 46d987efdccc07ce43a87f61e3b50f5bec0278da.
---
 .gitignore              |  3 ---
 inc/instance-config.php | 17 +++++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 635c426b..493d4027 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,6 +74,3 @@ stylesheets/fonts
 
 #Images from twemoji
 js/twemoji/16x16/
-
-#Secrets
-*.secret.php
\ No newline at end of file
diff --git a/inc/instance-config.php b/inc/instance-config.php
index 0f74d2a5..ccf56fba 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -8,10 +8,6 @@
 *  You can copy values from config.php (defaults) and paste them here.
  */
 
-if (file_exists("instance-config.secret.php")) {
-    require_once "instance-config.secret.php";
-}
-
 /*
  * Front page configurations.
  */
@@ -71,7 +67,19 @@ $config['custom_categories'] = array(
     ),
 );
 
+/*
+ * Database and site wide configurations
+ */
+
+$config['db']['server'] = 'localhost';
+$config['db']['database'] = 'lainchan';
+$config['db']['prefix'] = '';
+$config['db']['user'] = 'lainchan';
+$config['db']['password'] = '';
+
+
 $config['cookies']['mod'] = 'mod';
+$config['cookies']['salt'] = 'MGYwNjhlNjU5Y2QxNWU3YjQ3MzQ1Yj';
 
 $config['flood_time'] = 0;
 $config['flood_time_ip'] = 0;
@@ -88,6 +96,7 @@ $config['threads_per_page'] = 10;
 $config['max_pages'] = 36;
 $config['threads_preview'] = 5;
 $config['root'] = '/';
+$config['secure_trip_salt'] = 'ODQ2NDM0ODlmMmRhNzk2M2EyNjJlOW';
 
 //Banners
 $config['url_banner'] = '/banners.php';