From a7657c1a3952fd944d42e1efe90f5451140c3c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome@maroufle.fr>
Date: Sun, 10 Apr 2016 10:42:30 +0200
Subject: [PATCH] [ref] Deprecate and rename regenconf action to regen-conf

---
 bin/yunohost                 | 5 +++++
 data/actionsmap/yunohost.yml | 6 ++++--
 debian/control               | 2 +-
 src/yunohost/service.py      | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bin/yunohost b/bin/yunohost
index 798b0f6b4..cb663306c 100755
--- a/bin/yunohost
+++ b/bin/yunohost
@@ -150,6 +150,11 @@ def _init_moulinette(debug=False, verbose=False, quiet=False):
                 'handlers': [],
                 'propagate': True,
             },
+            'moulinette.interface': {
+                'level': level,
+                'handlers': handlers,
+                'propagate': False,
+            },
         },
         'root': {
             'level': level,
diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml
index e538bfc47..9105e3daa 100644
--- a/data/actionsmap/yunohost.yml
+++ b/data/actionsmap/yunohost.yml
@@ -956,8 +956,8 @@ service:
                     default: 50
                     type: int
 
-        ### service_regenconf()
-        regenconf:
+        ### service_regen_conf()
+        regen-conf:
             action_help: >
                 Regenerate the configuration file(s) for a service and compare the result
                 with the existing configuration file.
@@ -965,6 +965,8 @@ service:
             api: PUT /services/regenconf
             configuration:
                 lock: false
+            deprecated:
+                - regenconf
             arguments:
                 -s:
                     full: --service
diff --git a/debian/control b/debian/control
index 2053e9d60..b25925fc1 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: https://yunohost.org/
 Package: yunohost
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
- , moulinette (>= 2.3.4)
+ , moulinette (>= 2.3.5)
  , python-psutil, python-requests, python-dnspython
  , python-apt, python-miniupnpc
  , glances
diff --git a/src/yunohost/service.py b/src/yunohost/service.py
index 7443ffab2..8552a1b1f 100644
--- a/src/yunohost/service.py
+++ b/src/yunohost/service.py
@@ -273,7 +273,7 @@ def service_log(name, number=50):
     return result
 
 
-def service_regenconf(service=None, force=False):
+def service_regen_conf(service=None, force=False):
     """
     Regenerate the configuration file(s) for a service and compare the result
     with the existing configuration file.