aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-05-16 23:12:29 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-05-16 23:12:29 +0200
commit56d6e6f19f35fc732837319106b875436680dac6 (patch)
treeb79894e6c9b16fd41d4c96962213f87d42e09801
parent8cfbe9bb24a2892a95b3813eb4cd8d22876e69df (diff)
Prevent loading brep module multiple times
-rw-r--r--INSTALL4
-rw-r--r--INSTALL-DEV4
-rw-r--r--etc/brep-apache2.conf6
3 files changed, 10 insertions, 4 deletions
diff --git a/INSTALL b/INSTALL
index 79851eb..95bc835 100644
--- a/INSTALL
+++ b/INSTALL
@@ -147,7 +147,9 @@ can also find this fragment in install/share/brep/etc/brep-apache2.conf):
# Load the brep module.
#
- LoadModule brep_module /home/brep/install/libexec/brep/mod_brep.so
+ <IfModule !brep_module>
+ LoadModule brep_module /home/brep/install/libexec/brep/mod_brep.so
+ </IfModule>
# Repository root. This is the part of the URL between the host name
# and the start of the repository. For example, root value /pkg means
diff --git a/INSTALL-DEV b/INSTALL-DEV
index d9eef3b..751237b 100644
--- a/INSTALL-DEV
+++ b/INSTALL-DEV
@@ -66,7 +66,9 @@ replacing <BREP-OUT-ROOT> and <BREP-SRC-ROOT> with the actual absolute paths
# Load the brep module.
#
- LoadModule brep_module <BREP-OUT-ROOT>/mod/mod_brep.so
+ <IfModule !brep_module>
+ LoadModule brep_module <BREP-OUT-ROOT>/mod/mod_brep.so
+ </IfModule>
# Repository root. Use / for web server root. And don't forget to also
# update the Location and Alias directives below.
diff --git a/etc/brep-apache2.conf b/etc/brep-apache2.conf
index f783e35..d26da27 100644
--- a/etc/brep-apache2.conf
+++ b/etc/brep-apache2.conf
@@ -1,10 +1,12 @@
# Paste the following fragment into your <VirtualHost> section (it is the same
# as what you find in the INSTALL file).
#
-
+
# Load the brep module.
#
- LoadModule brep_module /home/brep/install/libexec/brep/mod_brep.so
+ </IfModule>
+ LoadModule brep_module /home/brep/install/libexec/brep/mod_brep.so
+ </IfModule>
# Repository root. This is the part of the URL between the host name
# and the start of the repository. For example, root value /pkg means