Changeset 1345

Timestamp:

02/12/04 23:43:58 (21 years ago)

Author:

jalet

Message:

Better integration in Debian and more LSB compliance, thanks to
Peter Hawkins.

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (5 diffs)
• NEWS (modified) (1 diff)
• README (modified) (6 diffs)
• setup.py (modified) (3 diffs)

pykota/trunk/conf/pykota.conf.sample

@@ -241 +241 @@
 # or more simply :
 #
-#       mailto: external(/usr/bin/mailandpopup.sh %(username)s %(printername)s "%(email)s" "%(message)s" 2>&1 >/dev/null)
+#       mailto: external(/usr/share/pykota/mailandpopup.sh %(username)s %(printername)s "%(email)s" "%(message)s" 2>&1 >/dev/null)
 #
 #   NB : The mailandpopup.sh shell script is now included in PyKota
@@ -327 +327 @@
 # pagecount.ps file from untested/netatalk into /etc or any 
 # appropriate location)
-#     requester: external(/usr/bin/papwaitprinter.sh "MyPrinter:LaserWriter@*" && /usr/bin/pap -p "MyPrinter:LaserWriter@*" /etc/pagecount.ps  2>/dev/null | grep -v status | grep -v Connect | tail -1)
+#     requester: external(/usr/share/pykota/papwaitprinter.sh "MyPrinter:LaserWriter@*" && /usr/bin/pap -p "MyPrinter:LaserWriter@*" /usr/share/pykota/pagecount.ps  2>/dev/null | /bin/grep -v status | /bin/grep -v Connect | /usr/bin/tail -1)
 #
 # An example for parallel printers like the HP Laserjet 5MP :
 #
-#     requester: external(/bin/cat /usr/share/pykota/untested/pjl/pagecount.pjl >/dev/lp0 && /usr/bin/head -2 </dev/lp0 | /usr/bin/tail -1)
+#     requester: external(/bin/cat /usr/share/pykota/pagecount.pjl >/dev/lp0 && /usr/bin/head -2 </dev/lp0 | /usr/bin/tail -1)
 # 
 # 
@@ -360 +360 @@
 # server on port 9100 :
 #
-# requester: external(/bin/nc -w 2 %(printer)s 9100 <pagecount.pjl | /usr/bin/tail -2)
+# requester: external(/bin/nc -w 2 %(printer)s 9100 </usr/share/pykota/pagecount.pjl | /usr/bin/tail -2)
 #
 #
@@ -366 +366 @@
 # the same as above, but should work on more printers : 
 #
-# requester: external(/usr/bin/pagecount.pl %(printer)s 9100)
+# requester: external(/usr/share/pykota/pagecount.pl %(printer)s 9100)
 #
 #
@@ -376 +376 @@
 # not yet finished (not all pages are printed, but the complete job is in 
 # the printer)
-requester: external(/usr/bin/waitprinter.sh %(printer)s && /usr/bin/snmpget -v1 -c public -Ov %(printer)s mib-2.43.10.2.1.4.1.1 | cut -f 2,2 -d " ")
+requester: external(/usr/share/pykota/waitprinter.sh %(printer)s && /usr/bin/snmpget -v1 -c public -Ov %(printer)s mib-2.43.10.2.1.4.1.1 | cut -f 2,2 -d " ")
 
 # Default policy for inexistant users (e.g. root)

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.18alpha4 :
     
+        - Applied some of the modifications suggested by
+          Peter Hawkins, for better Debian integration.
+          Most notably cupspykota, pykota, and the shell
+          scripts are now installed into /usr/share/pykota
+          instead of into /usr/bin
+          BEWARE : double check that your symbolic link
+          to cupspykota is correct, and that your pykota.conf
+          file use correct path for the shell scripts like
+          waitprinter.sh and al.
+          
         - pkhint command added, to help in configuring correct
           accounting method for PyKota.

pykota/trunk/README

@@ -305 +305 @@
         
           $ cd /usr/lib/cups/backend
-          $ ln -s /usr/bin/cupspykota cupspykota
+          $ ln -s /usr/share/pykota/cupspykota cupspykota
           
         Restart CUPS so that the new backend can be detected.
@@ -344 +344 @@
         line to remove is of the form :
         
-          *cupsFilter: "application/vnd.cups-postscript 0 /usr/bin/pykota"
+          *cupsFilter: "application/vnd.cups-postscript 0 /usr/share/pykota/pykota"
+        
+        This means that each time the pstops filter will be executed, it will
+        pass the job's data through the pykota filter which is present in 
+        /usr/share/pykota
         
         Don't touch anything else, especially any other *cupsFilter line.
@@ -359 +363 @@
     
             DeviceURI cupspykota:socket://myprinter.domain.com:9100
+            
+        or :    
+        
+            DeviceURI cupspykota://socket://myprinter.domain.com:9100
         
         Save the file and restart CUPS.
@@ -367 +375 @@
     
     :achk=true
-    :as=|/usr/bin/pykota
+    :as=|/usr/share/pykota/pykota
     
     For each printer on which you want to use print accounting.
@@ -379 +387 @@
   
 Add printers and users to the quota system and set their quota values : 
+
+Starting from version 1.18alpha2, the preferred command to manage
+printers is named pkprinters
+
+    $ pkprinters --help
+    
+    will tell you how to create, manage or delete printers and
+    printers groups.
 
     $ edpykota --add -P hp2100 -S 40 -H 50 user1 ... userN
@@ -427 +443 @@
     
 Quota reports are also available remotely by using the CGI script
-printquota.cgi provided in the cgi-bin/ subdirectory.
+printquota.cgi provided in the cgi-bin/ subdirectory. You can 
+also use the CSS stylesheet present in the stylesheets/ subdirectory
+and put it at your web server's DocumentRoot.
 
 For different security concerns, please give a look at the SECURITY

pykota/trunk/setup.py

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.35  2004/02/12 22:43:58  jalet
+# Better integration in Debian and more LSB compliance, thanks to
+# Peter Hawkins.
+#
 # Revision 1.34  2004/02/07 13:45:51  jalet
 # Preliminary work on the pkhint command
@@ -379 +383 @@
 data_files.append((directory, manpages))
 
+directory = os.sep.join(["share", "pykota"])
+data_files.append((directory, ["bin/cupspykota", "bin/pykota", "bin/waitprinter.sh", "bin/papwaitprinter.sh", "bin/mailandpopup.sh", "contributed/pagecount.pl", "untested/pjl/pagecount.pjl", "untested/pjl/status.pjl", "untested/netatalk/netatalk.sh", "untested/netatalk/pagecount.ps"]))
+
 setup(name = "pykota", version = __version__,
       license = "GNU GPL",
@@ -386 +393 @@
       url = "http://www.librelogiciel.com/software/",
       packages = [ "pykota", "pykota.storages", "pykota.requesters", "pykota.loggers", "pykota.accounters", "pykota.reporters" ],
-      scripts = [ "bin/cupspykota", "bin/pykota", "bin/edpykota", "bin/repykota", "bin/warnpykota", "bin/pykotme", "bin/pkprinters", "bin/pkhint", "bin/waitprinter.sh", "bin/papwaitprinter.sh", "bin/mailandpopup.sh", "contributed/pagecount.pl" ],
+      scripts = [ "bin/edpykota", "bin/repykota", "bin/warnpykota", "bin/pykotme", "bin/pkprinters", "bin/pkhint" ],
       data_files = data_files)