f7526328cb
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1641 6952d904-891a-0410-993b-d76249ca496b
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
Index: configure.in
|
|
===================================================================
|
|
--- configure.in (revision 7152)
|
|
+++ configure.in (working copy)
|
|
@@ -720,6 +720,10 @@
|
|
if test -e "/etc/httpd/mod_mono.conf"; then
|
|
MODMONO_CONFPATH="/etc/httpd/mod_mono.conf"
|
|
fi
|
|
+# to work with apache2 the debian way:
|
|
+if test -e "/etc/apache2/mods-available/mod_mono.conf"; then
|
|
+ MODMONO_CONFPATH="/etc/apache2/mods-enabled/mod_mono.conf"
|
|
+fi
|
|
|
|
AC_SUBST(MODMONO_CONFPATH)
|
|
|
|
Index: src/setup/apache/default/ifolder_admin.conf.in
|
|
===================================================================
|
|
--- src/setup/apache/default/ifolder_admin.conf.in (revision 7152)
|
|
+++ src/setup/apache/default/ifolder_admin.conf.in (working copy)
|
|
@@ -11,7 +11,9 @@
|
|
</Location>
|
|
|
|
#Remove comments below this line to enable SSL
|
|
-#LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
|
+#<IfModule !rewrite_module>
|
|
+# LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
|
+#</IfModule>
|
|
#RewriteEngine On
|
|
#RewriteCond %{HTTPS} !=on
|
|
#RewriteRule ^/ifolder/(.*) https://%{SERVER_NAME}/ifolder/$1 [R,L]
|
|
Index: src/setup/apache/default/ifolder_webaccess.conf.in
|
|
===================================================================
|
|
--- src/setup/apache/default/ifolder_webaccess.conf.in (revision 7152)
|
|
+++ src/setup/apache/default/ifolder_webaccess.conf.in (working copy)
|
|
@@ -11,7 +11,9 @@
|
|
</Location>
|
|
|
|
#Remove comments below this line to enable SSL
|
|
-#LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
|
+#<IfModule !rewrite_module>
|
|
+# LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
|
+#</IfModule>
|
|
#RewriteEngine On
|
|
#RewriteCond %{HTTPS} !=on
|
|
#RewriteRule ^/ifolder/(.*) https://%{SERVER_NAME}/ifolder/$1 [R,L]
|