From 93fd0536f1b65aded502e01e0891353e3f5b5ae0 Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Wed, 30 Jun 2021 15:13:29 +0200
Subject: [PATCH] corrections

---
 scripts/module/change_domain.py        |  6 +++---
 scripts/module/set_var.py              |  8 +++++---
 scripts/zephir/authorize_user_group.py |  2 +-
 scripts/zephir/del_servers_group.py    | 11 +++++------
 scripts/zephir/exec_script_group.py    |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/scripts/module/change_domain.py b/scripts/module/change_domain.py
index e131d1f..1737076 100644
--- a/scripts/module/change_domain.py
+++ b/scripts/module/change_domain.py
@@ -10,7 +10,7 @@ from collections import OrderedDict
 
 def display_help():
     print("Modification de la valeur d'une variable d'un serveur")
-    print("{} [--var nom_variable --value valeur]".format(sys.argv[0]))
+    print("{} [--r realm --d domain]".format(sys.argv[0]))
 
 
 def argparser():
@@ -55,12 +55,12 @@ def main():
     fh.write(cjson.encode(store))
     fh.close()
 
-    cmd="""CreoleCat samba4-vars.conf"""
+    cmd="""CreoleCat -t samba4-vars.conf"""
     output = os.popen(cmd)
     res = output.read().strip()
     output.close()
 
-    cmd="""/usr/share/eole/posttemplate/25-manage-samba instance"""
+    cmd="""/usr/share/eole/postservice/25-manage-samba instance"""
     output = os.popen(cmd)
     res = output.read().strip()
     output.close()
diff --git a/scripts/module/set_var.py b/scripts/module/set_var.py
index e0456ae..aff8ef5 100644
--- a/scripts/module/set_var.py
+++ b/scripts/module/set_var.py
@@ -51,9 +51,11 @@ def main():
     if varc in store:
         store[varc]['val'] = valvar
 
-    fh = open("/etc/eole/config.eol", 'w')
-    fh.write(cjson.encode(store))
-    fh.close()
+        fh = open("/etc/eole/config.eol", 'w')
+        fh.write(cjson.encode(store))
+        fh.close()
+    else:
+        print_orange('Erreur : variable {} inconnue'.format(varc))
 
 
 if __name__ == '__main__':
diff --git a/scripts/zephir/authorize_user_group.py b/scripts/zephir/authorize_user_group.py
index 36f6685..c76c171 100644
--- a/scripts/zephir/authorize_user_group.py
+++ b/scripts/zephir/authorize_user_group.py
@@ -40,7 +40,7 @@ def argparser():
         display_help()
         sys.exit(1)
 
-     if sys.argv[2] in ['-v', '--var']:
+    if sys.argv[2] in ['-v', '--var']:
         varc = sys.argv[3]
         return server_id, user
 
diff --git a/scripts/zephir/del_servers_group.py b/scripts/zephir/del_servers_group.py
index 55477cd..816e6bc 100644
--- a/scripts/zephir/del_servers_group.py
+++ b/scripts/zephir/del_servers_group.py
@@ -81,12 +81,11 @@ def main():
     for id_serv in liste_serveurs :
         ret = proxy.serveurs.del_serveur(id_serv)
         if ret[1]:
-            print_orange('Erreur : ' + str(ret[1]))
-            sys.exit(1)
-
-    print('Les serveurs {} ont été supprimés'.format(liste_serveurs))
-
-
+            if ret[1] == "ok":
+                 print('Les serveurs {} ont été supprimés'.format(liste_serveurs))
+            else:
+                print_orange('Erreur : ' + str(ret[1]))
+                sys.exit(1)
 
 def get_pwd(addr, port):
     """lecture d'un login/passwd pour l'application zephir
diff --git a/scripts/zephir/exec_script_group.py b/scripts/zephir/exec_script_group.py
index f3e8fb3..2582b07 100644
--- a/scripts/zephir/exec_script_group.py
+++ b/scripts/zephir/exec_script_group.py
@@ -40,7 +40,7 @@ def argparser():
         display_help()
         sys.exit(1)
 
-     if sys.argv[2] in ['-s', '--script']:
+    if sys.argv[2] in ['-s', '--script']:
         script = sys.argv[3]
         return group_id, script, None