upgrade / example fix

Author: Marcin Przepiorowski

bin/dx_ctl_engine_upgrade.pl

@@ -98,7 +98,7 @@
   } else {
 
     my $namechek = basename($filename);
-    if ( ! (($file_version) = $namechek =~ /^[dD]elphix_(\d.\d.\d.\d)_\d\d\d\d-\d\d-\d\d-\d\d-\d\d[\._][Standard_]*[uU]pgrade\.tar[\.gz]*$/ )) {
+    if ( ! (($file_version) = $namechek =~ /^[dD]elphix_(\d.\d.\d.\d)_\d\d\d\d-\d\d-\d\d-\d\d-\d\d[\._][Standard_].*\.tar[\.gz]*$/ )) {
       print "Filename is not matching delphix upgrade pattern \n";
       exit (1);
     }

bin/dxtools.conf.example

@@ -3,7 +3,7 @@
 	{
 		"hostname" : "Landshark",
 		"ip_address" : "delphix01",
-		"username" : "delphix_admin",
+		"username" : "admin",
 		"password" : "delphix",
 		"port" : "80",
 		"default" : "false",
@@ -13,31 +13,50 @@
 	{
 		"hostname" : "Landshark2",
 		"ip_address" : "delphix02",
-		"username" : "delphix_admin",
+		"username" : "admin",
 		"password" : "delphix",
 		"port" : "443",
 		"default" : "true",
 		"encrypted" : "false",
-                "protocol" : "https"
+    "protocol" : "https"
 	},
 	{
 		"hostname" : "Delphix32",
 		"ip_address" : "192.168.1.32",
-		"username" : "delphix_admin",
+		"username" : "admin",
 		"password" : "#papapaewiru32472931u12",
 		"port" : "80",
 		"default" : "true",
 		"encrypted" : "true"
 	},
-	{ 
-                "hostname" : "marcinapi",
-                "ip_address" : "192.168.1.32",
-                "clientid" : "0oa6rs0js1f1zrueye",
-                "clientsecret" : "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", 
-                "port" : "80",
-                "default" : "true",
-                "encrypted" : "false",
-                "timeout" : "60"
-        }
+	{
+		"hostname" : "Delphix32",
+		"ip_address" : "192.168.1.32",
+		"username" : "admin",
+		"passwordvar" : "DELPASS",
+		"port" : "80",
+		"default" : "true",
+		"encrypted" : "false"
+	},
+	{
+		"hostname" : "Delphix32",
+		"ip_address" : "192.168.1.32",
+		"username" : "admin",
+		"passwordscript" : "/home/delphix/givemepass.sh",
+		"additionalopt" : "safefordelphix32",
+		"port" : "80",
+		"default" : "true",
+		"encrypted" : "false"
+	},
+	{
+	"hostname" : "marcinapi",
+	"ip_address" : "192.168.1.32",
+	"clientid" : "0oa6rs0js1f1zrueye",
+	"clientsecret" : "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+	"port" : "80",
+	"default" : "true",
+	"encrypted" : "false",
+	"timeout" : "60"
+  }
 	]
 }