[Rt-commit] [rtir] 03/05: Rename BlockRemoved template to CountermeasureRemoved

[Shawn Moore]

This is an automated email from the git hooks/post-receive script.

shawn pushed a commit to branch 3.4/countermeasures
in repository rtir.

commit 87b465b204268224b8a85e1786aa4b4b05e863a2
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu Feb 25 00:53:56 2016 +0000

    Rename BlockRemoved template to CountermeasureRemoved
    
        This doesn't handle upgrades yet
---
 docs/AdministrationTutorial.pod | 4 ++--
 etc/initialdata                 | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/AdministrationTutorial.pod b/docs/AdministrationTutorial.pod
index 31b418a..74e874b 100644
--- a/docs/AdministrationTutorial.pod
+++ b/docs/AdministrationTutorial.pod
@@ -264,7 +264,7 @@ Applies to the Countermeasures queue.
 
 When a countermeasure ticket is moved from an active status to an inactive
 status (closed), the requestors on the countermeasure are notified using the
-L<Templates/BlockRemoved in Countermeasure queue> template.
+L<Templates/CountermeasureRemoved in Countermeasure queue> template.
 
 =item SetIPFromContent
 
@@ -314,7 +314,7 @@ how to use these groups.
 
 This template is sent when a countermeasure is created.
 
-=item BlockRemoved in Countermeasure queue
+=item CountermeasureRemoved in Countermeasure queue
 
 This template is sent when a countermeasure is removed.
 
diff --git a/etc/initialdata b/etc/initialdata
index a03c0d5..ab82d1f 100644
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -342,7 +342,7 @@
         Queue          => 'Countermeasures',
         ScripCondition => 'RTIR Close Ticket',
         ScripAction    => 'Notify Requestors',
-        Template       => 'BlockRemoved'
+        Template       => 'CountermeasureRemoved'
     },
 
     {   Description => "SetIPFromContent",
@@ -409,11 +409,11 @@ you may reply to this message.
                         { $Ticket->QueueObj->CorrespondAddress }',
     },
     {   Queue       => 'Countermeasures',
-        Name        => 'BlockRemoved',
-        Description => 'Sent when a block is removed',
+        Name        => 'CountermeasureRemoved',
+        Description => 'Sent when a countermeasure is removed',
         Content     => 'Subject: {$Ticket->Subject}
 
-Block #{$Ticket->id} was removed.
+Countermeasure #{$Ticket->id} was removed.
 
 { my $output = "";
   my @mailfields = ( "IP", "Netmask", "Port", "Where Blocked" );

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.