Changeset 3257

Timestamp:

11/23/07 22:39:58 (17 years ago)

Author:

jerome

Message:

Now detects the TCP port PostgreSQL is listening to : Debian makes
PostgreSQL 7.x listen to port 5432 (PostgreSQL's default) by default
and PostgreSQL 8.x listen to port 5433, to allow both versions to
coexist on the same machine. Unfortunately when only 8.x is
installed, as it should be, port 5433 is still used and PyKota
installations done through pksetup would fail at database connection
time.
Fixed pkpgcounter's version number to use the latest available at
this time (i.e. 3.30). A better method should be used to detect this
release number automatically.
Fixed paths to the latest release of GhostPCL, which is now part of
GhostPDL, itself licensed under the terms of the GNU GPL v2 (and NOT
later). I believe MegaPacks? could now include GhostPCL if we ever
want to.

Files:

• pykota/trunk/bin/pksetup (modified) (5 diffs)

pykota/trunk/bin/pksetup

@@ -197 +197 @@
         
     otherpackages = [ { "name" : "pkpgcounter",
-                        "version" : "2.17",
+                        "version" : "3.30",
                         "url" : "http://www.pykota.com/software/%(name)s/download/tarballs/%(name)s-%(version)s.tar.gz",
                         "commands" : [ "tar -zxf %(name)s-%(version)s.tar.gz",
@@ -212 +212 @@
                                      ],
                       },
-                      { "name" : "ghostpcl",
-                        "version" : "1.41p1",
-                        "url" : "ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/GhostPCL/%(name)s_%(version)s.tar.bz2", 
+                      { "name" : "ghostpdl",
+                        "version" : "1.51",
+                        "url" : "http://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/%(name)s/%(name)s-%(version)s.tar.bz2",
                         "commands" : [ "bunzip2 <%(name)s_%(version)s.tar.bz2 | tar -xf -",
                                        "cd %(name)s_%(version)s",
-                                       "make fonts",
-                                       "make product",
-                                       "make install",
+                                       "make pcl",
+                                       "make pcl_install",
                                      ],
                       },
@@ -282 +281 @@
                 download = 'svn export "%(url)s" %(name)s' % locals()
             else :    
-                download = 'wget "%(url)s"' % locals()
+                download = 'wget --user-agent=pksetup "%(url)s"' % locals()
             if self.confirmCommand("to download %(name)s" % locals(), download) :
                 self.confirmCommand("to install %(name)s" % locals(), commands)
@@ -321 +320 @@
                         conflines.insert(1, "local\tpykota\tpykotaadmin,pykotauser\t\tmd5")
                     conf = "\n".join(conflines)
+                    port = 5432
+                    if tcpip :
+                        answer = self.confirmPipe("to see on which TCP port PostgreSQL accepts connections", "grep ^port %(pgconffile)s" % locals())
+                        if answer is not False :
+                            try :
+                                port = int([p.strip() for p in answer.strip().split("=")][1])
+                            except (ValueError, IndexError, TypeError) :
+                                pass
                     self.confirmCommand("to configure PostgreSQL correctly for PyKota", 'echo "%(conf)s" >%(pgconfdir)s/pg_hba.conf' % locals())
                     self.confirmCommand("to make PostgreSQL take the changes into account", self.pgrestart)
-                    return tcpip
-        return None    
-        
-    def genConfig(self, adminname, adminemail, dnsdomain, smtpserver, home, tcpip) :        
+                    return (tcpip, port)
+        return (None, None)
+        
+    def genConfig(self, adminname, adminemail, dnsdomain, smtpserver, home, tcpip, port) :
         """Generates minimal configuration files for PyKota."""
         if tcpip :
-            storageserver = "localhost"
+            storageserver = "localhost:%i" % port
         else :    
             storageserver = ""
@@ -407 +414 @@
             self.setupPackages()
             self.downloadOtherPackages()
-            tcpip = self.configurePostgreSQL()
-            self.genConfig(adminname, adminemail, dnsdomain, smtpserver, homedirectory, tcpip)
+            (tcpip, port) = self.configurePostgreSQL()
+            self.genConfig(adminname, adminemail, dnsdomain, smtpserver, homedirectory, tcpip, port)
             self.setupDatabase()
             self.setupBackend()