# HG changeset patch
# User Dan
# Date 1220302788 14400
# Node ID 1e58e36b04cd09dbb2b1d02c17a28ddafefc6464
# Parent  7978f037eab3b4a0063ebd9e838f1b0522a43802
Moved configuration to a separate file.

diff -r 7978f037eab3 -r 1e58e36b04cd config.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.php	Mon Sep 01 16:59:48 2008 -0400
@@ -0,0 +1,32 @@
+<?php
+
+//
+// CONFIGURATION
+//
+
+// Listen on all interfaces. If this is false, it will only listen on
+// 127.0.0.1 (the loopback interface)
+$public = true;
+
+// Allow control of playback. By default this is turned on but if you
+// set this to false, it will only display the playlist.
+$allowcontrol = true;
+
+// The default theme. This should be a name of a directory in ./themes.
+$theme = 'grey';
+
+// Allow forking when an HTTP request is received. This has advantages
+// and disadvantages. If this experimental option is enabled, it will
+// result in faster responses and load times but more memory usage.
+$allow_fork = true;
+
+// set to true to enable authentication
+// this uses cookies, so make sure they're enabled in your browser
+$use_auth = false;
+
+// valid users and passwords
+$auth_data = array(
+    'funky' => 'monkey',
+    'fast' => 'forward'
+  );
+
diff -r 7978f037eab3 -r 1e58e36b04cd greyhound.php
--- a/greyhound.php	Mon Sep 01 16:53:17 2008 -0400
+++ b/greyhound.php	Mon Sep 01 16:59:48 2008 -0400
@@ -28,31 +28,6 @@
   pcntl_signal(SIGUSR1, 'handle_refresh_signal');
 }
 
-//
-// CONFIGURATION
-//
-
-// Listen on all interfaces. If this is false, it will only listen on
-// 127.0.0.1 (the loopback interface)
-$public = true;
-// Allow control of playback. By default this is turned on but if you
-// set this to false, it will only display the playlist.
-$allowcontrol = true;
-// The default theme. This should be a name of a directory in ./themes.
-$theme = 'grey';
-// Allow forking when an HTTP request is received. This has advantages
-// and disadvantages. If this experimental option is enabled, it will
-// result in faster responses and load times but more memory usage.
-$allow_fork = true;
-// set to true to enable authentication
-// this uses cookies, so make sure they're enabled in your browser
-$use_auth = false;
-// valid users and passwords
-$auth_data = array(
-    'funky' => 'monkey',
-    'fast' => 'forward'
-  );
-
 @ini_set('display_errors', 'on');
 
 // include files
@@ -61,6 +36,15 @@
 // get the root
 define('GREY_ROOT', dirname(__FILE__));
 
+// ignore this, it allows using a different config file when a Mercurial repository
+// exists in Greyhound's root directory (to allow the devs to have their own config
+// separate from the default)
+
+if ( @is_dir(GREY_ROOT . '/.hg') )
+  require(GREY_ROOT . '/config.dev.php');
+else
+  require(GREY_ROOT . '/config.php');
+
 // create directories
 @mkdir('./compiled');