Propagate changes from moulinette

bin/yunohost

@@ -4,8 +4,6 @@
 import os
 import sys
 import argparse
-
-sys.path.insert(0, "/usr/lib/moulinette/")
 import yunohost
 
 

bin/yunohost-api

@@ -1,10 +1,7 @@
 #! /usr/bin/python3
 # -*- coding: utf-8 -*-
 
-import sys
 import argparse
-
-sys.path.insert(0, "/usr/lib/moulinette/")
 import yunohost
 
 # Default server configuration

debian/install

@@ -1,11 +1,10 @@
 bin/* /usr/bin/
 share/* /usr/share/yunohost/
-share/actionsmap.yml /usr/share/moulinette/actionsmap/yunohost.yml
 hooks/* /usr/share/yunohost/hooks/
 helpers/* /usr/share/yunohost/helpers.d/
 conf/* /usr/share/yunohost/conf/
+locales/* /usr/share/yunohost/locales/
 doc/yunohost.8.gz /usr/share/man/man8/
 doc/bash-completion.sh /etc/bash_completion.d/yunohost
 conf/metronome/modules/* /usr/lib/metronome/modules/
-locales/* /usr/lib/moulinette/yunohost/locales/
-src/* /usr/lib/moulinette/yunohost/
+src/* /usr/lib/python3/dist-packages/yunohost/

share/actionsmap.yml

@@ -33,7 +33,8 @@
 #     Global parameters     #
 #############################
 _global:
-    name: yunohost.admin
+    namespace: yunohost
+    cookie_name: yunohost.admin
     authentication:
         api: ldap_admin
         cli: null

src/__init__.py

@@ -22,7 +22,14 @@ def cli(debug, quiet, output_as, timeout, args, parser):
     if not is_installed():
         check_command_is_valid_before_postinstall(args)
 
-    ret = moulinette.cli(args, output_as=output_as, timeout=timeout, top_parser=parser)
+    ret = moulinette.cli(
+        args,
+        actionsmap="/usr/share/yunohost/actionsmap.yml",
+        locales_dir="/usr/share/yunohost/locales/",
+        output_as=output_as,
+        timeout=timeout,
+        top_parser=parser
+    )
     sys.exit(ret)
 
 
@@ -39,6 +46,8 @@ def api(debug, host, port):
     ret = moulinette.api(
         host=host,
         port=port,
+        actionsmap="/usr/share/yunohost/actionsmap.yml",
+        locales_dir="/usr/share/yunohost/locales/",
         routes={("GET", "/installed"): is_installed_api},
     )
     sys.exit(ret)
@@ -78,7 +87,7 @@ def init(interface="cli", debug=False, quiet=False, logdir="/var/log/yunohost"):
 def init_i18n():
     # This should only be called when not willing to go through moulinette.cli
     # or moulinette.api but still willing to call m18n.n/g...
-    m18n.load_namespace("yunohost")
+    m18n.set_locales_dir("/usr/share/yunohost/locales/")
     m18n.set_locale(get_locale())