Compare commits
5 Commits
4b11e407be
...
master
Author | SHA1 | Date | |
---|---|---|---|
524aef91f9 | |||
84834a228f | |||
f081522e1e | |||
441fbd22d2 | |||
0f3c332923 |
@ -2,7 +2,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import sys, getpass, socket, cjson, os
|
import sys, getpass, socket, cjson, os
|
||||||
from pyeole.ihm import print_line
|
from pyeole.ihm import print_line, question_ouinon
|
||||||
from pyeole.ansiprint import print_orange, print_red
|
from pyeole.ansiprint import print_orange, print_red
|
||||||
from creole.client import CreoleClient
|
from creole.client import CreoleClient
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
@ -16,7 +16,7 @@ def display_help():
|
|||||||
def argparser():
|
def argparser():
|
||||||
# récupère l'ID du groupe
|
# récupère l'ID du groupe
|
||||||
arglen = len(sys.argv)
|
arglen = len(sys.argv)
|
||||||
save = False
|
save = None
|
||||||
if "--save" in sys.argv:
|
if "--save" in sys.argv:
|
||||||
save = True
|
save = True
|
||||||
if "--no-save" in sys.argv:
|
if "--no-save" in sys.argv:
|
||||||
@ -66,14 +66,12 @@ def main():
|
|||||||
fh.write(cjson.encode(store))
|
fh.write(cjson.encode(store))
|
||||||
fh.close()
|
fh.close()
|
||||||
|
|
||||||
to_save = ""
|
|
||||||
if save is None :
|
if save is None :
|
||||||
to_save = raw_input("Souhaitez vous sauvegarder la configuration sur Zephir ? (O/N) ")
|
if question_ouinon("Souhaitez vous sauvegarder la configuration sur Zephir ?", default='non') == 'oui':
|
||||||
if to_save == "O":
|
|
||||||
save = True
|
|
||||||
print("Sauvegarde de la configuration sur zephir")
|
print("Sauvegarde de la configuration sur zephir")
|
||||||
|
save=True
|
||||||
else:
|
else:
|
||||||
print("La configuration ne sera pas sauvegardé sur le zephir")
|
print("La configuration ne sera pas sauvegardé sur zephir")
|
||||||
|
|
||||||
if save:
|
if save:
|
||||||
cmd="""/usr/share/zephir/scripts/zephir_client save_files"""
|
cmd="""/usr/share/zephir/scripts/zephir_client save_files"""
|
||||||
|
@ -46,7 +46,7 @@ def argparser():
|
|||||||
script = sys.argv[3]
|
script = sys.argv[3]
|
||||||
return group_id, script, None
|
return group_id, script, None
|
||||||
|
|
||||||
if sys.argv[4] in ['-p', '--params']:
|
if sys.argv[4] in ['-a', '--args']:
|
||||||
varc = sys.argv[5]
|
varc = sys.argv[5]
|
||||||
return group_id, script, params
|
return group_id, script, params
|
||||||
|
|
||||||
@ -99,7 +99,7 @@ def main():
|
|||||||
params = flushed_input("Paramètres : ")
|
params = flushed_input("Paramètres : ")
|
||||||
|
|
||||||
|
|
||||||
|
if params is None: params = ""
|
||||||
ret = proxy.uucp.exec_script(liste_serveurs, script, params)
|
ret = proxy.uucp.exec_script(liste_serveurs, script, params)
|
||||||
|
|
||||||
# on affiche les erreurs si nécessaire
|
# on affiche les erreurs si nécessaire
|
||||||
|
@ -148,9 +148,9 @@ def make_group():
|
|||||||
filename += '-' + variantes[idx]
|
filename += '-' + variantes[idx]
|
||||||
variantes = [variante_infos[variantes[idx]]]
|
variantes = [variante_infos[variantes[idx]]]
|
||||||
print
|
print
|
||||||
|
print("Liste des serveurs : ")
|
||||||
for variante in variantes:
|
for variante in variantes:
|
||||||
cu.execute('select id,ip_publique,rne,libelle from serveurs where variante=' + str(variante))
|
cu.execute('select id,ip_publique,rne,libelle from serveurs where variante=' + str(variante))
|
||||||
print("Liste des serveurs : ")
|
|
||||||
for server in cu.fetchall():
|
for server in cu.fetchall():
|
||||||
print('{} - {} - {} - {}'.format(server[0], server[1], server[2], server[3]))
|
print('{} - {} - {} - {}'.format(server[0], server[1], server[2], server[3]))
|
||||||
server_infos.append(server[0])
|
server_infos.append(server[0])
|
||||||
|
@ -7,6 +7,7 @@ from pyeole.ihm import print_line
|
|||||||
from pyeole.ansiprint import print_orange, print_red
|
from pyeole.ansiprint import print_orange, print_red
|
||||||
from creole.client import CreoleClient
|
from creole.client import CreoleClient
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
from zephir.backend.lib_backend import CxPool
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
Reference in New Issue
Block a user