From 5d89342b4f5dbc1a3bd3ce1a68d56dad1fff4b31 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Sat, 4 Oct 2014 13:33:48 -0700
Subject: [PATCH 1/2] Make dnsbls.php optional, secrets.php mandatory

---
 inc/instance-config.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/instance-config.php b/inc/instance-config.php
index a839c2b2..34e48d3b 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -46,7 +46,8 @@
 	$config['spam']['hidden_inputs_max_pass'] = 128;
 	$config['ayah_enabled'] = true;
 
-	include "secrets.php";
+	// Load database credentials
+	require "secrets.php";
 
 	// Image shit
 	$config['thumb_method'] = 'gm+gifsicle';
@@ -393,4 +394,7 @@ EOT;
 
 $config['gzip_static'] = false;
 
-require_once "dnsbls.php";
+// DNSBL is optional
+if (file_exists(stream_resolve_include_path("dnsbls.php"))) {
+	require_once "dnsbls.php";
+}

From edf98dbee3b7c8e36dbcc16fa9133f037aad791d Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Sat, 4 Oct 2014 13:44:42 -0700
Subject: [PATCH 2/2] Add example secrets.php file

---
 inc/instance-config.php |  2 ++
 inc/secrets.example.php | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 inc/secrets.example.php

diff --git a/inc/instance-config.php b/inc/instance-config.php
index 34e48d3b..54f95e22 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -10,6 +10,8 @@
 	require_once "lib/htmlpurifier-4.5.0/library/HTMLPurifier.auto.php";
 	require_once "8chan-functions.php";
 
+	// Note - you may want to change some of these in secrets.php instead of here
+	// See the secrets.example.php file
 	$config['db']['server'] = 'localhost';
 	$config['db']['database'] = '8chan';
 	$config['db']['prefix'] = '';
diff --git a/inc/secrets.example.php b/inc/secrets.example.php
new file mode 100644
index 00000000..54052b19
--- /dev/null
+++ b/inc/secrets.example.php
@@ -0,0 +1,19 @@
+<?php
+/*
+ * Secrets for configuration
+ *
+ * Included from instance-config.php.
+ *
+ * Copy this file to secrets.php and edit.
+ */
+
+$config['db']['server'] = 'localhost';
+$config['db']['database'] = '8chan';
+//$config['db']['prefix'] = '';
+$config['db']['user'] = 'eightchan-user';
+$config['db']['password'] = 'mysecretpassword';
+
+// Consider generating these from the following command.
+// $ cat /proc/sys/kernel/random/uuid
+$config['secure_trip_salt'] = 'generate-a-uuid';
+$config['cookies']['salt'] = 'generate-a-uuid';