Merge branch 'develop' into dist/eole/2.6.2/develop

This commit is contained in:
wpetit 2019-06-17 17:15:39 +02:00
commit 22525b938a
1 changed files with 7 additions and 12 deletions

View File

@ -42,25 +42,20 @@ function configure_proxy {
function create_app_dir { function create_app_dir {
if [[ ! -d ${APPDIR} ]] mkdir -p "${APPDIR}"
then chown ${USER}:${GROUP} "${APPDIR}" -R
mkdir -p ${APPDIR}
chown ${USER}:${GROUP} ${APPDIR} -R
fi
# Create app structure # Create app structure
mkdir -p ${APPDIR}/{custom,data,indexers,public,log} mkdir -p ${APPDIR}/{custom,data,indexers,public,log}
chown ${USER}:${GROUP} ${APPDIR}/{data,indexers,log} chown ${USER}:${GROUP} ${APPDIR}/{data,indexers,log}
chmod 750 ${APPDIR}/{data,indexers,log} chmod 750 ${APPDIR}/{data,indexers,log}
mkdir -p ${APPCONFDIR} mkdir -p "${APPCONFDIR}"
chown root:${GROUP} ${APPCONFDIR} chown root:${GROUP} ${APPCONFDIR}
chmod 770 ${APPCONFDIR} chmod 770 "${APPCONFDIR}"
mkdir -p "${APPBINDIR}"
chown ${USER}:${GROUP} "${APPBINDIR}"
if [[ ! -d ${APPBINDIR} ]]
then
mkdir -p ${APPBINDIR}
chown ${USER}:${GROUP} ${APPBINDIR}
fi
} }
function create_user_and_group { function create_user_and_group {