summaryrefslogtreecommitdiff
path: root/rt/t/data
diff options
context:
space:
mode:
authorivan <ivan>2010-05-18 18:49:59 +0000
committerivan <ivan>2010-05-18 18:49:59 +0000
commit624b2d44625f69d71175c3348cae635d580c890b (patch)
treeed57a90db2ecbc72cea6c1d3c175c1dcd1938ab4 /rt/t/data
parent7f4aff45cd6ef2f630d538294fa9d9c4db4ac4aa (diff)
parente70abd21bab68b23488f7ef1ee2e693a3b365691 (diff)
This commit was generated by cvs2svn to compensate for changes in r9232,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'rt/t/data')
-rw-r--r--rt/t/data/configs/apache2.2+fastcgi.conf4
-rw-r--r--rt/t/data/configs/apache2.2+fastcgi.conf.in4
-rw-r--r--rt/t/data/configs/apache2.2+mod_perl.conf1
-rw-r--r--rt/t/data/configs/apache2.2+mod_perl.conf.in1
4 files changed, 6 insertions, 4 deletions
diff --git a/rt/t/data/configs/apache2.2+fastcgi.conf b/rt/t/data/configs/apache2.2+fastcgi.conf
index f9b3b1034..c9d9cb0b9 100644
--- a/rt/t/data/configs/apache2.2+fastcgi.conf
+++ b/rt/t/data/configs/apache2.2+fastcgi.conf
@@ -1,11 +1,11 @@
ServerRoot %%SERVER_ROOT%%
PidFile %%PID_FILE%%
+LockFile %%LOCK_FILE%%
ServerAdmin root@localhost
%%LOAD_MODULES%%
-TypesConfig /etc/mime.types
-FastCgiIpcDir /tmp
+FastCgiIpcDir %%TMP_DIR%%
<IfModule !mpm_netware_module>
<IfModule !mpm_winnt_module>
diff --git a/rt/t/data/configs/apache2.2+fastcgi.conf.in b/rt/t/data/configs/apache2.2+fastcgi.conf.in
index c0c01d1a5..75cbadbca 100644
--- a/rt/t/data/configs/apache2.2+fastcgi.conf.in
+++ b/rt/t/data/configs/apache2.2+fastcgi.conf.in
@@ -1,11 +1,11 @@
ServerRoot %%SERVER_ROOT%%
PidFile %%PID_FILE%%
+LockFile %%LOCK_FILE%%
ServerAdmin root@localhost
%%LOAD_MODULES%%
-TypesConfig /etc/mime.types
-FastCgiIpcDir /tmp
+FastCgiIpcDir %%TMP_DIR%%
<IfModule !mpm_netware_module>
<IfModule !mpm_winnt_module>
diff --git a/rt/t/data/configs/apache2.2+mod_perl.conf b/rt/t/data/configs/apache2.2+mod_perl.conf
index 341ae5024..9f4587e04 100644
--- a/rt/t/data/configs/apache2.2+mod_perl.conf
+++ b/rt/t/data/configs/apache2.2+mod_perl.conf
@@ -1,5 +1,6 @@
ServerRoot %%SERVER_ROOT%%
PidFile %%PID_FILE%%
+LockFile %%LOCK_FILE%%
ServerAdmin root@localhost
%%LOAD_MODULES%%
diff --git a/rt/t/data/configs/apache2.2+mod_perl.conf.in b/rt/t/data/configs/apache2.2+mod_perl.conf.in
index ed12c8690..3d28c2cca 100644
--- a/rt/t/data/configs/apache2.2+mod_perl.conf.in
+++ b/rt/t/data/configs/apache2.2+mod_perl.conf.in
@@ -1,5 +1,6 @@
ServerRoot %%SERVER_ROOT%%
PidFile %%PID_FILE%%
+LockFile %%LOCK_FILE%%
ServerAdmin root@localhost
%%LOAD_MODULES%%