Skip to content
Snippets Groups Projects
Commit 4304966a authored by sveseli's avatar sveseli
Browse files

resolved password issues with old scripts

parent 21fa7aed
No related branches found
No related tags found
No related merge requests found
...@@ -13,6 +13,7 @@ MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd` ...@@ -13,6 +13,7 @@ MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
if [ -z "${DM_ROOT_DIR}" ]; then if [ -z "${DM_ROOT_DIR}" ]; then
DM_ROOT_DIR=$MY_DIR/.. DM_ROOT_DIR=$MY_DIR/..
fi fi
DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh
if [ ! -f ${DM_ENV_FILE} ]; then if [ ! -f ${DM_ENV_FILE} ]; then
echo "Environment file ${DM_ENV_FILE} does not exist." echo "Environment file ${DM_ENV_FILE} does not exist."
...@@ -56,6 +57,12 @@ DM_DOMAIN=domain1 ...@@ -56,6 +57,12 @@ DM_DOMAIN=domain1
echo "Copying db driver" echo "Copying db driver"
rsync -ar $DM_ROOT_DIR/src/java/DmWebPortal/lib/postgresql-9.3-1102.jdbc41.jar $GLASSFISH_DIR/glassfish/domains/${DM_DOMAIN}/lib/ext rsync -ar $DM_ROOT_DIR/src/java/DmWebPortal/lib/postgresql-9.3-1102.jdbc41.jar $GLASSFISH_DIR/glassfish/domains/${DM_DOMAIN}/lib/ext
# Check password from file
passwordFile=$DM_INSTALL_DIR/etc/$DM_DB_NAME.db.passwd
if [ -f $passwordFile ]; then
DM_DB_PASSWORD=`cat $passwordFile`
fi
# restart server # restart server
echo "Restarting glassfish" echo "Restarting glassfish"
$ASADMIN_CMD stop-domain ${DM_DOMAIN} $ASADMIN_CMD stop-domain ${DM_DOMAIN}
......
...@@ -27,7 +27,9 @@ cd $CURRENT_DIR ...@@ -27,7 +27,9 @@ cd $CURRENT_DIR
if [ -z "${DM_ROOT_DIR}" ]; then if [ -z "${DM_ROOT_DIR}" ]; then
DM_ROOT_DIR=$MY_DIR/.. DM_ROOT_DIR=$MY_DIR/..
fi fi
DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
DM_SQL_DIR=$DM_ROOT_DIR/db DM_SQL_DIR=$DM_ROOT_DIR/db
DM_ETC_DIR=$DM_INSTALL_DIR/etc
DM_RUN_DIR=$DM_INSTALL_DIR/var/run DM_RUN_DIR=$DM_INSTALL_DIR/var/run
DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh
if [ ! -f ${DM_ENV_FILE} ]; then if [ ! -f ${DM_ENV_FILE} ]; then
...@@ -169,6 +171,13 @@ echo "Creating $DM_DB_USER" ...@@ -169,6 +171,13 @@ echo "Creating $DM_DB_USER"
createDbUser $DM_DB_USER -E -d || exit 1 createDbUser $DM_DB_USER -E -d || exit 1
modifyDbUserPassword $DM_DB_USER $DM_DB_USER_PASSWORD || exit 1 modifyDbUserPassword $DM_DB_USER $DM_DB_USER_PASSWORD || exit 1
# Create db password file
mkdir -p $DM_ETC_DIR
mkdir -p $DM_RUN_DIR
passwordFile=$DM_ETC_DIR/$DM_DB_NAME.db.passwd
echo $DM_DB_USER_PASSWORD > $passwordFile
chmod 600 $passwordFile
# Create db # Create db
echo "Creating database: $DM_DB_NAME" echo "Creating database: $DM_DB_NAME"
createDb || exit 1 createDb || exit 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment