Changeset 859

Timestamp:

03/22/03 14:11:33 (22 years ago)

Author:

jalet

Message:

The port on which the Quota Storage Sever is listening can now
be set in the configuration file (see sample).
Better error handling if PygreSQL is not installed.
Improved documentation.
Version number changed to 1.02alpha

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (1 diff)
• docs/installation.sgml (modified) (3 diffs)
• NEWS (modified) (1 diff)
• pykota/storages/postgresql.py (modified) (3 diffs)
• pykota/version.py (modified) (1 diff)
• README (modified) (2 diffs)

pykota/trunk/conf/pykota.conf.sample

@@ -23 +23 @@
 # Ldap, MySQL, Berkeley are planned
 storagebackend: postgresql
+
+# Quota Storage Server hostname (and port)
+# e.g. db.mydomain.com:5432
 storageserver: localhost
+
+#
+# name of the Quota Storage Database
 storagename: pykota
+
+# Quota Storage administrator's and normal user's names and passwords
 storageadmin: pykotaadmin
 storageuser: pykotauser

pykota/trunk/docs/installation.sgml

@@ -20 +20 @@
   
   <para>
-    Now we will see what has to be done on all those servers.
+    Now we will see what has to be done on these servers.
     <note>
       <title>Note</title>
@@ -92 +92 @@
           <para>
             The TCP/IP network port used by PostgreSQL may be different. When in doubt, ask your 
-            <glossaryterm>System Administrator</glossaryterm> for the correct value. Actually
-            <application>PyKota</application> does not work if the port used is not the default one,
-            but this limitation will be removed in a future version.
+            <glossaryterm>System Administrator</glossaryterm> for the correct value. 
           </para>
         </tip>  
@@ -154 +152 @@
 
 $Log$
+Revision 1.5  2003/03/22 13:11:33  jalet
+The port on which the Quota Storage Sever is listening can now
+be set in the configuration file (see sample).
+Better error handling if PygreSQL is not installed.
+Improved documentation.
+Version number changed to 1.02alpha
+
 Revision 1.4  2003/03/22 07:20:38  jalet
 More information wrt PostgreSQL tcp/ip configuration.

pykota/trunk/NEWS

@@ -16 +16 @@
 PyKota NEWS :
 
+    - 1.02alpha :
+    
+        - Improved documentation.
+        
+        - You can now set the tcp/ip port on which the Quota Storage
+          Server is listening, see sample configuration file for details.
+        
+        - Better error handling if PygreSQL is not installed or not 
+          available.
+        
     - 1.01 :
     

pykota/trunk/pykota/storages/postgresql.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.5  2003/03/22 13:11:33  jalet
+# The port on which the Quota Storage Sever is listening can now
+# be set in the configuration file (see sample).
+# Better error handling if PygreSQL is not installed.
+# Improved documentation.
+# Version number changed to 1.02alpha
+#
 # Revision 1.4  2003/02/17 22:05:50  jalet
 # Storage backend now supports admin and user passwords (untested)
@@ -30 +37 @@
 #
 
-import pg
+try :
+    import pg
+except ImportError :    
+    import sys
+    sys.stderr.write("This python version (%s) doesn't seem to have the PygreSQL module installed correctly.\n" % sys.version.split()[0])
+    raise
 
 from pykota.storage import PyKotaStorageError
@@ -40 +52 @@
         self.closed = 1
         try :
-            self.database = pg.connect(host=host, dbname=dbname, user=user, passwd=passwd)
+            (host, port) = host.split(":")
+            port = int(port)
+        except ValueError :    
+            port = -1         # Use PostgreSQL's default tcp/ip port (5432).
+        
+        try :
+            self.database = pg.connect(host=host, port=port, dbname=dbname, user=user, passwd=passwd)
             self.closed = 0
         except pg.error, msg :

pykota/trunk/pykota/version.py

@@ -15 +15 @@
 #
 
-__version__ = "1.01-unofficial"
+__version__ = "1.02alpha-unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS."""

pykota/trunk/README

@@ -92 +92 @@
 network printer capable of outputing its lifetime printed pages 
 number.
+
+If your printers don't support SNMP, then making them work with 
+PyKota is up to you. Some sample scripts which can query non-SNMP 
+printers for their lifetime page counter are included in the 
+./untested directory. You'll have to test and adapt them though, and 
+define them as external requesters in the PyKota configuration file. 
 
 ============================================================
@@ -213 +219 @@
            You should ensure that only the print quota administrator
            can run the edpykota command, but this is actually not
-           enforced in the program. Any user could modify his/her
-           or other people's print quota.
+           enforced in the program. Otherwise, any user could modify 
+           his/her or other people's print quota.
           
            launching : chmod 750 /usr/bin/warnpykota /usr/bin/edpykota