various fixes in server wizard

deactivate firewall wizard

1 files changed, 35 insertions, 35 deletions

diff --git a/server_wizard/server.wiz b/server_wizard/server.wiz
index 9a63fd80..301d31fd 100644
--- a/server_wizard/server.wiz
+++ b/server_wizard/server.wiz
@@ -14,7 +14,6 @@
 		name="hostname"
 		comment="The host name of the server"
 		shellVariable="wiz_host_name"
-		defaultValue="host.domain.net"
 		valueIsTranslated="false"
 	>
 	</Variable>
@@ -32,7 +31,6 @@
 		name="network_address"
 		comment="The network address"
 		shellVariable="wiz_ip_net"
-		defaultValue="192.168.0.0"
 		valueIsTranslated="false"
 	>
 	</Variable>
@@ -41,7 +39,6 @@
 		name="server_address"
 		comment="The server IP address"
 		shellVariable="wiz_ip_server"
-		defaultValue="192.168.0.1"
 		valueIsTranslated="false"
 	>
 	</Variable>
@@ -50,7 +47,6 @@
 		name="net_device"
 		comment="The device used to the network connection"
 		shellVariable="wiz_device"
-		defaultValue="eth0"
 		valueIsTranslated="false"
 	>
 	</Variable>
@@ -177,7 +173,7 @@
 		<Freetext
 			name="freetext"
 			variableName="hostname"
-			fillScript="get_var wiz_host_name"
+			fillfunc="get_hostname"
 			editable="true"
 		>
 		</Freetext>
@@ -186,7 +182,7 @@
 	<Page
 		name="ask_hostname"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_domain.sh"
+		func="check_domain"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -221,13 +217,12 @@
 			name="hostnameInput"
 			comment="Host name input field"
 			variableName="hostname"
-			fillScript="get_var wiz_host_name $wiz_host_name"
+			fillfunc="get_hostname"
 			helpText="Host Name:"
 			editable="true"
 		>
 		</Freetext>
 
-
 		<Info
 			helpText="Host names must be in the form \qhost.domain.domaintype\q; if your server will be an Internet server, the domain name should be the name registered with your provider. If you will only have intranet any valid name is OK, like \qcompany.net\q."
 		>
@@ -235,26 +230,10 @@
 	</Page>
 
 	<Page
-		name="error_in_hostname"
-		comment="Error message for an incorrect hostname"
-		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpPage="load_hostname_value"
-		nextButtonText="Fix it"
-		executionLevel="NORMAL"
-		nextFinish="false"
-		canBack="true"
-		canCancel="true"
-	>
-
-		<Info
-			helpText="The host name is not correct"
-		>
-		</Info>
-	</Page>
-	<Page
 		name="choose_net_device"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="__WIZ_HOME__/server_wizard/scripts/set_ip.sh"
+		func="set_ip"
+		jumpPage="load_net_address"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -272,20 +251,18 @@
 		>
 		</Info>
 
-
 		<Chooser
 			name="deviceChooser"
 			variableName="net_device"
+			defaultOptionScript="__WIZ_HOME__/firewall_wizard/scripts/compute_ext_device.sh"
 			fillScript="__WIZ_HOME__/server_wizard/scripts/liste_device.sh"
 			helpText="Device:"
 			helpFontName="Default"
 			helpFontStyle="plain"
 			helpFontSize="12"
-			editable="false"
 		>
 		</Chooser>
 
-
 		<Info
 			helpText="Devices are presented with the Linux name and, if known, with the card description."
 		>
@@ -308,7 +285,7 @@
 		<Freetext
 			name="net_deviceField"
 			variableName="net_device"
-			fillScript="get_var wiz_device"
+			fillfunc="get_device"
 			helpText="net device"
 			editable="false"
 		>
@@ -336,7 +313,7 @@
 		<Freetext
 			name="freetext1"
 			variableName="network_address"
-			fillScript="get_val wiz_ip_net"
+			fillfunc="get_net"
 			editable="true"
 		>
 		</Freetext>
@@ -345,7 +322,7 @@
 	<Page
 		name="ask_network_address"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_network.sh"
+		func="check_network"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -379,7 +356,7 @@
 		<Freetext
 			name="freetext2"
 			variableName="network_address"
-			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_ipnet.sh"
+			fillfunc="get_net"
 			helpText="IP net address:"
 			editable="true"
 		>
@@ -426,7 +403,7 @@
 		<Freetext
 			name="freetext3"
 			variableName="server_address"
-			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_server_ip.sh"
+			fillfunc="compute_server_ip"
 			editable="false"
 		>
 		</Freetext>
@@ -471,7 +448,7 @@
 	<Page
 		name="ask_server_address"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_server_ip.sh"
+		func="check_server_ip"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -505,6 +482,7 @@
 		<Freetext
 			name="serverAddressInput"
 			variableName="server_address"
+			fillfunc="compute_server_ip"
 			helpText="Server IP address:"
 			editable="true"
 		>
@@ -570,6 +548,7 @@
 			name="get_gatewaydev"
 			variableName="wiz_extn_device"
 			helpText="Gateway device:"
+			fillfunc="get_gateway_dev"
 			editable="true"
 		>
 		</Freetext>
@@ -577,6 +556,7 @@
 		<Freetext
 			name="get_ipgateway"
 			variableName="wiz_extn_gateway"
+			fillfunc="get_gateway"
 			helpText="Gateway IP:"
 			editable="true"
 		>
@@ -631,6 +611,7 @@
 		<Freetext
 			name="serverIPConfirm"
 			variableName="server_address"
+			fillfunc="compute_server_ip"
 			helpText="Server Address:"
 			editable="false"
 		>
@@ -722,4 +703,23 @@
 		>
 		</Info>
 	</Page>
+
+	<Page
+		name="error_in_hostname"
+		comment="Error message for an incorrect hostname"
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
+		jumpPage="load_hostname_value"
+		nextButtonText="Fix it"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Info
+			helpText="The host name is not correct"
+		>
+		</Info>
+	</Page>
+
 </Wizard>