--- trunk/Meteor/Config.pm	2009/03/28 17:20:20	74
+++ trunk/Meteor/Config.pm	2009/03/28 17:20:35	75
@@ -46,7 +46,7 @@
 	ChannelInfoTemplate		=> '<script>ch("~name~", ~lastMsgID~);</script>\r\n',
 
 'Configuration file location on disk (if any)',
-	ConfigFileLocation		=> '/etc/meteord.conf',
+	ConfigFileLocation		=> -e 'meteord.conf' ? 'meteord.conf' : '/etc/meteord.conf',
 
 'IP address for controller server (leave empty for all local addresses)',
 	ControllerIP			=> '',
@@ -109,7 +109,7 @@
 	SubscriberShutdownMsg	=> '<script>eof();</script>\r\n',
 
 'An absolute filesystem path, to be used as the document root for Meteor\'s static file web server. If left empty, no documents will be served.',
-	SubscriberDocumentRoot	=> '/usr/local/meteor/public_html',
+	SubscriberDocumentRoot	=> -e 'public_html' ? 'public_html' : '/usr/local/meteor/public_html',
 
 'Since Meteor is capable of serving static pages from a document root as well as streaming events to subscribers, this parameter is used to specify the URI at which the event server can be reached. If set to the root, Meteor will lose the ability to serve static pages.',
 	SubscriberDynamicPageAddress	=> '/push',
@@ -398,4 +398,4 @@
 }
 
 1;
-############################################################################EOF
\ No newline at end of file
+############################################################################EOF