summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rwxr-xr-xdrakwizard.pl7
-rw-r--r--po/drakwizard.pot74
-rw-r--r--web_wizard/Makefile1
-rw-r--r--web_wizard/apache2.wiz379
5 files changed, 425 insertions, 40 deletions
diff --git a/Makefile b/Makefile
index f3b5ee6f..bdb42266 100644
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ all:
install:
mkdir -p ${prefix}/sbin
- perl -i -pe "s|__WIZ_HOME__|$(WIZ_HOME)|g" drakwizard.pl
install -p drakwizard.pl ${prefix}/sbin/drakwizard
+ perl -i -pe "s|__WIZ_HOME__|$(WIZ_HOME)/|g" ${prefix}/sbin/drakwizard
for l in $(WIZ); do \
$(MAKE) -C $$l $@; \
done
@@ -62,4 +62,4 @@ test: clean_test
cp Wizard.dtd Makefile drakwizard.pl drakwizard.spec test.pl test
find test -regex ".*\.wiz$$\|.*\.pm$$\|.*\.sh$$" -exec \
perl -i -pe "s|__WIZ_HOME__|$(PWD)/test|g" \{\} \;
- perl -i -pe "s|__WIZ_HOME__|$(PWD)/test|g" test/drakwizard.pl \ No newline at end of file
+ perl -i -pe "s|__WIZ_HOME__|$(PWD)/test|g" test/drakwizard.pl
diff --git a/drakwizard.pl b/drakwizard.pl
index 69846a2c..9583ddc7 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -44,7 +44,7 @@ my $standalone = 1;
# '/etc/sysconfig/network-scripts/drakconnect_conf');
if (!defined($ARGV[0])) {
- my $prefix = "__WIZ_HOME__/";
+ my $prefix = "__WIZ_HOME__";
my %wiz = (
1 => [$prefix."web_wizard/web.wiz", "Apache"],
2 => [$prefix."dhcp_wizard/dhcp.wiz", "Dhcp"],
@@ -56,12 +56,13 @@ if (!defined($ARGV[0])) {
8 => [$prefix."ftp_wizard/ftp.wiz", "Proftpd"],
9 => [$prefix."samba_wizard/samba.wiz", "Samba"],
10 => [$prefix."proxy_wizard/proxy.wiz", "Squid"],
- 11 => [$prefix."time_wizard/time.wiz", "Time"]
+ 11 => [$prefix."time_wizard/time.wiz", "Time"],
+ 12 => [$prefix."web_wizard/apache2.wiz", "Apache2"]
);
$in->ask_from(
N("Drakwizard wizard selection"),
N("Please select a wizard"),
- [{ val => \$ARGV[0], list => [sort keys %wiz], format => sub { $wiz{$_[0]}[1] }}]
+ [{ val => \$ARGV[0], list => [sort { $wiz{$a}[2] cmp $wiz{$b}[2] } keys %wiz], format => sub { $wiz{$_[0]}[1] }}]
);
$ARGV[0] = $wiz{$ARGV[0]}[0];
}
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index 73eb34ad..5e32a41b 100644
--- a/po/drakwizard.pot
+++ b/po/drakwizard.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-02-21 15:04+0100\n"
+"POT-Creation-Date: 2003-03-01 07:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
#: ../samba_wizard/samba.wiz_.c:7 ../server_wizard/server.wiz_.c:5
-#: ../web_wizard/web.wiz_.c:11
+#: ../web_wizard/apache2.wiz_.c:11 ../web_wizard/web.wiz_.c:11
msgid "OK"
msgstr ""
@@ -122,7 +122,7 @@ msgstr ""
#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
#: ../samba_wizard/samba.wiz_.c:28 ../server_wizard/server.wiz_.c:33
-#: ../web_wizard/web.wiz_.c:8
+#: ../web_wizard/apache2.wiz_.c:8 ../web_wizard/web.wiz_.c:8
msgid "Configure"
msgstr ""
@@ -150,12 +150,14 @@ msgstr ""
#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
#: ../samba_wizard/samba.wiz_.c:45 ../server_wizard/server.wiz_.c:44
-#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/apache2.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:19
msgid "Quit"
msgstr ""
#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
-#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/apache2.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:22
msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
msgstr ""
@@ -171,7 +173,7 @@ msgstr ""
#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
#: ../samba_wizard/samba.wiz_.c:53 ../server_wizard/server.wiz_.c:48
-#: ../web_wizard/web.wiz_.c:24
+#: ../web_wizard/apache2.wiz_.c:24 ../web_wizard/web.wiz_.c:24
msgid "Congratulations"
msgstr ""
@@ -236,7 +238,7 @@ msgid "Add"
msgstr ""
#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
-#: ../web_wizard/web.wiz_.c:21
+#: ../web_wizard/apache2.wiz_.c:21 ../web_wizard/web.wiz_.c:21
msgid "Sorry, you must be root to do this..."
msgstr ""
@@ -298,7 +300,8 @@ msgstr ""
#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/apache2.wiz_.c:1
+#: ../web_wizard/web.wiz_.c:1
msgid "Fix it"
msgstr ""
@@ -319,7 +322,8 @@ msgstr ""
#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:6
-#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/apache2.wiz_.c:10
+#: ../web_wizard/web.wiz_.c:10
msgid ""
"To accept these values, and configure your server, click the Next button or "
"use the Back button to correct them."
@@ -439,11 +443,11 @@ msgstr ""
msgid "DNS Wizard (configuration)"
msgstr ""
-#: ../drakwizard.pl_.c:62
+#: ../drakwizard.pl_.c:63
msgid "Drakwizard wizard selection"
msgstr ""
-#: ../drakwizard.pl_.c:63
+#: ../drakwizard.pl_.c:64
msgid "Please select a wizard"
msgstr ""
@@ -607,7 +611,7 @@ msgid ""
msgstr ""
#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:18
-#: ../web_wizard/web.wiz_.c:23
+#: ../web_wizard/apache2.wiz_.c:23 ../web_wizard/web.wiz_.c:23
msgid "The path you entered does not exist."
msgstr ""
@@ -1695,104 +1699,104 @@ msgstr ""
msgid "Computer Science Department, University of Wisconsin-Madison"
msgstr ""
-#: ../web_wizard/web.wiz_.c:2
+#: ../web_wizard/apache2.wiz_.c:2 ../web_wizard/web.wiz_.c:2
msgid ""
"* 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."
msgstr ""
-#: ../web_wizard/web.wiz_.c:3
+#: ../web_wizard/apache2.wiz_.c:3 ../web_wizard/web.wiz_.c:3
msgid ""
"Your server can act as a Web Server toward your internal network (intranet) "
"and as a Web Server for the Internet."
msgstr ""
-#: ../web_wizard/web.wiz_.c:4
+#: ../web_wizard/apache2.wiz_.c:4 ../web_wizard/web.wiz_.c:4
msgid "Internet web server:"
msgstr ""
-#: ../web_wizard/web.wiz_.c:5
+#: ../web_wizard/apache2.wiz_.c:5 ../web_wizard/web.wiz_.c:5
msgid "Modules :"
msgstr ""
-#: ../web_wizard/web.wiz_.c:6
+#: ../web_wizard/apache2.wiz_.c:6 ../web_wizard/web.wiz_.c:6
msgid "Document root:"
msgstr ""
-#: ../web_wizard/web.wiz_.c:7
+#: ../web_wizard/apache2.wiz_.c:7 ../web_wizard/web.wiz_.c:7
msgid "user http sub-directory : ~/"
msgstr ""
-#: ../web_wizard/web.wiz_.c:9
+#: ../web_wizard/apache2.wiz_.c:9 ../web_wizard/web.wiz_.c:9
msgid "Enable the Web Server for the Intranet"
msgstr ""
-#: ../web_wizard/web.wiz_.c:12
+#: ../web_wizard/apache2.wiz_.c:12 ../web_wizard/web.wiz_.c:12
msgid "Configuring the Web Server"
msgstr ""
-#: ../web_wizard/web.wiz_.c:13
+#: ../web_wizard/apache2.wiz_.c:13 ../web_wizard/web.wiz_.c:13
msgid "Web Server"
msgstr ""
-#: ../web_wizard/web.wiz_.c:14
+#: ../web_wizard/apache2.wiz_.c:14 ../web_wizard/web.wiz_.c:14
msgid "Enable the Web Server for the Internet"
msgstr ""
-#: ../web_wizard/web.wiz_.c:15
+#: ../web_wizard/apache2.wiz_.c:15 ../web_wizard/web.wiz_.c:15
msgid "User directory:"
msgstr ""
-#: ../web_wizard/web.wiz_.c:16
+#: ../web_wizard/apache2.wiz_.c:16 ../web_wizard/web.wiz_.c:16
msgid "This wizard will help you configuring the Web Server for your network."
msgstr ""
-#: ../web_wizard/web.wiz_.c:17
+#: ../web_wizard/apache2.wiz_.c:17 ../web_wizard/web.wiz_.c:17
msgid "Web wizard"
msgstr ""
-#: ../web_wizard/web.wiz_.c:18
+#: ../web_wizard/apache2.wiz_.c:18 ../web_wizard/web.wiz_.c:18
msgid "Intranet web server:"
msgstr ""
-#: ../web_wizard/web.wiz_.c:20
+#: ../web_wizard/apache2.wiz_.c:20 ../web_wizard/web.wiz_.c:20
msgid ""
"Type the name of the directory users should create in their homes (whitout "
"~/) to get it available via http://www.yourserver.com/~user"
msgstr ""
-#: ../web_wizard/web.wiz_.c:25
+#: ../web_wizard/apache2.wiz_.c:25 ../web_wizard/web.wiz_.c:25
msgid "activate user module"
msgstr ""
-#: ../web_wizard/web.wiz_.c:26
+#: ../web_wizard/apache2.wiz_.c:26 ../web_wizard/web.wiz_.c:26
msgid "Don't check any box if you don't want to activate your Web Server."
msgstr ""
-#: ../web_wizard/web.wiz_.c:27
+#: ../web_wizard/apache2.wiz_.c:27 ../web_wizard/web.wiz_.c:27
msgid "Select the kind of Web service you want to activate:"
msgstr ""
-#: ../web_wizard/web.wiz_.c:28
+#: ../web_wizard/apache2.wiz_.c:28 ../web_wizard/web.wiz_.c:28
msgid ""
"The wizard collected the following parameters needed to configure your Web "
"Server"
msgstr ""
-#: ../web_wizard/web.wiz_.c:29
+#: ../web_wizard/apache2.wiz_.c:29 ../web_wizard/web.wiz_.c:29
msgid "The wizard successfully configured your Intranet/Internet Web Server"
msgstr ""
-#: ../web_wizard/web.wiz_.c:30
+#: ../web_wizard/apache2.wiz_.c:30 ../web_wizard/web.wiz_.c:30
msgid "Document Root:"
msgstr ""
-#: ../web_wizard/web.wiz_.c:31
+#: ../web_wizard/apache2.wiz_.c:31 ../web_wizard/web.wiz_.c:31
msgid "Type the path of the directory you want being the document root."
msgstr ""
-#: ../web_wizard/web.wiz_.c:32
+#: ../web_wizard/apache2.wiz_.c:32 ../web_wizard/web.wiz_.c:32
msgid "Web Server Configuration Wizard"
msgstr ""
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>