add profiles/updates

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1638 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-12-05 16:30:36 +00:00
parent c2be92fedf
commit 4f2297f388
2 changed files with 46 additions and 0 deletions

1
profiles/updates/4Q-2009 Normal file
View File

@ -0,0 +1 @@
move net-misc/ifolder net-misc/ifolder3

View File

@ -0,0 +1,45 @@
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]