Changeset 39 for branches/stable


Ignore:
Timestamp:
10/28/04 15:31:30 (20 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Merge bugfixes and updates from /trunk r37 and r38

Location:
branches/stable
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/alloctypes.html

    r10 r39  
    88<body bgcolor="#ffffff" text="#000000" link="#000000" vlink="#000000" alink="#ff0000" leftmargin="0" topmargin="0" marginwidth="0">
    99
    10 <table class="regular" width=630>
     10<table class="regular">
    1111
    1212<tr><td colspan=2 class="heading">Allocation Types:</td><tr>
    1313
    1414<tr class="color1">
    15 <td>Customer netblock (default)</td><td>A direct allocation /30 or larger to a customer.</td>
     15<td>Customer netblock (default)</td><td>A direct allocation /30 or larger to a
     16customer.</td>
    1617</tr>
    1718
    1819<tr class="color2">
    19 <td>Customer static IP - Cable</td><td>A single IP address from a designated pool
     20<td>Static IP - Server pool</td><td>A single IP from a pool designated for
     21servers</td>
     22</tr><tr class="color1">
     23<td>Static IP - Cable</td><td>A single IP address from a designated pool
    2024on the cable network.</td>
     25</tr><tr class="color2">
     26<td>Static IP - DSL</td><td>A single IP address from a designated pool
     27on the DSL network.  Note that these are nominally in Sudbury or North Bay,
     28even if the customer isn't.</td>
    2129</tr><tr class="color1">
    22 <td>Customer static IP - DSL</td><td>A single IP address from a designated pool
    23 on the DSL network.  Note that these are nominally in Sudbury, even if the customer
    24 isn't.</td>
     30<td>Static IP - Dialup</td><td>A single IP address from a designated pool
     31on a dialup RAS.</td>
    2532</tr><tr class="color2">
    26 <td>IP from server pool</td><td>A single IP from a pool designated for servers</td>
     33<td>Static IP - Wireless</td><td>A single IP address from a designated pool
     34on one of our wireless networks.</td>
    2735</tr>
    2836
    2937<tr class="color1">
    30 <td>Pool - Cable</td><td>A pool of IP addresses available for one-by-one assignment to
    31 customers on cable.</td>
     38<td>Static pool - Servers</td><td>A pool of IP addresses available for one-by-one
     39assignment to servers in a POP.  This will usually only be in Sudbury.</td>
    3240</tr><tr class="color2">
    33 <td>Pool - DSL</td><td>A pool of IP addresses available for one-by-one assignment to
     41<td>Static pool - Cable</td><td>A pool of IP addresses available for one-by-one assignment
     42to customers on cable.</td>
     43</tr><tr class="color1">
     44<td>Static pool - DSL</td><td>A pool of IP addresses available for one-by-one assignment to
    3445customers on DSL.  Note that individual IPs will be "assigned" to the customer's
    3546city, but the pool they are a part of will normally be "assigned" to Sudbury or
    3647North Bay.</td>
     48</tr><tr class="color2">
     49<td>Static pool - Dialup</td><td>A pool of IP addresses available for one-by-one
     50assignment to dialup customers.</td>
    3751</tr><tr class="color1">
    38 <td>Pool - Servers</td><td>A pool of IP addresses available for one-by-one assignment to
    39 servers in Sudbury.</td>
     52<td>Static pool - Wireless</td><td>A pool of IP addresses available for one-by-one
     53assignment to customers on one of our wireless networks.</td>
    4054</tr>
    4155

  • branches/stable/assign.html

    r32 r39  
    5151<td>Allocation type:</td><td>
    5252<select name="alloctype"><option value="cn" selected>Customer netblock</option>
    53 <option value="ci">Customer static IP - Cable</option>
    54 <option value="di">Customer static IP - DSL</option>
    55 <option value="mi">Customer static IP - Dialup</option>
    56 <option value="si">IP from server pool</option>
     53<option value="si">Static IP - Server pool</option>
     54<option value="ci">Static IP - Cable</option>
     55<option value="di">Static IP - DSL</option>
     56<option value="mi">Static IP - Dialup</option>
     57<option value="wi">Static IP - Wireless</option>
     58<option value="sp">Static Pool - Servers</option>
    5759<option value="cp">Static Pool - Cable</option>
    5860<option value="dp">Static Pool - DSL</option>
    5961<option value="mp">Static Pool - Dialup</option>
    60 <option value="sp">Static Pool - Servers</option>
     62<option value="wp">Static Pool - Wireless</option>
    6163<option value="ee">End-use netblock</option>
    6264<option value="dn">Dialup netblock</option>

  • branches/stable/cgi-bin/main.cgi

    r35 r39  
    874874          " a set of smaller netblocks or a single smaller netblock.";
    875875      } else {
    876         if ($webvar{alloctype} =~ /^[sd]p$/) {
     876        if ($webvar{alloctype} =~ /^[scdmw]p$/) {
    877877          if (($webvar{city} !~ /^(Sudbury|North Bay)$/) && ($webvar{alloctype} eq 'dp')) {
    878878            printAndExit("You must chose Sudbury or North Bay for DSL pools."); }
    879           if ($webvar{alloctype} eq 'sp') { $city = "Sudbury"; } else { $city = $webvar{city}; }
     879          $city = $webvar{city};
    880880          $failmsg = "No suitable free block found.<br>\nYou will have to route another".
    881881            " superblock <br>\nfrom one of the master blocks in Sudbury or chose a smaller".

  • branches/stable/fb-assign.html

    r24 r39  
    5252<td>Allocation type:</td><td>
    5353<select name="alloctype"><option value="cn" selected>Customer netblock</option>
    54 <option value="cp">Pool - Cable</option>
    55 <option value="dp">Pool - DSL</option>
    56 <option value="mp">Pool - Static Dialup</option>
    57 <option value="sp">Pool - Servers</option>
     54<option value="sp">Static Pool - Servers</option>
     55<option value="cp">Static Pool - Cable</option>
     56<option value="dp">Static Pool - DSL</option>
     57<option value="mp">Static Pool - Dialup</option>
     58<option value="wp">Static Pool - Wireless</option>
    5859<option value="ee">End-use netblock</option>
    5960<option value="dn">Dialup netblock</option>

  • branches/stable/header.inc

    r14 r39  
    1313}
    1414function helpAllocTypes() {
    15         window.open("/ip/alloctypes.html", "alloc_window", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=650,height=600")
     15        window.open("/ip/alloctypes.html", "alloc_window", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=750,height=550")
    1616}
    1717</script>
Note: See TracChangeset for help on using the changeset viewer.