Changeset 660 for trunk


Ignore:
Timestamp:
Dec 29, 2014, 5:46:43 PM (8 years ago)
Author:
Kris Deugau
Message:

/trunk

Backmerge addition of RPC shim from /branches/stable r600

Location:
trunk
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/cgi-bin/IPDB.pm

    r655 r660  
    2525@EXPORT_OK    = qw(
    2626        %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
    27         %IPDBacl %aclmsg $errstr
     27        %IPDBacl %aclmsg %rpcacl
     28        $errstr
    2829        &initIPDBGlobals &connectDB &finish &checkDBSanity
    2930        &addMaster &touchMaster
     
    3940%EXPORT_TAGS    = ( ALL => [qw(
    4041                %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
    41                 %IPDBacl %aclmsg $errstr
     42                %IPDBacl %aclmsg %rpcacl
     43                $errstr
    4244                &initIPDBGlobals &connectDB &finish &checkDBSanity
    4345                &addMaster &touchMaster
     
    6870        delblock        => 'delete an allocation',
    6971        );
     72
     73our %rpcacl;
    7074
    7175# error reporting
  • trunk/cgi-bin/MyIPDB.pm

    r659 r660  
    2323my $dbhost = 'localhost';
    2424
    25 # Quick workaround for fixed web path.  Set this to the absolute web path to
    26 # your IPDB install, or leave blank for installation at the webroot.
    27 $IPDB::webpath = '';
     25# ACL for RPC shim.  A hash of arrays;  the hash keys are the remote system
     26# names, the array contents are the IPs allowed to claim that system name.
     27#%IPDB::rpcacl = (
     28#       cli_test => ['192.168.99.115','209.91.179.62'],
     29#       devel => ['10.0.10.5'],
     30#       );
     31
     32# Quick workaround for fixed web path.  Set this to the absolute web path to
     33# your IPDB install, or leave blank for installation at the webroot.
     34$IPDB::webpath = '';
    2835
    2936# Set some globals declared in IPDB.pm.  Most of these only affect mailNotify().
Note: See TracChangeset for help on using the changeset viewer.