[CalendarServer-changes] [9693] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 9693
          http://trac.macosforge.org/projects/calendarserver/changeset/9693
Author:   sagen at apple.com
Date:     2012-08-13 14:26:27 -0700 (Mon, 13 Aug 2012)
Log Message:
-----------
Use the server-specific postgres instance

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/backup_pg.py
    CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py
    CalendarServer/trunk/conf/caldavd-apple.plist

Modified: CalendarServer/trunk/calendarserver/tools/backup_pg.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/backup_pg.py	2012-08-13 18:04:05 UTC (rev 9692)
+++ CalendarServer/trunk/calendarserver/tools/backup_pg.py	2012-08-13 21:26:27 UTC (rev 9693)
@@ -36,6 +36,7 @@
 
 PSQL          = "%s/usr/bin/psql" % (SIPP,)
 PGDUMP        = "%s/usr/bin/pg_dump" % (SIPP,)
+PGSOCKETDIR   = "/Library/Server/PostgreSQL For Server Services/Socket"
 
 def usage(e=None):
     name = os.path.basename(sys.argv[0])
@@ -67,6 +68,7 @@
 
     cmdArgs = [
         PGDUMP,
+        "-h", PGSOCKETDIR,
         "--username=%s" % (USERNAME,),
         "--clean",
         "--no-privileges",
@@ -96,6 +98,7 @@
 
     cmdArgs = [
         PSQL,
+        "-h", PGSOCKETDIR,
         "--username=%s" % (USERNAME,),
         "--file=%s" % (dumpFile,)
     ]

Modified: CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py	2012-08-13 18:04:05 UTC (rev 9692)
+++ CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py	2012-08-13 21:26:27 UTC (rev 9693)
@@ -23,6 +23,7 @@
 CONNECTNAME   = "_postgres"
 USERNAME      = "caldav"
 DATABASENAME  = "caldav"
+PGSOCKETDIR   = "/Library/Server/PostgreSQL For Server Services/Socket"
 SCHEMAFILE    = "/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/txdav/common/datastore/sql_schema/current.sql"
 
 # Executables:
@@ -56,6 +57,7 @@
 
     cmdArgs = [
         CREATEUSER,
+        "-h", PGSOCKETDIR,
         "--username=%s" % (CONNECTNAME,),
         USERNAME,
         "--no-superuser",
@@ -90,6 +92,7 @@
 
     cmdArgs = [
         CREATEDB,
+        "-h", PGSOCKETDIR,
         "--username=%s" % (USERNAME,),
         DATABASENAME,
     ]
@@ -120,6 +123,7 @@
 
     cmdArgs = [
         PSQL,
+        "-h", PGSOCKETDIR,
         "-d", DATABASENAME,
         "-U", USERNAME,
         "-t",
@@ -157,6 +161,7 @@
 
     cmdArgs = [
         PSQL,
+        "-h", PGSOCKETDIR,
         "-U", USERNAME,
         "-f", SCHEMAFILE,
     ]

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2012-08-13 18:04:05 UTC (rev 9692)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2012-08-13 21:26:27 UTC (rev 9693)
@@ -98,7 +98,7 @@
     <key>DBType</key>
     <string>postgres</string>
     <key>DSN</key>
-    <string>:caldav:caldav:::</string>
+    <string>/Library/Server/PostgreSQL For Server Services/Socket:caldav:caldav:::</string>
 
     <!-- Data root -->
     <key>DataRoot</key>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120813/f4881431/attachment.html>