[evolvis-commits] r12448: Adapt packaging to new way of passing auth tokens
mirabilos at evolvis.org
mirabilos at evolvis.org
Mon Feb 28 01:39:07 CET 2011
Author: mirabilos
Date: 2011-02-28 01:39:07 +0100 (Mon, 28 Feb 2011)
New Revision: 12448
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/patches/unix-sockets-for-database.dpatch
Log:
Adapt packaging to new way of passing auth tokens
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-28 00:39:05 UTC (rev 12447)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-28 00:39:07 UTC (rev 12448)
@@ -5,8 +5,11 @@
#475769).
* Removed from gforge-plugins-extra a file that should only be in
gforge-plugin-mediawiki (closes: #476582).
+ * Enabled the "headers" module in apache2, since the database auth
+ tokens are now received through an extra header rather than through
+ environment variables.
- -- Roland Mas <lolando at debian.org> Thu, 24 Apr 2008 20:49:08 +0200
+ -- Roland Mas <lolando at debian.org> Thu, 24 Apr 2008 22:40:40 +0200
gforge (4.6.99+svn6477-1) unstable; urgency=low
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in 2011-02-28 00:39:05 UTC (rev 12447)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in 2011-02-28 00:39:07 UTC (rev 12448)
@@ -82,6 +82,7 @@
DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod ssl || true
DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod env || true
DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod vhost_alias || true
+ DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod headers || true
# Enable the Gforge configuration
if [ -e /etc/apache2/conf.d/gforge.httpd.conf ] ; then
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/patches/unix-sockets-for-database.dpatch
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/patches/unix-sockets-for-database.dpatch 2011-02-28 00:39:05 UTC (rev 12447)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/patches/unix-sockets-for-database.dpatch 2011-02-28 00:39:07 UTC (rev 12448)
@@ -1,19 +1,21 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by Christian Bayle <bayle at debian.org> and/or Roland Mas <lolando at debian.org>
+## unix-sockets-for-database by Roland Mas <lolando at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Use Unix sockets rather than TCP for the database.
@DPATCH@
diff -urNad gforge~/etc/httpd.d/httpd.secrets gforge/etc/httpd.d/httpd.secrets
---- gforge~/etc/httpd.d/httpd.secrets 2007-11-21 15:13:43.000000000 +0100
-+++ gforge/etc/httpd.d/httpd.secrets 2007-11-21 15:15:06.000000000 +0100
-@@ -1,7 +1,7 @@
- # PLEASE DO NOT REMOVE THIS LINE
+--- gforge~/etc/httpd.d/httpd.secrets 2008-04-24 21:19:20.000000000 +0200
++++ gforge/etc/httpd.d/httpd.secrets 2008-04-24 21:31:49.000000000 +0200
+@@ -2,8 +2,8 @@
SetEnv sys_localinc {sys_localinc}
--SetEnv sys_gfdbhost {db_host}
-+# SetEnv sys_gfdbhost {db_host}
- SetEnv sys_gfdbport {db_port}
- SetEnv sys_gfdbname {db_name}
- SetEnv sys_gfdbuser {db_user}
+
+-RequestHeader unset GForgeDbhost
+-RequestHeader append GForgeDbhost {db_host}
++# RequestHeader unset GForgeDbhost
++# RequestHeader append GForgeDbhost {db_host}
+
+ RequestHeader unset GForgeDbport
+ RequestHeader append GForgeDbport {db_port}
More information about the evolvis-commits
mailing list