alter IPV4OBJ_LISTSRC to apply to all object types unless specifically excluded
authorAaron Dummer <aaron@dummer.info>
Mon, 25 Nov 2013 20:14:36 +0000 (12:14 -0800)
committerAaron Dummer <aaron@dummer.info>
Fri, 29 Nov 2013 23:54:16 +0000 (15:54 -0800)
ChangeLog
README
wwwroot/inc/install.php
wwwroot/inc/ophandlers.php
wwwroot/inc/upgrade.php

index d0cc6037cda4a328987dc129cbeddb812ab22ffe..2a11cd504572c734118b13913afd15f7734ae17a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+0.20.7
+       update: enable IP addressing for all object types unless specifically excluded
 0.20.6 2013-11-29
        bugfix: "sshnokey" gateway had a bug
        bugfix: SLB config was generated incrorrectly when multiple 
diff --git a/README b/README
index c9b0228c7f5888f3d450db6153b816b1a21725b4..9d4bbbcbd99dd235b2153bd1de3e8772c4ea74a1 100644 (file)
--- a/README
+++ b/README
@@ -99,6 +99,11 @@ and initialize the application.
 *                                                     *
 *******************************************************
 
+*** Upgrading to 0.20.7 ***
+
+The IPV4OBJ_LISTSRC configuration option is reset to an expression which enables
+the IP addressing feature for all object types except those listed.
+
 *** Upgrading to 0.20.6 ***
 
 New MGMT_PROTOS configuration option replaces the TELNET_OBJS_LISTSRC,
index ecae56b257a9137d16f218d77d8a341afb0979fb..339fe9df5c8e268a0a154121f1efa294cd1e7da9 100644 (file)
@@ -1672,7 +1672,7 @@ WHERE O.objtype_id = 1562";
 ('PREVIEW_IMAGE_MAXPXS','320','uint','yes','no','yes','Max pixels per axis for image file preview'),
 ('VENDOR_SIEVE','','string','yes','no','yes','Vendor sieve configuration'),
 ('IPV4LB_LISTSRC','false','string','yes','no','no','List source: IPv4 load balancers'),
-('IPV4OBJ_LISTSRC','{\$typeid_4} or {\$typeid_7} or {\$typeid_8} or {\$typeid_12} or {\$typeid_445} or {\$typeid_447} or {\$typeid_798} or {\$typeid_965} or {\$typeid_1397} or {\$typeid_1502} or {\$typeid_1503} or {\$typeid_1504} or {\$typeid_1507} or {\$typeid_1787}','string','yes','no','no','List source: IPv4-enabled objects'),
+('IPV4OBJ_LISTSRC','not ({\$typeid_3} or {\$typeid_9} or {\$typeid_10} or {\$typeid_11})','string','yes','no','no','List source: IPv4-enabled objects'),
 ('IPV4NAT_LISTSRC','{\$typeid_4} or {\$typeid_7} or {\$typeid_8} or {\$typeid_798}','string','yes','no','no','List source: IPv4 NAT performers'),
 ('ASSETWARN_LISTSRC','{\$typeid_4} or {\$typeid_7} or {\$typeid_8}','string','yes','no','no','List source: object, for which asset tag should be set'),
 ('NAMEWARN_LISTSRC','{\$typeid_4} or {\$typeid_7} or {\$typeid_8}','string','yes','no','no','List source: object, for which common name should be set'),
index 56e1dd75436ca6f6196d8574609387fcd9f8cdee..363f2bd06fffd3f961023c844a6c1262ff5d255b 100644 (file)
@@ -1434,7 +1434,7 @@ function resetUIConfig()
        setConfigVar ('PREVIEW_IMAGE_MAXPXS', '320');
        setConfigVar ('VENDOR_SIEVE', '');
        setConfigVar ('IPV4LB_LISTSRC', 'false');
-       setConfigVar ('IPV4OBJ_LISTSRC','{$typeid_4} or {$typeid_7} or {$typeid_8} or {$typeid_12} or {$typeid_445} or {$typeid_447} or {$typeid_798} or {$typeid_1504} or {$typeid_1507} or {$typeid_1787}');
+       setConfigVar ('IPV4OBJ_LISTSRC','not ({$typeid_3} or {$typeid_9} or {$typeid_10} or {$typeid_11})');
        setConfigVar ('IPV4NAT_LISTSRC','{$typeid_4} or {$typeid_7} or {$typeid_8} or {$typeid_798}');
        setConfigVar ('ASSETWARN_LISTSRC','{$typeid_4} or {$typeid_7} or {$typeid_8}');
        setConfigVar ('NAMEWARN_LISTSRC','{$typeid_4} or {$typeid_7} or {$typeid_8}');
index d9a268477afdcece4d27a3438da4d2ff2cd10f61..0a727cb8a8edda55e2b10547ad360171abc8cd4e 100644 (file)
@@ -190,6 +190,12 @@ particular device list using a RackCode filter. The default value
 ("ssh: {\$typeid_4}, telnet: {\$typeid_8}") produces "ssh://server.fqdn" for
 servers and "telnet://switch.fqdn" for network switches.
 ENDOFTEXT
+,
+
+       '0.20.7' => <<<ENDOFTEXT
+The IPV4OBJ_LISTSRC configuration option is reset to an expression which enables
+the IP addressing feature for all object types except those listed.
+ENDOFTEXT
 ,
 );
 
@@ -234,6 +240,7 @@ function getDBUpgradePath ($v1, $v2)
                '0.20.4',
                '0.20.5',
                '0.20.6',
+               '0.20.7',
        );
        if (!in_array ($v1, $versionhistory) or !in_array ($v2, $versionhistory))
                return NULL;
@@ -1361,6 +1368,11 @@ CREATE TABLE `VSEnabledPorts` (
                        $query[] = "DELETE FROM Config WHERE varname = 'PORTS_PER_ROW'";
                        $query[] = "UPDATE Config SET varvalue = '0.20.6' WHERE varname = 'DB_VERSION'";
                        break;
+               case '0.20.7':
+                       // enable IP addressing for all object types unless specifically excluded
+                       $query[] = "UPDATE `Config` SET varvalue = 'not ({\$typeid_3} or {\$typeid_9} or {\$typeid_10} or {\$typeid_11})' WHERE varname = 'IPV4OBJ_LISTSRC'";
+                       $query[] = "UPDATE Config SET varvalue = '0.20.6' WHERE varname = 'DB_VERSION'";
+                       break;
                case 'dictionary':
                        $query = reloadDictionary();
                        break;