Merge pull request #66 from stefansaraev/extra-config

allow including an extra config file outside of db/ root
8 years ago · 1e0ef79ffd
parent e679d241f4 c9778017f8
commit 1e0ef79ffd
2 changed files with 20 additions and 0 deletions
--- a/dashboard/pgs/config.inc.php
+++ b/dashboard/pgs/config.inc.php
@ -63,4 +63,14 @@ $CallingHome['HashFile']                             = "/tmp/callinghome.php";
 $CallingHome['OverrideIPAddress']                    = "";                                     // Insert your IP address here. Leave blank for autodetection. No need to enter a fake address.
 $CallingHome['InterlinkFile']                        = "/xlxd/xlxd.interlink";                 // Path to interlink file

+
+/*
+  include an extra config file for people who dont like to mess with shipped config.ing.php
+  this makes updating dashboard from git a little bit easier
+*/
+
+if (file_exists("../config.inc.php")) {
+  include ("../config.inc.php");
+}
+
 ?>
--- a/dashboard2/pgs/config.inc.php
+++ b/dashboard2/pgs/config.inc.php
@ -63,4 +63,14 @@ $CallingHome['HashFile']                             = "/tmp/callinghome.php";
 $CallingHome['OverrideIPAddress']                    = "";                                     // Insert your IP address here. Leave blank for autodetection. No need to enter a fake address.
 $CallingHome['InterlinkFile']                        = "/xlxd/xlxd.interlink";                 // Path to interlink file

+
+/*
+  include an extra config file for people who dont like to mess with shipped config.ing.php
+  this makes updating dashboard from git a little bit easier
+*/
+
+if (file_exists("../config.inc.php")) {
+  include ("../config.inc.php");
+}
+
 ?>