|
Lines 132-138
Link Here
|
| 132 |
|
132 |
|
| 133 |
myconf="${myconf} --with-servletdir=${SERVLETDIR}" |
133 |
myconf="${myconf} --with-servletdir=${SERVLETDIR}" |
| 134 |
|
134 |
|
| 135 |
if has_version '>=www-servers/tomcat-5.0.28-r4' ; then |
135 |
#servlet-api 2.4 is already provided with tomcat 5 |
|
|
136 |
if has_version '>=www-servers/tomcat-5' ; then |
| 136 |
myconf="${myconf} --with-jsdkjar=${TOMCAT_DIR}/common/lib/servlet-api.jar" |
137 |
myconf="${myconf} --with-jsdkjar=${TOMCAT_DIR}/common/lib/servlet-api.jar" |
| 137 |
else |
138 |
else |
| 138 |
myconf="${myconf} --with-jsdkjar=/usr/share/servletapi-2.4/lib/servlet-api.jar" |
139 |
myconf="${myconf} --with-jsdkjar=/usr/share/servletapi-2.4/lib/servlet-api.jar" |
|
Lines 376-396
Link Here
|
| 376 |
local OX_ROOTPW=${OX_ROOTPW-"secret"} |
377 |
local OX_ROOTPW=${OX_ROOTPW-"secret"} |
| 377 |
|
378 |
|
| 378 |
# Guess base on the installed config |
379 |
# Guess base on the installed config |
| 379 |
if false && [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then |
380 |
if [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then |
| 380 |
local temp_var |
381 |
local temp_var |
| 381 |
echo "Installation of OX detected" |
382 |
echo "Installation of OX detected" |
| 382 |
|
383 |
|
| 383 |
temp_var=$(get_oxvar DEFAULT_SQL_HOST) |
384 |
temp_var=$(get_oxvar DEFAULT_SQL_HOST) |
| 384 |
[[ -n ${temp_var} ]] && OX_DBHOST==${temp_var} |
385 |
[[ -n ${temp_var} ]] && OX_DBHOST=${temp_var} |
| 385 |
|
386 |
|
| 386 |
temp_var=$(get_oxvar DEFAULT_SQL_DB) |
387 |
temp_var=$(get_oxvar DEFAULT_SQL_DB) |
| 387 |
[[ -n ${temp_var} ]] && OX_DBNAME==${temp_var} |
388 |
[[ -n ${temp_var} ]] && OX_DBNAME=${temp_var} |
| 388 |
|
389 |
|
| 389 |
temp_var=$(get_oxvar DEFAULT_SQL_USER) |
390 |
temp_var=$(get_oxvar DEFAULT_SQL_USER) |
| 390 |
[[ -n ${temp_var} ]] && OX_DBUSER==${temp_var} |
391 |
[[ -n ${temp_var} ]] && OX_DBUSER=${temp_var} |
| 391 |
|
392 |
|
| 392 |
temp_var=$(get_oxvar DEFAULT_SQL_PASS) |
393 |
temp_var=$(get_oxvar DEFAULT_SQL_PASS) |
| 393 |
[[ -n ${temp_var} ]] && OX_DBPASS==${temp_var} |
394 |
[[ -n ${temp_var} ]] && OX_DBPASS=${temp_var} |
| 394 |
|
395 |
|
| 395 |
temp_var=$(get_oxvar ORGA) |
396 |
temp_var=$(get_oxvar ORGA) |
| 396 |
[[ -n ${temp_var} ]] && OX_ORG=${temp_var} |
397 |
[[ -n ${temp_var} ]] && OX_ORG=${temp_var} |
|
Lines 399-405
Link Here
|
| 399 |
[[ -n ${temp_var} ]] && OX_ROOTDN=${temp_var} |
400 |
[[ -n ${temp_var} ]] && OX_ROOTDN=${temp_var} |
| 400 |
|
401 |
|
| 401 |
temp_var=$(get_oxvar BINDPW) |
402 |
temp_var=$(get_oxvar BINDPW) |
| 402 |
[[ -n ${temp_var} ]] && OX_ROOTPW=${OX_ROOTPW_TEMP} |
403 |
[[ -n ${temp_var} ]] && OX_ROOTPW=${temp_var} |
| 403 |
|
404 |
|
| 404 |
if [[ -e "${ROOT}/etc/open-xchange/groupware/ldap.conf" ]] ; then |
405 |
if [[ -e "${ROOT}/etc/open-xchange/groupware/ldap.conf" ]] ; then |
| 405 |
# taken from admintools.conf self |
406 |
# taken from admintools.conf self |
