Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more installation fixes; part of #1775

Browse source
This commit is contained in:
fgerlits 2006-09-04 19:49:06 +00:00
parent 33008a73df
commit eb9841f73d
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
livesupport/bin/postInstallStation.sh
View file

@ -64,10 +64,10 @@ printUsage()
echo " database. [default: livesupport]"; echo " database. [default: livesupport]";
echo " -w, --dbpassword The database user password."; echo " -w, --dbpassword The database user password.";
echo " [default: livesupport]"; echo " [default: livesupport]";
echo " -p, --postgresql-dir The postgresql data directory, containing" echo " -p, --postgresql-dir The postgresql data directory, containing";
echo " pg_hba.conf [default: /etc/postgresql]" echo " pg_hba.conf [default: /etc/postgresql]";
echo " -i, --postgresql-init-script The name of the postgresql init echo " -i, --postgresql-init-script The name of the postgresql init";
echo " script in /etc/init.d [default: postgresql]" echo " script [default: /etc/init.d/postgresql]";
echo " -h, --help Print this message and exit."; echo " -h, --help Print this message and exit.";
echo ""; echo "";
} }
@ -153,7 +153,7 @@ if [ "x$postgresql_dir" == "x" ]; then
fi fi
if [ "x$postgresql_init_script" == "x" ]; then if [ "x$postgresql_init_script" == "x" ]; then
postgresql_init_script=postgresql; postgresql_init_script=/etc/init.d/postgresql;
fi fi
if [ "x$www_root" == "x" ]; then if [ "x$www_root" == "x" ]; then
@ -172,6 +172,7 @@ echo " database user password: $dbpassword";
echo " apache daemon group: $apache_group"; echo " apache daemon group: $apache_group";
echo " apache document root: $www_root"; echo " apache document root: $www_root";
echo " postgresql data directory: $postgresql_dir"; echo " postgresql data directory: $postgresql_dir";
echo " postgresql init script: $postgresql_init_script";
echo "" echo ""
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -261,8 +262,8 @@ chown root:$postgres_user $pg_config_dir/$pg_config_file
# don't use restart for the init script, as it might return prematurely # don't use restart for the init script, as it might return prematurely
# and in the later call to psql we wouldn't be able to connect # and in the later call to psql we wouldn't be able to connect
/etc/init.d/${postgresql_init_script} stop ${postgresql_init_script} stop
/etc/init.d/${postgresql_init_script} start ${postgresql_init_script} start
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -323,7 +324,7 @@ odbc_template_tmp=/tmp/odbc_template.$$
# check for an existing PostgreSQL ODBC driver, and only install if necessary # check for an existing PostgreSQL ODBC driver, and only install if necessary
odbcinst_res=`odbcinst -q -d | grep "\[PostgreSQL\]"` odbcinst_res=`odbcinst -q -d | grep "\[PostgreSQL\]"`
if [ "x$odbcinst_template" != "x" && "x$odbcinst_res" == "x" ]; then if [ "x$odbcinst_template" != "x" ] && [ "x$odbcinst_res" == "x" ]; then
echo "Registering ODBC PostgreSQL driver..."; echo "Registering ODBC PostgreSQL driver...";
odbcinst -i -d -v -f $odbcinst_template || exit 1; odbcinst -i -d -v -f $odbcinst_template || exit 1;
fi fi