fix msmoke test config to adapt to changing PG ports;

remove superfluous mods.conf

diff --git a/tests/apache/etc/config.php b/tests/apache/etc/config.php.tmpl
similarity index 99%
rename from tests/apache/etc/config.php
rename to tests/apache/etc/config.php.tmpl
index 66ddce2..d4ff259 100644 (file)
--- a/tests/apache/etc/config.php
+++ b/tests/apache/etc/config.php.tmpl
@@ -16,7 +16,7 @@
 // for more see:
 //  http://www.php.net/manual/en/function.pg-connect.php
 //  http://www.postgresql.org/docs/8.4/interactive/libpq-connect.html
-$db = new PGsqlEngine("dbname='smoke' user='smoke' host='localhost' port='20987'");
+$db = new PGsqlEngine("dbname='smoke' user='smoke' host='localhost' port='@PGPORT@'");
 //set table-prefix (must be non-empty, leave the default if in doubt)
 $db->setPrefix("smoke2_");
 //set this only if you want debug messages on error (developers only):

diff --git a/tests/apache/etc/mods.conf b/tests/apache/etc/mods.conf
deleted file mode 100644 (file)
index 9b5a03e..0000000
--- a/tests/apache/etc/mods.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-LoadModule php5_module /usr/lib/apache2/modules/libphp5.so
-LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
-LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
-LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
-

diff --git a/tests/setup-clean.sh b/tests/setup-clean.sh
index d6b80ae..b9aa510 100755 (executable)
--- a/tests/setup-clean.sh
+++ b/tests/setup-clean.sh
@@ -25,7 +25,7 @@ rm -rf apache/log apache/www
 (
  cd apache/etc
  for i in *.tmpl ; do rm -f ${i%.tmpl} ; done
- rm -f server.*
+ rm -f server.* mods.conf
 )
 
 exit 0

diff --git a/tests/setup-start.sh b/tests/setup-start.sh
index cb51d33..0e17602 100755 (executable)
--- a/tests/setup-start.sh
+++ b/tests/setup-start.sh
@@ -25,7 +25,9 @@ test -f config || {
         cd db/etc
         for i in *.tmpl ; do
                 sed "s,@@,$PG_DD," <$i | \
-                sed "s,@PGPORT@,$PG_PORT," \
+                sed "s,@PGPORT@,$PG_PORT," | \
+                sed "s,@HTTPPORT@,$HTTP_PORT," | \
+                sed "s,@HTTPSPORT@,$HTTPS_PORT," \
                 >${i%.tmpl}
         done
 )
@@ -52,8 +54,9 @@ mkdir -p apache/log
         cd apache/etc
         for i in *.tmpl ; do
                 sed "s,@@,$ADIR," <$i | \
+                sed "s,@PGPORT@,$PG_PORT," | \
                 sed "s,@HTTPPORT@,$HTTP_PORT," | \
-                sed "s,@HTTPSPORT@,$HTTPS_PORT,"  \
+                sed "s,@HTTPSPORT@,$HTTPS_PORT," \
                 >${i%.tmpl}
         done
         ln -sf ../../ssl/server.* . || true