]>
Commit | Line | Data |
---|---|---|
e27d3d4f ER |
1 | --- apache1-mod_rpaf-0.6/gen_tests.sh 2007-12-13 05:40:22.000000000 +0200 |
2 | +++ apache1-mod_rpaf-0.6-tests/gen_tests.sh 2011-12-22 17:22:21.742653887 +0200 | |
3 | @@ -1,23 +1,21 @@ | |
4 | #!/bin/sh | |
5 | PATH=$PATH:/home/thomas/build/apache-dev/bin | |
6 | DIRECTORY=`pwd`/t | |
7 | -HTTPD=`which httpd` | |
8 | -HTTPD2=`which apache2` | |
9 | +HTTPD=`which /usr/sbin/apache 2>/dev/null` | |
10 | +APACHE2=`which /usr/sbin/httpd 2>/dev/null` | |
11 | ||
12 | -cat test-Makefile-template | sed -s "s|\@\@HTTPD\@\@|$HTTPD|" | sed -s "s|\@\@HTTPD2\@\@|$HTTPD2|" > t/Makefile | |
13 | +cat test-Makefile-template | sed -s "s|\@\@HTTPD\@\@|$HTTPD|" | sed -s "s|\@\@HTTPD2\@\@|$APACHE2|" > t/Makefile | |
14 | ||
15 | ||
16 | -if [ "$HTTPD" != "" ]; then | |
17 | +if [ -x "$HTTPD" ]; then | |
18 | echo "Found httpd as $HTTPD" | |
19 | echo "Creating test configuration for apache 1.3.x" | |
20 | echo "in directory $DIRECTORY" | |
21 | cat httpd-rpaf.conf-template | sed -s "s|\@\@DIR\@\@|$DIRECTORY|" > t/httpd-rpaf.conf | |
22 | fi | |
23 | ||
24 | -APACHE2=`which apache2` | |
25 | - | |
26 | -if [ "$APACHE2" != "" ]; then | |
27 | - echo "Found apache2 as $HTTPD" | |
28 | +if [ -x "$APACHE2" ]; then | |
29 | + echo "Found apache2 as $APACHE2" | |
30 | echo "Creating test configuration for apache 2.x.x" | |
31 | echo "in directory $DIRECTORY" | |
32 | cat httpd-rpaf.conf-template-2.0 | sed -s "s|\@\@DIR\@\@|$DIRECTORY|" > t/httpd-rpaf.conf-2.0 | |
33 | --- apache1-mod_rpaf-0.6/httpd-rpaf.conf-template 2008-01-01 05:03:15.000000000 +0200 | |
34 | +++ apache1-mod_rpaf-0.6-tests/httpd-rpaf.conf-template 2011-12-22 17:36:42.348061324 +0200 | |
35 | @@ -1,10 +1,18 @@ | |
36 | ServerType standalone | |
37 | PidFile httpd.pid | |
38 | -Port 2500 | |
39 | -ServerName 127.0.0.1 | |
40 | + | |
41 | +#Port 2500 | |
42 | +#ServerName 127.0.0.1 | |
43 | +Listen 127.0.0.1 2500 | |
44 | + | |
45 | #ServerRoot @@DIR@@ | |
46 | DocumentRoot @@DIR@@/htdocs/ | |
47 | ErrorLog rpaf-error_log | |
48 | +LoadModule alias_module ../modules/mod_alias.so | |
49 | +LoadModule cgi_module ../modules/mod_cgi.so | |
50 | +LoadModule mime_module ../modules/mod_mime.so | |
51 | +LoadModule rewrite_module ../modules/mod_rewrite.so | |
52 | +LoadModule log_config_module ../modules/mod_log_config.so | |
53 | LoadModule rpaf_module ../mod_rpaf.so | |
54 | ScriptAlias /cgi-bin @@DIR@@/htdocs/cgi-bin | |
55 | TypesConfig /dev/null |