steve
/
geoserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use more slashes to make script more robust

pull/61/head
Simon Seyock 2024-07-15 14:25:37 +02:00 committed by GitHub
parent c94bd75cac
commit 6a01e65182
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
update_credentials.sh
View File

@ -10,27 +10,27 @@ if [ ${DEBUG} ]; then
fi; fi;
# copy over default security folder to data dir (if not existing) # copy over default security folder to data dir (if not existing)
if [ ! -d "${GEOSERVER_DATA_DIR}security" ]; then if [ ! -d "${GEOSERVER_DATA_DIR}/security" ]; then
cp -r ${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"geoserver/data/security" ${GEOSERVER_DATA_DIR} cp -r ${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security" ${GEOSERVER_DATA_DIR}/
fi fi
GEOSERVER_ADMIN_USER=${GEOSERVER_ADMIN_USER:-admin} GEOSERVER_ADMIN_USER=${GEOSERVER_ADMIN_USER:-admin}
GEOSERVER_ADMIN_PASSWORD=${GEOSERVER_ADMIN_PASSWORD:-geoserver} GEOSERVER_ADMIN_PASSWORD=${GEOSERVER_ADMIN_PASSWORD:-geoserver}
# templates to use as base for replacement # templates to use as base for replacement
USERS_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"geoserver/data/security/usergroup/default/users.xml" USERS_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security/usergroup/default/users.xml"
echo "USING USERS XML ORIGINAL:" $USERS_XML_ORIG echo "USING USERS XML ORIGINAL:" $USERS_XML_ORIG
ROLES_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"geoserver/data/security/role/default/roles.xml" ROLES_XML_ORIG=${CATALINA_HOME}"/webapps/"$APP_PATH_PREFIX"/geoserver/data/security/role/default/roles.xml"
echo "USING ROLES XML ORIGINAL:" $ROLES_XML_ORIG echo "USING ROLES XML ORIGINAL:" $ROLES_XML_ORIG
# final users.xml file GeoServer data dir # final users.xml file GeoServer data dir
USERS_XML=${USERS_XML:-${GEOSERVER_DATA_DIR}security/usergroup/default/users.xml} USERS_XML=${USERS_XML:-${GEOSERVER_DATA_DIR}/security/usergroup/default/users.xml}
echo "SETTING USERS XML:" $USERS_XML echo "SETTING USERS XML:" $USERS_XML
# final roles.xml file GeoServer data dir # final roles.xml file GeoServer data dir
ROLES_XML=${ROLES_XML:-${GEOSERVER_DATA_DIR}security/role/default/roles.xml} ROLES_XML=${ROLES_XML:-${GEOSERVER_DATA_DIR}/security/role/default/roles.xml}
echo "SETTING ROLES XML:" . $ROLES_XML echo "SETTING ROLES XML:" . $ROLES_XML
CLASSPATH=$CATALINA_HOME/webapps/$APP_PATH_PREFIX"geoserver/WEB-INF/lib/" CLASSPATH=$CATALINA_HOME/webapps/$APP_PATH_PREFIX/geoserver/WEB-INF/lib/
# tmp files # tmp files
TMP_USERS=/tmp/users.xml TMP_USERS=/tmp/users.xml