From c54f2669d821a9c18f6cc4c3daad3e37a2fef89d Mon Sep 17 00:00:00 2001
From: Jeremie Dimino <dimino@crans.org>
Date: Sun, 9 Dec 2007 03:49:39 +0100
Subject: [PATCH] Execfile plutot que import

On utilise execfile pour avoir acces a l'environmement, notamment a metadata.

darcs-hash:20071209024939-af139-376cff9921a7abca0f1d05e101fa21f6be9bee91.gz
---
 etc/genshi/secrets.txt | 8 +++-----
 etc/genshi/utils.py    | 3 +++
 etc/genshi/utils.txt   | 7 +------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/etc/genshi/secrets.txt b/etc/genshi/secrets.txt
index 1335768..cc8b516 100644
--- a/etc/genshi/secrets.txt
+++ b/etc/genshi/secrets.txt
@@ -1,6 +1,4 @@
-{# Recuperation des mots de passe #}
+{# Recuperation des mots de passe #}\
 {% python
-    import os
-    os.sys.append('/usr/script/gestion')
-    import secrets
-%}
+    execfile('/etc/crans/secrets/secrets.py')
+%}\
diff --git a/etc/genshi/utils.py b/etc/genshi/utils.py
index 1311ed8..25577d6 100644
--- a/etc/genshi/utils.py
+++ b/etc/genshi/utils.py
@@ -31,6 +31,9 @@ pubhostname = hostname + ".crans.org"
 # Le nom d'hote sur le vlan
 admhostname = hostname + ".adm.crans.org"
 
+def has(group):
+    return group in metadata.groups
+
 def yesno(b):
     if b:
         return "yes"
diff --git a/etc/genshi/utils.txt b/etc/genshi/utils.txt
index 40c6d58..c1b0008 100644
--- a/etc/genshi/utils.txt
+++ b/etc/genshi/utils.txt
@@ -1,9 +1,4 @@
 {# Definitions utiles pour les templates #}\
 {% python
-    import os
-    os.sys.path.append('/var/lib/bcfg2/etc/genshi')
-    from utils import *
-
-    def has(group):
-        return group in metadata.groups
+    execfile('/var/lib/bcfg2/etc/genshi/utils.py')
 %}\