summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-09-25 18:31:04 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-09-25 18:31:04 +0000
commitb90934a66189adddeec9d1516007c51b985494ba (patch)
treec767f61e409684c235bd6d8f0851a75782f4756f /www-apps
parentAdded to ~ppc (diff)
downloadhistorical-b90934a66189adddeec9d1516007c51b985494ba.tar.gz
historical-b90934a66189adddeec9d1516007c51b985494ba.tar.bz2
historical-b90934a66189adddeec9d1516007c51b985494ba.zip
Fixed autodetection in config.
Package-Manager: portage-2.0.52-r1
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/open-xchange/Manifest8
-rw-r--r--www-apps/open-xchange/open-xchange-0.8.1.2.ebuild14
2 files changed, 11 insertions, 11 deletions
diff --git a/www-apps/open-xchange/Manifest b/www-apps/open-xchange/Manifest
index c773b5bbe808..744d3d6b676b 100644
--- a/www-apps/open-xchange/Manifest
+++ b/www-apps/open-xchange/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 8f171840a34ecf92614bd53fb27b4414 open-xchange-0.8.1.2.ebuild 21691
+MD5 83f86a33d2733c91822242933e7f49cc open-xchange-0.8.1.2.ebuild 21672
MD5 a339b15041bb6d450a7535f3df1fcc4c metadata.xml 247
MD5 c2f6e496321314528148a8c0d02dd66a ChangeLog 890
MD5 2ad5cb7b97eca4314016247cde421449 files/slapd.ox.inc 2019
@@ -13,7 +13,7 @@ MD5 b9bb53f0dd8125a862c1cbc45ab7c06f files/open-xchange-0.8.1.2-login.patch 638
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDNeQ1ArHZZzCEUG0RAkwAAJwOOLUb+rK0iq+eqD3uhwBiR00c0wCggi77
-+WNMtVk0ByXkB/Sm1TT1cN4=
-=bT3V
+iD8DBQFDNu0CArHZZzCEUG0RAhr4AJ49WnP+IgUz9vL12b3huAoR3XDr/wCfcPFT
+pdi2EXxJcvl9qVijkmEQeGo=
+=rc2v
-----END PGP SIGNATURE-----
diff --git a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild b/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
index a46c583b5a9c..e6c7f8af88c2 100644
--- a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
+++ b/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.3 2005/09/24 23:38:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.4 2005/09/25 18:31:04 eradicator Exp $
inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
@@ -376,21 +376,21 @@ pkg_config() {
local OX_ROOTPW=${OX_ROOTPW-"secret"}
# Guess base on the installed config
- if false && [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then
+ if [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then
local temp_var
echo "Installation of OX detected"
temp_var=$(get_oxvar DEFAULT_SQL_HOST)
- [[ -n ${temp_var} ]] && OX_DBHOST==${temp_var}
+ [[ -n ${temp_var} ]] && OX_DBHOST=${temp_var}
temp_var=$(get_oxvar DEFAULT_SQL_DB)
- [[ -n ${temp_var} ]] && OX_DBNAME==${temp_var}
+ [[ -n ${temp_var} ]] && OX_DBNAME=${temp_var}
temp_var=$(get_oxvar DEFAULT_SQL_USER)
- [[ -n ${temp_var} ]] && OX_DBUSER==${temp_var}
+ [[ -n ${temp_var} ]] && OX_DBUSER=${temp_var}
temp_var=$(get_oxvar DEFAULT_SQL_PASS)
- [[ -n ${temp_var} ]] && OX_DBPASS==${temp_var}
+ [[ -n ${temp_var} ]] && OX_DBPASS=${temp_var}
temp_var=$(get_oxvar ORGA)
[[ -n ${temp_var} ]] && OX_ORG=${temp_var}
@@ -399,7 +399,7 @@ pkg_config() {
[[ -n ${temp_var} ]] && OX_ROOTDN=${temp_var}
temp_var=$(get_oxvar BINDPW)
- [[ -n ${temp_var} ]] && OX_ROOTPW=${OX_ROOTPW_TEMP}
+ [[ -n ${temp_var} ]] && OX_ROOTPW=${temp_var}
if [[ -e "${ROOT}/etc/open-xchange/groupware/ldap.conf" ]] ; then
# taken from admintools.conf self