- change Makefile not to change __WIZ_HOME__ in drakwizard.pl before installation

- add apache2 wizard

2 files changed, 380 insertions, 0 deletions

diff --git a/web_wizard/Makefile b/web_wizard/Makefile
index 529bb696..b105f592 100644
--- a/web_wizard/Makefile
+++ b/web_wizard/Makefile
@@ -8,6 +8,7 @@ install:
 	mkdir -p --mode=u=rwx,g=rx,o=rx  ${prefix}/share/wizards/web_wizard/scripts
 	mkdir -p --mode=u=rwx,g=rx,o=rx  ${prefix}/share/wizards/web_wizard/images
 	install --mode=u=rw,g=r,o=r -p web.wiz ${prefix}/share/wizards/web_wizard
+	install --mode=u=rw,g=r,o=r -p apache2.wiz ${prefix}/share/wizards/web_wizard
 
 
 
diff --git a/web_wizard/apache2.wiz b/web_wizard/apache2.wiz
new file mode 100644
index 00000000..bb7ec2c3
--- /dev/null
+++ b/web_wizard/apache2.wiz
@@ -0,0 +1,379 @@
+<?xml version="1.0"?>
+
+
+<Wizard
+	name="general"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
+	wizardTitle="Web wizard"
+	imagePosition="top"
+	defaultImage="__WIZ_HOME__/web_wizard/images/apache.png"
+	perlModule="__WIZ_HOME__/web_wizard/scripts/Webconf.pm"
+	rpm="apache2"
+	summaryFunc="do_it"
+>
+
+	<Variable
+		name="wiz_web_internal"
+		shellVariable="wiz_web_internal"
+		defaultValue="1"
+	>
+	</Variable>
+
+	<Variable
+		name="wiz_web_external"
+		shellVariable="wiz_web_external"
+		defaultValue="1"
+	>
+	</Variable>
+
+	<Variable
+		name="user_mod"
+		shellVariable="wiz_user_mod"
+	>
+	</Variable>
+
+	<Variable
+		name="user_dir"
+		shellVariable="wiz_user_dir"
+	>
+	</Variable>
+
+	<Variable
+		name="shared_dir"
+		shellVariable="wiz_dir"
+	>
+	</Variable>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
+		name="welcome"
+		func="check"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Target
+			targetName="web connections"
+			jumpIndex="0"
+		>
+		</Target>
+
+		<Target
+			targetName="must be root"
+			jumpIndex="1"
+		>
+		</Target>
+
+		<Target
+			targetName="error_dhcp"
+			jumpIndex="2"
+		>
+		</Target>
+
+		<Info
+			helpText="Web Server Configuration Wizard"
+		>
+		</Info>
+
+
+		<Info
+			helpText="This wizard will help you configuring the Web Server for your network."
+		>
+		</Info>
+	</Page>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
+		name="must be root"
+		nextButtonText="OK"
+		executionLevel="NORMAL"
+		nextFinish="true"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Info
+			helpText="Sorry, you must be root to do this..."
+		>
+		</Info>
+	</Page>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
+		name="error_dhcp"
+		jumpPage="web connections"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Info
+			helpText="Warning\nYou are in dhcp, server may not work with your configuration."
+		>
+		</Info>
+	</Page>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
+		name="web connections"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Info
+			helpText="Web Server"
+		>
+		</Info>
+
+
+		<Info
+			helpText="Your server can act as a Web Server toward your internal network (intranet) and as a Web Server for the Internet."
+		>
+		</Info>
+
+
+		<Info
+			helpText="Select the kind of Web service you want to activate:"
+		>
+		</Info>
+
+
+		<Boolean
+			name="wiz_web_internal"
+			variableName="wiz_web_internal"
+			forceEnabled="1"
+			forceDisabled="0"
+			helpText="Enable the Web Server for the Intranet"
+		>
+		</Boolean>
+
+
+		<Boolean
+			name="wiz_web_external"
+			variableName="wiz_web_external"
+			forceEnabled="1"
+			forceDisabled="0"
+			helpText="Enable the Web Server for the Internet"
+		>
+		</Boolean>
+
+
+		<Info
+			helpText="Don't check any box if you don't want to activate your Web Server."
+		>
+		</Info>
+	</Page>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
+		name="ask_mod"
+		func="is_user_mod"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Target
+			targetName="ask_dir"
+			jumpIndex="0"
+		>
+		</Target>
+
+
+		<Target
+			targetName="ask_user_dir"
+			jumpIndex="1"
+		>
+		</Target>
+
+		<Info
+			helpText="Modules :"
+		>
+		</Info>
+
+
+		<Info
+			helpText="* User module : allows users to have a directory in their home directories available on your http server via http://www.yourserver.com/~user, you will be asked for the name of this directory afterward."
+		>
+		>
+		</Info>
+
+		<Boolean
+			variableName="user_mod"
+			helpText="activate user module"
+			fillfunc="is_last_user_mod"
+			help="Allows users to get a directory in their homes directories available on your http server via http://www.yourserver.com/~user."
+		>
+		</Boolean>
+	</Page>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
+		name="ask_user_dir"
+		func="check_dir"
+		is="user_mod"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Info
+			helpText="Type the name of the directory users should create in their homes (whitout ~/) to get it available via http://www.yourserver.com/~user"
+		>
+		</Info>
+
+		<Freetext
+			variableName="user_dir"
+			helpText="user http sub-directory : ~/"
+			editable="true"
+			fillfunc="get_user_dir"
+			help="Type the name of the directory users should create in their homes (whitout ~/) to get it available via http://www.yourserver.com/~user"
+		>
+		</Freetext>
+	</Page>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
+		name="ask_dir"
+		func="check_dir"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Target
+			targetName="error_in_dir"
+			jumpIndex="1"
+		>
+		</Target>
+
+		<Target
+			targetName="confirmation"
+			jumpIndex="10"
+		>
+		</Target>
+
+
+		<Info
+			helpText="Type the path of the directory you want being the document root."
+		>
+		</Info>
+
+		<Freetext
+			variableName="shared_dir"
+			helpText="Document Root:"
+			editable="true"
+			fillfunc="get_docroot"
+		>
+		</Freetext>
+	</Page>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
+		name="error_in_dir"
+		jumpPage="ask_dir"
+		nextButtonText="Fix it"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Info
+			helpText="The path you entered does not exist."
+		>
+		</Info>
+	</Page>
+
+
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
+		name="confirmation"
+		func="do_it"
+		jumpPage="congratulations"
+		nextButtonText="Configure"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Info
+			helpText="Configuring the Web Server"
+		>
+		</Info>
+
+
+		<Info
+			helpText="The wizard collected the following parameters needed to configure your Web Server"
+		>
+		</Info>
+
+
+		<Freetext
+			name="freetext1"
+			variableName="wiz_web_internal"
+			helpText="Intranet web server:"
+			editable="false"
+		>
+		</Freetext>
+
+		<Freetext
+			name="freetext2"
+			variableName="wiz_web_external"
+			helpText="Internet web server:"
+			editable="false"
+		>
+		</Freetext>
+
+		<Freetext
+			variableName="shared_dir"
+			helpText="Document root:"
+			editable="false"
+		>
+		</Freetext>
+
+		<Freetext
+			variableName="user_dir"
+			helpText="User directory:"
+			editable="false"
+		>
+		</Freetext>
+
+		<Info
+			helpText="To accept these values, and configure your server, click the Next button or use the Back button to correct them."
+		>
+		</Info>
+	</Page>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
+		name="congratulations"
+		nextButtonText="Quit"
+		executionLevel="NORMAL"
+		nextFinish="true"
+		canBack="false"
+		canCancel="false"
+	>
+
+		<Info
+			helpText="Congratulations"
+		>
+		</Info>
+
+
+		<Info
+			helpText="The wizard successfully configured your Intranet/Internet Web Server"
+		>
+		</Info>
+	</Page>
+</Wizard>