diff --git a/rpms/awips2.core/Installer.database/component.spec b/rpms/awips2.core/Installer.database/component.spec index 86ae2dee8b..51bf9630b0 100644 --- a/rpms/awips2.core/Installer.database/component.spec +++ b/rpms/awips2.core/Installer.database/component.spec @@ -190,7 +190,7 @@ function init_db() mv /awips2/data/postgresql.conf /awips2/ fi - su ${AWIPS_DEFAULT_USER} -c \ + su - ${AWIPS_DEFAULT_USER} -c \ "${POSTGRESQL_INSTALL}/bin/initdb --auth=trust --locale=en_US.UTF-8 --pgdata=${AWIPS2_DATA_DIRECTORY} --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8" RC=$? @@ -204,7 +204,7 @@ function init_db() function control_pg_ctl() { # $1 == pg_ctl command - su ${AWIPS_DEFAULT_USER} -c \ + su - ${AWIPS_DEFAULT_USER} -c \ "${POSTGRESQL_INSTALL}/bin/pg_ctl ${1} -D ${AWIPS2_DATA_DIRECTORY} -o \"-p ${AWIPS_DEFAULT_PORT}\" -w" } @@ -221,7 +221,7 @@ function execute_initial_sql_script() ${1} # $1 == script to execute - su ${AWIPS_DEFAULT_USER} -c \ + su - ${AWIPS_DEFAULT_USER} -c \ "${PSQL_INSTALL}/bin/psql -d postgres -U ${AWIPS_DEFAULT_USER} -q -p ${AWIPS_DEFAULT_PORT} -f ${1}" \ > ${SQL_LOG} 2>&1 } @@ -249,7 +249,7 @@ function execute_psql_sql_script() # $1 == script to execute # $2 == database - su ${AWIPS_DEFAULT_USER} -c \ + su - ${AWIPS_DEFAULT_USER} -c \ "${PSQL_INSTALL}/bin/psql -d ${2} -U ${AWIPS_DEFAULT_DB_ADMIN} -q -p ${AWIPS_DEFAULT_PORT} -f ${1}" \ >> ${SQL_LOG} 2>&1 } @@ -290,18 +290,12 @@ execute_psql_sql_script ${SQL_SHARE_DIR}/fxatext.sql metadata # create the events schema execute_psql_sql_script ${SQL_SHARE_DIR}/createEventsSchema.sql metadata - update_createHMDB -su ${AWIPS_DEFAULT_USER} -c \ +su - ${AWIPS_DEFAULT_USER} -c \ "${SQL_SHARE_DIR}/createHMDB.sh ${PSQL_INSTALL} ${AWIPS_DEFAULT_PORT} ${AWIPS_DEFAULT_DB_ADMIN} ${SQL_SHARE_DIR} ${SQL_LOG}" - update_createEbxml execute_psql_sql_script ${SQL_SHARE_DIR}/createEbxml.sql metadata - -execute_psql_sql_script ${SQL_SHARE_DIR}/alter_database_roles_and_permissions.sh - control_pg_ctl "stop" - copy_addl_config %preun diff --git a/rpms/awips2.core/Installer.localization/component.spec b/rpms/awips2.core/Installer.localization/component.spec index f37f096e8a..d192baf3db 100644 --- a/rpms/awips2.core/Installer.localization/component.spec +++ b/rpms/awips2.core/Installer.localization/component.spec @@ -191,7 +191,7 @@ function prepare() # determine if PostgreSQL is running I_STARTED_POSTGRESQL="NO" echo "Determining if PostgreSQL is running ..." >> ${log_file} - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${a2_pg_ctl} status -D /awips2/data >> ${log_file} 2>&1" RC=$? echo "" >> ${log_file} @@ -201,7 +201,7 @@ function prepare() echo "INFO: PostgreSQL is running." >> ${log_file} else echo "Starting PostgreSQL as User: ${DB_OWNER} ..." >> ${log_file} - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${a2_postmaster} -D /awips2/data >> ${log_file} 2>&1 &" if [ $? -ne 0 ]; then echo "FATAL: Failed to start PostgreSQL." >> ${log_file} @@ -229,7 +229,7 @@ function restartPostgreSQL() DB_OWNER=`ls -l /awips2/ | grep -w 'data' | awk '{print $3}'` echo "Restarting PostgreSQL ..." >> ${log_file} - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${a2_pg_ctl} restart -D /awips2/data" >> ${log_file} sleep 20 echo "PostgreSQL restart complete ..." >> ${log_file} @@ -440,7 +440,7 @@ a2_pg_ctl="/awips2/postgresql/bin/pg_ctl" if [ "${I_STARTED_POSTGRESQL}" = "YES" ]; then echo "" >> ${log_file} - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${a2_pg_ctl} stop -D /awips2/data" >> ${log_file} if [ $? -ne 0 ]; then echo "WARNING: Failed to shutdown PostgreSQL." >> ${log_file}