Show
Ignore:
Timestamp:
11/21/03 15:28:46 (21 years ago)
Author:
jalet
Message:

More complete job history.

Location:
pykota/trunk/initscripts
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • pykota/trunk/initscripts/ldap/pykota-sample.ldif

    r1098 r1200  
    22# PyKota sample LDAP directory tree 
    33# 
    4 # DON'T USE THIS. THIS IS AN EXAMPLE. 
     4# YOU CAN USE IT TO CREATE AN INITIAL LDAP TREE WITH PYKOTA SUPPORT. 
     5#  
     6# ITS STRUCTURE IS AN EXAMPLE : YOU CAN USE WHATEVER STRUCTURE YOU WANT, 
     7# PROVIDED YOU PUT CORRECT CONFIGURATION PARAMETERS IN /etc/pykota/pykota.conf 
    58#  
    69# $Id$ 
    … …  
    3942objectClass: organizationalUnit 
    4043 
    41 dn: uid=jerome,ou=People,dc=librelogiciel,dc=com 
    42 uid: jerome 
    43 cn:: SmVyb21lIEFsZXQ= 
    44 objectClass: account 
    45 objectClass: posixAccount 
    46 objectClass: top 
    47 objectClass: shadowAccount 
    48 objectClass: pykotaAccount 
    49 objectClass: pykotaAccountBalance 
    50 userPassword: {crypt}PvuIT4Mz8.lCM 
    51 shadowLastChange: 12093 
    52 shadowMax: 99999 
    53 shadowWarning: 7 
    54 loginShell: /bin/bash 
    55 uidNumber: 500 
    56 gidNumber: 500 
    57 homeDirectory: /home/jerome 
    58 gecos: Jerome Alet,,, 
    59 pykotaUserName: jerome 
    60 pykotaLimitBy: quota 
    61 pykotaBalance: 9.25 
    62 pykotaLifeTimePaid: 10 
    63  
    64 dn: cn=devel,ou=Groups,dc=librelogiciel,dc=com 
    65 objectClass: posixGroup 
    66 objectClass: top 
    67 objectClass: pykotaGroup 
    68 cn: devel 
    69 userPassword: {crypt}x 
    70 gidNumber: 500 
    71 memberUid: jerome 
    72 pykotaGroupName: devel 
    73 pykotaLimitBy: quota 
    74  
    75 dn: cn=apple,ou=Printers,ou=PyKota,dc=librelogiciel,dc=com 
    76 objectClass: pykotaObject 
    77 objectClass: pykotaPrinter 
    78 cn: apple 
    79 pykotaPrinterName: apple 
    80 pykotaPricePerPage: 0.1 
    81 pykotaPricePerJob: 0.25 
    82  
    83 dn: cn=uniqueidentifier01,ou=UQuotas,ou=PyKota,dc=librelogiciel,dc=com 
    84 objectClass: pykotaObject 
    85 objectClass: pykotaUserPQuota 
    86 cn: uniqueidentifier01 
    87 pykotaUserName: jerome 
    88 pykotaPrinterName: apple 
    89 pykotaPageCounter: 5 
    90 pykotaLifePageCounter: 5 
    91 pykotaSoftLimit: 100 
    92 pykotaHardLimit: 110 
    93 pykotaDateLimit: None 
    94  
    95 dn: cn=uniqueidentifier02,ou=GQuotas,ou=PyKota,dc=librelogiciel,dc=com 
    96 objectClass: pykotaObject 
    97 objectClass: pykotaGroupPQuota 
    98 cn: uniqueidentifier02 
    99 pykotaGroupName: devel 
    100 pykotaPrinterName: apple 
    101 pykotaSoftLimit: 400 
    102 pykotaHardLimit: 450 
    103 pykotaDateLimit: None 
    104  
    105 dn: cn=uniqueidentifier03,ou=Jobs,ou=PyKota,dc=librelogiciel,dc=com 
    106 objectClass: pykotaObject 
    107 objectClass: pykotaJob 
    108 cn: uniqueidentifier03 
    109 pykotaUserName: jerome 
    110 pykotaPrinterName: apple 
    111 pykotaJobId: 15 
    112 pykotaPrinterPageCounter: 1533 
    113 pykotaJobSize: 5 
    114 pykotaAction: ALLOW 
    115  
    116 dn: cn=uniqueidentifier04,ou=LastJobs,ou=PyKota,dc=librelogiciel,dc=com 
    117 objectClass: pykotaObject 
    118 objectClass: pykotaLastJob 
    119 cn: uniqueidentifier04 
    120 pykotaPrinterName: apple 
    121 pykotaLastJobIdent: uniqueidentifier03 

  • pykota/trunk/initscripts/ldap/pykota.schema

    r1108 r1200  
    100100attributetype ( 1.3.6.1.4.1.16868.1.1.13 NAME 'pykotaJobSize' 
    101101        DESC 'Current job size in number of pages in the history' 
    102         EQUALITY caseIgnoreIA5Match 
    103         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) 
     102        EQUALITY integerMatch 
     103        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) 
    104104 
    105105# pykotaAction 
    … …  
    112112attributetype ( 1.3.6.1.4.1.16868.1.1.15 NAME 'pykotaPrinterName' 
    113113        DESC 'PyKota printer name as received from the printing subsystem' 
    114         EQUALITY caseIgnoreIA5Match 
     114        EQUALITY caseExactIA5Match 
     115        SUBSTR caseExactIA5SubstringsMatch 
    115116        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) 
    116117         
    … …  
    119120        DESC 'PyKota user name' 
    120121        EQUALITY caseExactIA5Match 
     122        SUBSTR caseExactIA5SubstringsMatch 
    121123        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) 
    122124         
    … …  
    125127        DESC 'PyKota group name' 
    126128        EQUALITY caseExactIA5Match 
     129        SUBSTR caseExactIA5SubstringsMatch 
    127130        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) 
    128131         
    … …  
    131134        DESC 'Identifies the last job in the history' 
    132135        EQUALITY caseExactIA5Match 
     136        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) 
     137         
     138# pykotaFileName         
     139attributetype ( 1.3.6.1.4.1.16868.1.1.19 NAME 'pykotaFileName' 
     140        DESC 'Print job filename' 
     141        EQUALITY caseExactIA5Match 
     142        SUBSTR caseExactIA5SubstringsMatch 
     143        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) 
     144         
     145# pykotaTitle         
     146attributetype ( 1.3.6.1.4.1.16868.1.1.20 NAME 'pykotaTitle' 
     147        DESC 'Print job title' 
     148        EQUALITY caseIgnoreIA5Match 
     149        SUBSTR caseIgnoreIA5SubstringsMatch 
     150        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) 
     151         
     152# pykotaCopies 
     153attributetype ( 1.3.6.1.4.1.16868.1.1.21 NAME 'pykotaCopies' 
     154        DESC 'Number of copies of the current print job' 
     155        EQUALITY integerMatch 
     156        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) 
     157         
     158# pykotaOptions         
     159attributetype ( 1.3.6.1.4.1.16868.1.1.22 NAME 'pykotaOptions' 
     160        DESC 'Print job options' 
     161        EQUALITY caseExactIA5Match 
     162        SUBSTR caseExactIA5SubstringsMatch 
    133163        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) 
    134164         
    … …  
    171201        DESC 'An entry in the job history for a printer' 
    172202        MUST ( cn $ pykotaUserName $ pykotaPrinterName $ pykotaJobId ) 
    173         MAY  ( pykotaPrinterPageCounter $ pykotaJobSize $ pykotaAction ) ) 
     203        MAY  ( pykotaPrinterPageCounter $ pykotaJobSize $ pykotaAction $ pykotaFileName $ pykotaTitle $ pykotaCopies $ pykotaOptions ) ) 
    174204         
    175205# pykotaAccountBalance 

  • pykota/trunk/initscripts/ldap/README.ldap

    r1165 r1200  
    5656      But we recommend that you add these :   
    5757       
    58         index pykotaUserName eq 
    59         index pykotaGroupName eq 
    60         index pykotaPrinterName eq 
     58        index pykotaUserName pres,eq,sub 
     59        index pykotaGroupName pres,eq,sub 
     60        index pykotaPrinterName pres,eq,sub 
    6161        index pykotaLastJobIdent eq 
    62          
    63       NB : PyKota's schema doesn't currently allow substring 
    64            matches, but they would probably be very helpful 
    65            for the pykotaUserName, pykotaGroupName and pykotaPrinterName 
    66            attributes. This problem will be solved in a future 
    67            release. 
    6862         
    6963    Finally, restart the OpenLDAP server :     
    … …  
    7367pykota-sample.ldif : 
    7468 
    75     This file represents a sample LDAP directory tree dump with 
    76     PyKota functionnalities.  
    77     DON'T USE THIS FILE. IT IS JUST THERE TO SERVE AS AN EXAMPLE. 
     69    You can use this file to initialize an LDAP tree for PyKota, if 
     70    you want. 
     71     
     72    The structure used in this file is NOT mandatory ! 
     73    Provided you put correct parameters into /etc/pykota/pykota.conf, 
     74    you can structure your LDAP directory the way you want. 
    7875     
    7976To use an LDAP directory as the Quota Storage, just modify   

  • pykota/trunk/initscripts/postgresql/pykota-postgresql.sql

    r1087 r1200  
    2020-- 
    2121-- $Log$ 
     22-- Revision 1.5  2003/11/21 14:28:45  jalet 
     23-- More complete job history. 
     24-- 
    2225-- Revision 1.4  2003/07/16 21:53:07  jalet 
    2326-- Really big modifications wrt new configuration file's location and content. 
    … …  
    97100                        hardlimit INT4, 
    98101                        datelimit TIMESTAMP); 
     102CREATE UNIQUE INDEX userpquota_up_id_ix ON userpquota (userid, printerid); 
    99103                         
    100104-- 
    … …  
    108112                        jobsize INT4, 
    109113                        action TEXT, 
     114                        filename TEXT, 
     115                        title TEXT, 
     116                        copies INT4, 
     117                        options TEXT, 
    110118                        jobdate TIMESTAMP DEFAULT now()); 
     119CREATE INDEX jobhistory_p_id_ix ON jobhistory (printerid); 
     120CREATE INDEX jobhistory_pd_id_ix ON jobhistory (printerid, jobdate); 
    111121                         
    112122-- 
    … …  
    119129                         hardlimit INT4, 
    120130                         datelimit TIMESTAMP); 
     131CREATE UNIQUE INDEX grouppquota_up_id_ix ON grouppquota (groupid, printerid); 
    121132                         
    122133--                          

  • pykota/trunk/initscripts/postgresql/README.postgresql

    r1079 r1200  
    5151Upgrade scripts : 
    5252 
     53  DON'T DO ANYTHING IF THIS IS YOUR FIRST INSTALLATION 
     54  OF PYKOTA. 
     55 
    5356  Some scripts to upgrade old PyKota databases to the new 
    5457  database schema are included. You may have to run all 
    … …  
    5659  version of PyKota. 
    5760   
     61  * An SQL script to upgrade a pre-1.16 PyKota Storage DataBase to 
     62    1.16 is included. Launch it this way on the Quota Storage Server : 
     63     
     64        $ psql -U postgres pykota 
     65        pykota=# \i upgrade-to-1.16.sql 
     66        pykota=# \q 
     67        $ 
     68         
     69    This script adds some fields to the print job history, so that 
     70    more complete information will be known. The fields that 
     71    are added are : filename, title, copies and print command options. 
     72    Also some indexes are created to speed things up. 
    5873   
     74What is below is for historical reasons only, real people don't use   
     75such old beasts, and YOU SHOULDN'T EITHER ! 
     76 
    5977  * An SQL script to upgrade a pre-1.14 PyKota Storage DataBase to 
    6078    1.14 is included. Launch it this way on the Quota Storage Server : 
    … …  
    6987    messages in case he is over quota. 
    7088     
    71 What is below is for historical reasons only, real people don't use   
    72 such old beasts, and YOU SHOULDN'T EITHER ! 
    73  
    7489  * An sql script to upgrade a pre-1.01 PyKota Quota Storage DataBase to  
    7590    1.01 is still included for historical reasons. PLEASE DON'T USE IT !  

  • pykota/trunk/initscripts/README

    r1037 r1200  
    4545============================================================================= 
    4646     
     47  * upgrade-to-1.16.sql :   
     48   
     49    This file upgrades the PostgreSQL Quota Storage Database schema 
     50    from versions before 1.16 to version 1.16. 
     51    NEVER USE IT IF YOU ALREADY RUN 1.16 OR ABOVE ! 
     52     
     53  * upgrade-to-1.14.sql :   
     54   
     55    This file upgrades the PostgreSQL Quota Storage Database schema 
     56    from versions before 1.14 to version 1.14. 
     57    NEVER USE IT IF YOU ALREADY RUN 1.14 OR ABOVE ! 
     58     
    4759  * VERYOLDpykota-upgrade-postgresql.sql : 
    4860