From 99ff2e5f4a7dd06d9f2c643c274ef2720d4b3db0 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Thu, 14 Feb 2008 13:33:03 +1300
Subject: [PATCH] Fall back to /etc/davical/config.php for a whole-of-site
 configuration.

---
 inc/always.php    | 3 +++
 inc/always.php.in | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/inc/always.php b/inc/always.php
index 129feae9..88653e88 100644
--- a/inc/always.php
+++ b/inc/always.php
@@ -67,6 +67,9 @@ if ( @file_exists("/etc/davical/".$_SERVER['SERVER_NAME']."-conf.php") ) {
 else if ( @file_exists("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php") ) {
   include_once("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php");
 }
+else if ( @file_exists("/etc/davical/config.php") ) {
+  include_once("/etc/davical/config.php");
+}
 else if ( @file_exists("../config/config.php") ) {
   include_once("../config/config.php");
 }
diff --git a/inc/always.php.in b/inc/always.php.in
index cbfd7bd6..5a77d979 100644
--- a/inc/always.php.in
+++ b/inc/always.php.in
@@ -67,6 +67,9 @@ if ( @file_exists("/etc/davical/".$_SERVER['SERVER_NAME']."-conf.php") ) {
 else if ( @file_exists("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php") ) {
   include_once("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php");
 }
+else if ( @file_exists("/etc/davical/config.php") ) {
+  include_once("/etc/davical/config.php");
+}
 else if ( @file_exists("../config/config.php") ) {
   include_once("../config/config.php");
 }