From 3aa59583778a4fcb88128894b3c13e0a2387f162 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Sun, 12 Apr 2020 13:37:27 +0200
Subject: [PATCH] Update default config

---
 client.py                           | 4 ++--
 clientconfig.example.py             | 1 -
 clientconfigs/crans/clientconfig.py | 1 -
 clientconfigs/tudor/clientconfig.py | 4 ----
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/client.py b/client.py
index 859a319..efe3015 100755
--- a/client.py
+++ b/client.py
@@ -259,8 +259,8 @@ class simple_memoize(object):
            mais il faudra s'en préoccuper si un jour on veut changer le comportement."""
         if self.val == None:
             self.val = self.f(*args, **kwargs)
-        # On évite de tout deepcopier. Typiquement, un subprocess.Popen
-        # ne devrait pas l'être (comme dans get_keep_alive_connection)
+        # On évite de tout deepcopier. Typiquement, un SSHClient
+        # ne devrait pas l'être (comme dans create_ssh_client)
         if type(self.val) in [dict, list]:
             return copy.deepcopy(self.val)
         else:
diff --git a/clientconfig.example.py b/clientconfig.example.py
index 13ba000..78b061f 100755
--- a/clientconfig.example.py
+++ b/clientconfig.example.py
@@ -31,7 +31,6 @@ servers = {
     'localhost': {
         'host': 'localhost',
         'remote_cmd': distant_cmd,
-        'keep-alive': True, # <-- experimental, n'ouvre qu'une connexion
     },
     'ovh': {
         'host': 'soyouz.crans.org',
diff --git a/clientconfigs/crans/clientconfig.py b/clientconfigs/crans/clientconfig.py
index 2ccc131..1e22826 100644
--- a/clientconfigs/crans/clientconfig.py
+++ b/clientconfigs/crans/clientconfig.py
@@ -34,7 +34,6 @@ servers = {
     'localhost': {
         'host': 'localhost',
         'remote_cmd': distant_cmd,
-        'keep-alive': True, # <-- experimental, n'ouvre qu'une connexion
     },
     'ovh': {
         'host': 'soyouz.crans.org',
diff --git a/clientconfigs/tudor/clientconfig.py b/clientconfigs/tudor/clientconfig.py
index 9982694..3f3e688 100644
--- a/clientconfigs/tudor/clientconfig.py
+++ b/clientconfigs/tudor/clientconfig.py
@@ -15,21 +15,17 @@ servers = {
     'default': {
         'host': '',
         'remote_cmd': ['/home/dstan/cranspasswords/serverconfigs/tudor/cpasswords-server', ],
-        'keep-alive': True,
     },
     'gladys': {
         'host': 'home.b2moo.fr',
         'remote_cmd': ['/home/dstan/cranspasswords/serverconfigs/tudor/cpasswords-server', ],
-        'keep-alive': True,
     },
     'gladys-home': {
         'host': 'gladys.home',
         'remote_cmd': ['/home/dstan/cranspasswords/serverconfigs/tudor/cpasswords-server', ],
-        'keep-alive': True,
     },
     'pimeys': {
         'host': 'pimeys.fr',
         'remote_cmd': ['sudo', '-n', '/usr/local/bin/cranspasswords-server', ],
-        'keep-alive': True,
     },
 }
-- 
GitLab