Cleaned up the config interface.

[citadel.git] / ctdlphp / config_ctdlclient.php

diff --git a/ctdlphp/config_ctdlclient.php b/ctdlphp/config_ctdlclient.php
index bfedf45fcb8f7e43034d3e71e5a17d2a7b67e35e..bcbdf45c1751a7ec889cab36b794b25f6b28d167 100644 (file)
--- a/ctdlphp/config_ctdlclient.php
+++ b/ctdlphp/config_ctdlclient.php
@@ -1,16 +1,33 @@
 <?PHP
-#could be: "uncensored.citadel.org"
-# or the path of the unix domain socket: /var/run/citadel/citadel.sock
-define('CITADEL_HOSTNAME',"127.0.0.1");
 
-#make it 0 to use unix domain sockets
-define('CITADEL_TCP_PORTNO','504');
+// Please override these defaults in config_ctdlclient_local.php, not here.
 
-#do you want to see the server conversation for exploring the protocol?
-define('CITADEL_DEBUG_CITPROTO',0);
-define('CITADEL_DEBUG_PROXY', FALSE);
-#switch this if you're using php5
-#define('SOCKET_PREFIX', "unix://");
-define('SOCKET_PREFIX', "");
+include "config_ctdlclient_local.php";
 
-?>
\ No newline at end of file
+// Examples:
+// 
+// On the same host:
+// unix:///var/run/citadel/citadel.sock
+//
+// On a different host (or via loopback):
+// tcp://citserver.example.com
+// tcp://127.0.0.1
+
+if (!defined('CITADEL_HOSTNAME')) {
+       define('CITADEL_HOSTNAME',"tcp://127.0.0.1");
+}
+
+// make it 0 to use unix domain sockets
+if (!defined('CITADEL_TCP_PORTNO')) {
+       define('CITADEL_TCP_PORTNO','504');
+}
+
+// do you want to see the server conversation for exploring the protocol?
+if (!defined('CITADEL_DEBUG_CITPROTO')) {
+       define('CITADEL_DEBUG_CITPROTO',0);
+}
+if (!defined('CITADEL_DEBUG_PROXY')) {
+       define('CITADEL_DEBUG_PROXY', FALSE);
+}
+
+?>