Revision d0220d51

b/snf-ganeti-tools/conf/init.d/snf-ganeti-eventd
28 28

  
29 29
. /lib/lsb/init-functions
30 30

  
31
if [ -s $SNF_EVENTD_DEFAULTS_FILE ]; then
32
    . $SNF_EVENTD_DEFAULTS_FILE
31
if [ -s $SNF_EVENTD_DEFAULTS ]; then
32
    . $SNF_EVENTD_DEFAULTS
33 33
fi
34 34

  
35 35
export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
......
60 60

  
61 61
case "$1" in
62 62
  start)
63
	if [ "x$MASTER" != x$HOST ] ; then
64
	    log_warning_msg "snf-ganeti-eventd should run on the ganeti master only, aborting"
65
	    log_end_msg 0
66
	    exit 0
67
	fi
63
        if [ "x$MASTER" != x$HOST ]; then
64
            log_warning_msg "snf-ganeti-eventd should run on the ganeti master only, aborting"
65
      	    log_end_msg 0
66
    	    exit 0
67
     	fi
68 68

  
69 69
        if "$SNF_EVENTD_ENABLE"; then
70 70
            log_daemon_msg "Starting snf-ganeti-eventd daemon" "snf-ganeti-eventd"
......
75 75
            fi
76 76
            eventd_start
77 77
        else
78
            if [ -s "$SNF_EVENTD_CONFIG_FILE" ]; then
79
                [ "$VERBOSE" != no ] && log_warning_msg "snf-ganeti-eventd daemon not enabled in $SNF_EVENTD_DEFAULTS_FILE, not starting..."
78
            if [ -s "$SNF_EVENTD_DEFAULTS" ]; then
79
                [ "$VERBOSE" != no ] && log_warning_msg "snf-ganeti-eventd daemon not enabled in $SNF_EVENTD_DEFAULTS, not starting..."
80 80
            fi
81 81
        fi
82 82
        ;;
......
99 99
            fi
100 100
            eventd_start
101 101
        else
102
            if [ -s "$SNF_EVENTD_CONFIG_FILE" ]; then
103
                [ "$VERBOSE" != no ] && log_warning_msg "snf-ganeti-eventd daemon not enabled in $SNF_EVENTD_DEFAULTS_FILE, not starting..."
102
            if [ -s "$SNF_EVENTD_DEFAULTS" ]; then
103
                [ "$VERBOSE" != no ] && log_warning_msg "snf-ganeti-eventd daemon not enabled in $SNF_EVENTD_DEFAULTS, not starting..."
104 104
            fi
105 105
        fi
106 106
        ;;

Also available in: Unified diff