[CalendarServer-changes] [6079] CalendarServer/trunk/txdav/datastore/subpostgres.py

[source_changes at macosforge.org]

Revision: 6079
          http://trac.macosforge.org/projects/calendarserver/changeset/6079
Author:   sagen at apple.com
Date:     2010-08-13 16:30:21 -0700 (Fri, 13 Aug 2010)
Log Message:
-----------
Create postgres socket directory inside /var/run if running as root, /tmp otherwise.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/datastore/subpostgres.py

Modified: CalendarServer/trunk/txdav/datastore/subpostgres.py
===================================================================
--- CalendarServer/trunk/txdav/datastore/subpostgres.py	2010-08-13 21:18:24 UTC (rev 6078)
+++ CalendarServer/trunk/txdav/datastore/subpostgres.py	2010-08-13 23:30:21 UTC (rev 6079)
@@ -234,8 +234,13 @@
         self.subServiceFactory = subServiceFactory
         self.dataStoreDirectory = dataStoreDirectory
         self.resetSchema = resetSchema
-        self.socketDir = CachingFilePath("/var/run/ccs_postgres_%s/" %
-            (md5(dataStoreDirectory.path).hexdigest()))
+
+        if os.getuid() == 0:
+            socketRoot = "/var/run"
+        else:
+            socketRoot = "/tmp"
+        self.socketDir = CachingFilePath("%s/ccs_postgres_%s/" %
+            (socketRoot, md5(dataStoreDirectory.path).hexdigest()))
         self.databaseName = databaseName
         self.logFile = logFile
         self.uid = uid
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100813/8c1aeb40/attachment.html>