Changeset 546

Timestamp:

05/19/08 17:20:08 (7 months ago)

Author:

free

Message:

* Set monit email address properly

Location:

cdd-utils/trunk

Files:

• debian/changelog (modified) (1 diff)
• lib/server.sh (modified) (3 diffs)
• share/monit/global (modified) (1 diff)

cdd-utils/trunk/debian/changelog

@@ -20 +20 @@
   * Encrypt passwords when changing the manager account
   * Added support for setting the hostname
+  * Set monit email address properly
 
  -- Free Ekanayaka <free@64studio.com>  Thu, 08 May 2008 21:55:32 +0200

cdd-utils/trunk/lib/server.sh

@@ -97 +97 @@
 postfix () {
 
+    root="$1"
+    if nullstr "$root"; then warning "No root mail address given"; return; fi
+
     cfg=/etc/postfix/main.cf
     if ! exists $cfg; then warning $cfg not found; return; fi
@@ -111 +114 @@
     add_key $key $sep $cfg
     set_key $key $sep $val $cfg
+
+    cfg=/etc/aliases
+    if ! exists $cfg; then warning $cfg not found; return; fi
+    key="root"
+    sep=":"
+    val=" free@64studio.com"
+    add_key "$key" "$sep" "$cfg"
+    set_key "$key" "$sep" "$val" "$cfg"
 
     cfg=/etc/postfix/master.cf
@@ -376 +387 @@
     if ! exists $cfg; then warning $cfg not found; return; fi
     add_key "include" " " $cfg
-    set_key "include" " " "/usr/share/cdd-utils/monit/*" $cfg
+    set_key "include" " " "/etc/monit/ares" $cfg
+
+    cfg=/etc/monit/ares
+    sed -e "s/%HOST%/$(cat /etc/hostname)/g" /usr/share/cdd-utils/monit/global > $cfg
+    cat /usr/share/cdd-utils/monit/ldap >> $cfg
 }
 

cdd-utils/trunk/share/monit/global

@@ -1 @@
-set alert root
+set alert root@%HOST%
 set logfile syslog facility log_daemon
-set mail-format { from: monit }
+set mail-format { from: monit@%HOST% }