X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=ctdlphp%2Fconfig_ctdlclient.php;h=2ee78683bd27b89d1783c02307007e644b777f8c;hb=fa2dd842abb5feedea3e2253255722fcaecc3c6f;hp=ed65575dc53cf4701a3f39d89ccf14b158958adc;hpb=35e102fe570f040ffb392655a7ef9a736d161969;p=citadel.git

diff --git a/ctdlphp/config_ctdlclient.php b/ctdlphp/config_ctdlclient.php
index ed65575dc..2ee78683b 100644
--- a/ctdlphp/config_ctdlclient.php
+++ b/ctdlphp/config_ctdlclient.php
@@ -1,11 +1,41 @@
 <?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',1);
-?>
\ No newline at end of file
+define('CITADEL_DEBUG_PROXY', FALSE);
+#switch this if you're using php5
+define('SOCKET_PREFIX', "unix://");
+#define('SOCKET_PREFIX', "");
+include "config_ctdlclient_local.php";
+
+// 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);
+}
+
+if (!defined('CITADEL_DEBUG_HTML')) {
+	define('CITADEL_DEBUG_HTML', FALSE);
+}
+?>