From 2a1216e9fd5bd4be1a7a5ce0799738de8db13fa9 Mon Sep 17 00:00:00 2001
From: Antoine Durand-Gasselin <adg@crans.org>
Date: Thu, 26 Feb 2009 08:06:44 +0100
Subject: [PATCH] [munin/audimat,tv,conficker] modifications mineures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

non commitées

darcs-hash:20090226070644-bd074-fb6d9810a8b61b395dda719f78ef2e1fe5a64d83.gz
---
 munin/audimat             | 2 +-
 surveillance/conficker.sh | 2 +-
 tv/launch_sat.py          | 2 +-
 tv/vignettes/vignettes.py | 9 +++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/munin/audimat b/munin/audimat
index 773f058f..fad5d707 100755
--- a/munin/audimat
+++ b/munin/audimat
@@ -53,7 +53,7 @@ if 'config' in sys.argv :
     chaines.sort()
     for nom in chaines :
         if not nom : continue
-        nom1 = nom.replace(' ','_')
+        nom1 = nom.replace(' ','_').replace("'", '')
         print "%s.label %s" % (nom1, nom)
         if inc == 0 :
             print "%s.draw AREA" % nom1
diff --git a/surveillance/conficker.sh b/surveillance/conficker.sh
index fe8b1cde..29b4c8a5 100755
--- a/surveillance/conficker.sh
+++ b/surveillance/conficker.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Script de détection des machines infectées par Conficker
-# Copyright (c) 2008 Michel Blockelet <blockelet@crans.org>
+# Copyright (c) 2009 Michel Blockelet <blockelet@crans.org>
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tv/launch_sat.py b/tv/launch_sat.py
index 52f2a594..382a639a 100755
--- a/tv/launch_sat.py
+++ b/tv/launch_sat.py
@@ -83,7 +83,7 @@ except :
     cartes = range(6)
     if verbose > 2 :
         print "Mode debug non permis avec le lancement automatique"
-        verbose = 2
+        verbose = 3
 
 if args[0] in  ( 'start', 'restart' ) :
     if cartes == range(6) :
diff --git a/tv/vignettes/vignettes.py b/tv/vignettes/vignettes.py
index 07af2b76..2199e4a8 100755
--- a/tv/vignettes/vignettes.py
+++ b/tv/vignettes/vignettes.py
@@ -67,10 +67,12 @@ def vignettes() :
     chaines_sap = open('/tmp/chaines_recup_sap.txt','r').readlines()
     chaines_sap_sort = open('%s/chaines_recup_sap_triees.txt' % tmp_dir, 'w' )
     chaines_sap.sort()
+    for line in chaines_sap :
+        chaines_sap_sort.write(line.replace('\'',''))
+    chaines_sap_sort.close()
 
     for line in chaines_sap :
         
-        chaines_sap_sort.write(line)
         line = line.strip()
         nom = line.split(':')[0]
         ip = line.split(':')[-1]
@@ -163,9 +165,8 @@ def vignettes() :
     html.close()
     html_petites.write(trame_piedpage)
     html_petites.close()
-    shutil.move('%s/vignettes.html' % (tmp_dir),'%s/vignettes.html' % (www_dir))
-    shutil.move('%s/vignettes_petites.html' % (tmp_dir),'%s/vignettes_petites.html' % (www_dir))
-    chaines_sap_sort.close()
+    shutil.copy('%s/vignettes.html' % tmp_dir,'%s/vignettes.html' % www_dir)
+    shutil.copy('%s/vignettes_petites.html' % tmp_dir,'%s/vignettes_petites.html' % www_dir)
 
 
 if __name__ == '__main__' :