[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[5485] ipcop/trunk
From:       dotzball () users ! sourceforge ! net
Date:       2011-02-23 6:41:55
Message-ID: E1Ps8Q7-0000ab-9K () sfp-svn-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 5485
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5485&view=rev
Author:   dotzball
Date:     2011-02-23 06:41:55 +0000 (Wed, 23 Feb 2011)

Log Message:
-----------
Rename warn (traffic) template.

Modified Paths:
--------------
    ipcop/trunk/src/scripts/monitorTraffic.pl
    ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18

Added Paths:
-----------
    ipcop/trunk/config/cfgroot/templates/warn-traffic.en.tpl

Removed Paths:
-------------
    ipcop/trunk/config/cfgroot/templates/warn.en.tpl

Copied: ipcop/trunk/config/cfgroot/templates/warn-traffic.en.tpl (from rev 5479, \
ipcop/trunk/config/cfgroot/templates/warn.en.tpl) \
                ===================================================================
--- ipcop/trunk/config/cfgroot/templates/warn-traffic.en.tpl	                        \
                (rev 0)
+++ ipcop/trunk/config/cfgroot/templates/warn-traffic.en.tpl	2011-02-23 06:41:55 UTC \
(rev 5485) @@ -0,0 +1,12 @@
+The traffic on your IPCop __HOSTNAME__ has reached the selected warnlevel!
+
+This period total volume:          __CALC_VOLUME_TOTAL__ MB (__CALC_PERCENT_TOTAL__ \
%) +This period in volume:             __CALC_VOLUME_IN__ MB (__CALC_PERCENT_IN__ %)
+This period out volume:            __CALC_VOLUME_OUT__ MB (__CALC_PERCENT_OUT__ %)
+Maximum total volume per period:   __VOLUME_TOTAL__ MB
+Maximum in volume per period:      __VOLUME_IN__ MB
+Maximum out volume per period:     __VOLUME_OUT__ MB
+
+Startday of period is:    __STARTDAY__
+
+Current date is:          __CURRENT_DATE__

Deleted: ipcop/trunk/config/cfgroot/templates/warn.en.tpl
===================================================================
--- ipcop/trunk/config/cfgroot/templates/warn.en.tpl	2011-02-23 06:36:52 UTC (rev \
                5484)
+++ ipcop/trunk/config/cfgroot/templates/warn.en.tpl	2011-02-23 06:41:55 UTC (rev \
5485) @@ -1,12 +0,0 @@
-The traffic on your IPCop __HOSTNAME__ has reached the selected warnlevel!
-
-This period total volume:          __CALC_VOLUME_TOTAL__ MB (__CALC_PERCENT_TOTAL__ \
                %)
-This period in volume:             __CALC_VOLUME_IN__ MB (__CALC_PERCENT_IN__ %)
-This period out volume:            __CALC_VOLUME_OUT__ MB (__CALC_PERCENT_OUT__ %)
-Maximum total volume per period:   __VOLUME_TOTAL__ MB
-Maximum in volume per period:      __VOLUME_IN__ MB
-Maximum out volume per period:     __VOLUME_OUT__ MB
-
-Startday of period is:    __STARTDAY__
-
-Current date is:          __CURRENT_DATE__

Modified: ipcop/trunk/src/scripts/monitorTraffic.pl
===================================================================
--- ipcop/trunk/src/scripts/monitorTraffic.pl	2011-02-23 06:36:52 UTC (rev 5484)
+++ ipcop/trunk/src/scripts/monitorTraffic.pl	2011-02-23 06:41:55 UTC (rev 5485)
@@ -176,7 +176,7 @@
 
 sub sendWarnEmail
 {
-    my $template = "/var/ipcop/email/templates/warn";
+    my $template = "/var/ipcop/email/templates/warn-traffic";
 
     if(-e "$template.${Lang::language}.tpl") {
         $template .= ".${Lang::language}.tpl";

Modified: ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18
===================================================================
--- ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18	2011-02-23 06:36:52 UTC (rev \
                5484)
+++ ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18	2011-02-23 06:41:55 UTC (rev \
5485) @@ -120,7 +120,7 @@
 /usr/share/locale/zh_CN/LC_MESSAGES/ipcop.mo
 /usr/share/locale/zh_TW/LC_MESSAGES/ipcop.mo
 /var/ipcop/email/templates/test.en.tpl
-/var/ipcop/email/templates/warn.en.tpl
+/var/ipcop/email/templates/warn-traffic.en.tpl
 ##
 ## IPCop, add Russian language for setup
 /usr/share/kbd/consolefonts/koi8u_8x16.psfu.gz


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in 
Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business 
insights. http://p.sf.net/sfu/splunk-dev2dev 
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]