* etc/local.d/10database.header: Read database authentication info
from HTTP headers in addition to environment variables.
+ * plugins/mediawiki/mediawiki-skin/GForge.php: Ditto.
* etc/httpd.d/httpd.secrets: Provide this info using the
RequestHeader directive.
+ * utils/install-apache.sh: Load appropriate module.
2008-03-15 Christian Bayle <bayle@debian.org>
RequestHeader append GForgeDbpasswd {db_password}
RequestHeader unset GForgeLdapPasswd
-RequestHeader append GForgePasswd {ldap_web_add_password}
+RequestHeader append GForgeLdapPasswd {ldap_web_add_password}
RequestHeader unset GForgeJabberPasswd
-RequestHeader append GForgePass {sys_jabber_pass}
+RequestHeader append GForgeJabberPasswd {sys_jabber_pass}
// Databases, html/php/other paths, passwords
if (getenv ('SERVER_SOFTWARE')) { // We're on the web
- $sys_dbhost = $headers['GForgeDbhost'] || getenv('sys_gfdbhost');
- $sys_dbport = $headers['GForgeDbport'] || getenv('sys_gfdbport');
- $sys_dbname = $headers['GForgeDbname'] || getenv('sys_gfdbname');
- $sys_dbuser = $headers['GForgeDbuser'] || getenv('sys_gfdbuser');
- $sys_dbpasswd = $headers['GForgeDbpasswd'] || getenv('sys_gfdbpasswd');
- $sys_ldap_passwd = $headers['GForgeLdapPasswd'] || getenv('sys_gfldap_passwd');
- $sys_jabber_pass = $headers['GForgeJapperPasswd'] || getenv('sys_jabber_pass');
+ $sys_dbhost = $headers['GForgeDbhost'] or getenv('sys_gfdbhost');
+ $sys_dbport = $headers['GForgeDbport'] or getenv('sys_gfdbport');
+ $sys_dbname = $headers['GForgeDbname'] or getenv('sys_gfdbname');
+ $sys_dbuser = $headers['GForgeDbuser'] or getenv('sys_gfdbuser');
+ $sys_dbpasswd = $headers['GForgeDbpasswd'] or getenv('sys_gfdbpasswd');
+ $sys_ldap_passwd = $headers['GForgeLdapPasswd'] or getenv('sys_gfldap_passwd');
+ $sys_jabber_pass = $headers['GForgeJabberPasswd'] or getenv('sys_jabber_pass');
} else {
@include ('database.inc');
}
DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod suexec || true
#not enabling env module, part of base in apache2
DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod vhost_alias || true
+ DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod headers || true
LINK=`ls -l /etc/$flavour/conf.d/gforge.httpd.conf | sed 's/.*-> \(.*\)$/\1/'`
if [ "$LINK" != "$GFORGE_ETC_LIST" ] ; then