changed the hard-coding of postgresql 8.1 to hard-coding of "8.1 or 8.2"

This commit is contained in:
fgerlits 2007-09-20 10:24:42 +00:00
parent 455a202ff7
commit 11e0d72035
3 changed files with 37 additions and 11 deletions

View File

@ -18,14 +18,27 @@ set -e
#
installdir=/opt/campcaster
apache_docroot=/var/www
apache_group=www-data
if [ -d /etc/postgresql/8.1 ]; then
postgresql_dir=/etc/postgresql/8.1/main
postgresql_init_script=/etc/init.d/postgresql-8.1
elif [ -d /etc/postgresql/8.2 ]; then
postgresql_dir=/etc/postgresql/8.2/main
postgresql_init_script=/etc/init.d/postgresql-8.2
else
echo "no postgresql 8.1 or 8.2 found" >&2
exit 1
fi
case "$1" in
configure)
# do post-installation configuration
$installdir/bin/postInstallStation.sh --directory=$installdir \
--apache-group=www-data \
--postgresql-dir=/etc/postgresql/8.1/main \
--postgresql-init-script=/etc/init.d/postgresql-8.1
--apache-group=$apache_group \
--postgresql-dir=$postgresql_dir \
--postgresql-init-script=$postgresql_init_script
# remount the NFS share if we have a 2-computer setup
if [ -f $installdir/storageServer.wasMounted ]; then

View File

@ -18,13 +18,19 @@ set -e
# the debian-policy package
installdir=/opt/campcaster
apache_docroot=/var/www
if [ -f /etc/postgresql/8.1 ]; then
postgresql_dir=/etc/postgresql/8.1/main
postgresql_init_script=/etc/init.d/postgresql-8.1
elif [ -f /etc/postgresql/8.2 ]; then
postgresql_dir=/etc/postgresql/8.2/main
postgresql_init_script=/etc/init.d/postgresql-8.2
else
echo "no postgresql 8.1 or 8.2 found" >&2
exit 1
fi
postgres_user=postgres
postgresql_dir=/etc/postgresql/8.1/main
postgresql_init_script=/etc/init.d/postgresql-8.1
ls_dbserver=localhost
ls_database=Campcaster
ls_dbuser=campcaster

View File

@ -18,12 +18,19 @@ set -e
installdir=/opt/campcaster
apache_docroot=/var/www
apache_group=www-data
postgres_user=postgres
postgresql_dir=/etc/postgresql/8.1/main
postgresql_init_script=/etc/init.d/postgresql-8.1
if [ -d /etc/postgresql/8.1 ]; then
postgresql_dir=/etc/postgresql/8.1/main
postgresql_init_script=/etc/init.d/postgresql-8.1
elif [ -d /etc/postgresql/8.2 ]; then
postgresql_dir=/etc/postgresql/8.2/main
postgresql_init_script=/etc/init.d/postgresql-8.2
else
echo "no postgresql 8.1 or 8.2 found" >&2
exit 1
fi
ls_dbserver=localhost
ls_database=Campcaster
ls_dbuser=campcaster