From: Roland Häder Date: Sat, 24 Mar 2018 22:16:11 +0000 (+0100) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a810739b04ee6f5c1bad9e9844a3ed510fb0617a;p=jjobs-war.git Please cherry-pick: - used on validator:emailAddressValidator as this allows empty values being ignored - p:growl's autoUpdate and any other is deprecated, better use p:autoUpdate instead (new PrimeFaces 6.2 deprecation fixed) - used $() instead of `` for monitoring script Signed-off-by: Roland Häder --- diff --git a/monitor/monitor-cron.sh b/monitor/monitor-cron.sh index 8596595b..d8449e72 100755 --- a/monitor/monitor-cron.sh +++ b/monitor/monitor-cron.sh @@ -12,7 +12,7 @@ CONFIG_FILE="${HOME}/.monitor-${PROJECT_NAME}-cron.sh" . "${CONFIG_FILE}" || exit 255 -MONITOR_OUTPUT=`lynx -dump -head "${PROJECT_URL}" -auth="${PROJECT_USER}:${PROJECT_PASSWORD}" | head -n 1` +MONITOR_OUTPUT=$(lynx -dump -head "${PROJECT_URL}" -auth="${PROJECT_USER}:${PROJECT_PASSWORD}" | head -n 1) if [ "${MONITOR_OUTPUT}" != "HTTP/1.1 200 OK" ] then @@ -24,7 +24,7 @@ then fi elif [ -f "${MONITOR_TEMP_FILE}" ] then - PREVIOUS_STATUS=`cat "${MONITOR_TEMP_FILE}"` + PREVIOUS_STATUS=$(cat "${MONITOR_TEMP_FILE}") echo "$0: ${PROJECT_NAME} is UP again, old status was: '${PREVIOUS_STATUS}'" rm -f "${MONITOR_TEMP_FILE}" fi diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index bccd00b2..3c397ae5 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -80,7 +80,9 @@ - + + + - + @@ -36,7 +38,7 @@
- +