Merge branch 'awl_appuser-awl_dbauser' into 'master'

Allow user to define awl_appuser and awl_dbauser on create-database script

See merge request davical-project/davical!48
This commit is contained in:
Florian Schlichting 2018-04-25 16:25:06 +00:00
commit 5801916722
2 changed files with 4 additions and 4 deletions

View File

@ -35,8 +35,8 @@ if [ -z "${AWLDIR}" ] ; then
exit 1
fi
export AWL_DBAUSER=davical_dba
export AWL_APPUSER=davical_app
AWL_DBAUSER="${3:-davical_dba}"
AWL_APPUSER="${4:-davical_app}"
# set -x

View File

@ -24,8 +24,8 @@ if EXIST %AWLDIR%\awl-tables.sql (
)
rem Set DB user, web user, DB config directory, Windows DB config directory
set AWL_DBAUSER=davical_dba
set AWL_APPUSER=davical_app
set AWL_DBAUSER=%3-davical_dba
set AWL_APPUSER=%4-davical_app
set DBA=%AWL_DBAUSER%
rem Need PostgreSQL location