Attachment 7184 Details for Bug 39405 – Patch to check server/role

Patch to check server/role

file_39405.txt (text/plain), 1.61 KB, created by Philipp Hahn on 2015-09-25 12:21:29 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2015-09-25 12:21:29 CEST

Size: 1.61 KB

patch

obsolete

>diff --git a/branches/ucs-4.0/ucs-4.0-3/management/univention-join/check_join_status.sh b/branches/ucs-4.0/ucs-4.0-3/management/univention-join/check_join_status.sh
>index acb1477..b847156 100755
>--- a/branches/ucs-4.0/ucs-4.0-3/management/univention-join/check_join_status.sh
>+++ b/branches/ucs-4.0/ucs-4.0-3/management/univention-join/check_join_status.sh
>@@ -32,21 +32,31 @@
> 
> LOG_FILE=/var/log/univention/check_join_status.log
> 
>+log () { # log [prefix] message [exit]
>+       local message="${1:+$1: }${2}"
>+       echo "$message"
>+       echo "$message" >>"$LOG_FILE"
>+       [ -n "${3:-}" ] && exit $3
>+}
> log_error () { # Log error message and exit
>-       local message="Error: $@"
>-       echo $message
>-       echo $message >>"$LOG_FILE"
>-       exit 1
>+       log "Error" "$*" 1
> }
> log_warn () { # Log warning message
>-       local message="Warning: $@"
>-       echo $message
>-       echo $message >>"$LOG_FILE"
>+       log "Warning" "$*"
> }
> 
> echo "Start $0 at $(date)" >>"$LOG_FILE"
> eval "$(univention-config-registry shell)"
> 
>+case "${server_role}" in
>+domaincontroller_master) ;;
>+domaincontroller_backup) ;;
>+domaincontroller_slave) ;;
>+memberserver) ;;
>+basesystem) log "OK" "basesystem is stand-alone" 0 ;;
>+*) log_error "Unknown system role: '$server_role'" ;;
>+esac
>+
> if [ ! -e /etc/machine.secret ]; then
>        log_error "/etc/machine.secret not found"
> fi
>@@ -94,7 +104,6 @@ then
>        log_error "Not all install files configured: $MISSING missing"
> fi
> 
>-echo "Joined successfully"
>-echo "Joined successfully" >>"$LOG_FILE"
>+log "" "Joined successfully"
> 
> exit 0

Actions: View

Attachments on bug 39405: 7184