Merge branch 'stretch-unstable' into future-proof-applist-system

data/actionsmap/yunohost.yml

@@ -441,6 +441,21 @@ domain:
                             - !!str ^[0-9]+$
                             - "pattern_positive_number"
 
+        ### domain_maindomain()
+        main-domain:
+            action_help: Check the current main domain, or change it
+            deprecated_alias:
+                - maindomain
+            api:
+                - GET /domains/main
+                - PUT /domains/main
+            arguments:
+                -n:
+                    full: --new-main-domain
+                    help: Change the current main domain
+                    extra:
+                        pattern: *pattern_domain
+
         ### certificate_status()
         cert-status:
             action_help: List status of current certificates (all by default).
@@ -722,14 +737,6 @@ app:
                     full: --sql
                     help: Initial SQL file
 
-        ### app_debug()
-        debug:
-            action_help: Display all debug informations for an application
-            api: GET /apps/<app>/debug
-            arguments:
-                app:
-                    help: App name
-
         ### app_makedefault()
         makedefault:
             action_help: Redirect domain root to an app
@@ -936,147 +943,6 @@ backup:
                         pattern: *pattern_backup_archive_name
 
 
-#############################
-#          Monitor          #
-#############################
-monitor:
-    category_help: Monitor the server
-    actions:
-
-        ### monitor_disk()
-        disk:
-            action_help: Monitor disk space and usage
-            api: GET /monitor/disk
-            arguments:
-                -f:
-                    full: --filesystem
-                    help: Show filesystem disk space
-                    action: append_const
-                    const: filesystem
-                    dest: units
-                -t:
-                    full: --io
-                    help: Show I/O throughput
-                    action: append_const
-                    const: io
-                    dest: units
-                -m:
-                    full: --mountpoint
-                    help: Monitor only the device mounted on MOUNTPOINT
-                    action: store
-                -H:
-                    full: --human-readable
-                    help: Print sizes in human readable format
-                    action: store_true
-
-        ### monitor_network()
-        network:
-            action_help: Monitor network interfaces
-            api: GET /monitor/network
-            arguments:
-                -u:
-                    full: --usage
-                    help: Show interfaces bit rates
-                    action: append_const
-                    const: usage
-                    dest: units
-                -i:
-                    full: --infos
-                    help: Show network informations
-                    action: append_const
-                    const: infos
-                    dest: units
-                -c:
-                    full: --check
-                    help: Check network configuration
-                    action: append_const
-                    const: check
-                    dest: units
-                -H:
-                    full: --human-readable
-                    help: Print sizes in human readable format
-                    action: store_true
-
-        ### monitor_system()
-        system:
-            action_help: Monitor system informations and usage
-            api: GET /monitor/system
-            arguments:
-                -m:
-                    full: --memory
-                    help: Show memory usage
-                    action: append_const
-                    const: memory
-                    dest: units
-                -c:
-                    full: --cpu
-                    help: Show CPU usage and load
-                    action: append_const
-                    const: cpu
-                    dest: units
-                -p:
-                    full: --process
-                    help: Show processes summary
-                    action: append_const
-                    const: process
-                    dest: units
-                -u:
-                    full: --uptime
-                    help: Show the system uptime
-                    action: append_const
-                    const: uptime
-                    dest: units
-                -i:
-                    full: --infos
-                    help: Show system informations
-                    action: append_const
-                    const: infos
-                    dest: units
-                -H:
-                    full: --human-readable
-                    help: Print sizes in human readable format
-                    action: store_true
-
-        ### monitor_updatestats()
-        update-stats:
-            action_help: Update monitoring statistics
-            api: POST /monitor/stats
-            arguments:
-                period:
-                    help: Time period to update
-                    choices:
-                        - day
-                        - week
-                        - month
-
-        ### monitor_showstats()
-        show-stats:
-            action_help: Show monitoring statistics
-            api: GET /monitor/stats
-            arguments:
-                period:
-                    help: Time period to show
-                    choices:
-                        - day
-                        - week
-                        - month
-
-        ### monitor_enable()
-        enable:
-            action_help: Enable server monitoring
-            api: PUT /monitor
-            arguments:
-                -s:
-                    full: --with-stats
-                    help: Enable monitoring statistics
-                    action: store_true
-
-        ### monitor_disable()
-        disable:
-            api: DELETE /monitor
-            action_help: Disable server monitoring
-
-
 #############################
 #         Settings          #
 #############################
@@ -1510,12 +1376,9 @@ tools:
         ### tools_maindomain()
         maindomain:
             action_help: Check the current main domain, or change it
-            api:
-                - GET /domains/main
-                - PUT /domains/main
             arguments:
                 -n:
-                    full: --new-domain
+                    full: --new-main-domain
                     help: Change the current main domain
                     extra:
                         pattern: *pattern_domain
@@ -1574,16 +1437,6 @@ tools:
                     help: Upgrade only the system packages
                     action: store_true
 
-        ### tools_diagnosis()
-        diagnosis:
-            action_help: YunoHost diagnosis
-            api: GET /diagnosis
-            arguments:
-                -p:
-                    full: --private
-                    help: Show private data (domain, IP)
-                    action: store_true
-
         ### tools_port_available()
         port-available:
             action_help: Check availability of a local port
@@ -1829,3 +1682,59 @@ log:
                 --share:
                     help: Share the full log using yunopaste
                     action: store_true
+
+
+#############################
+#          Diagnosis        #
+#############################
+diagnosis:
+    category_help: Look for possible issues on the server
+    actions:
+
+        list:
+            action_help: List diagnosis categories
+            api: GET /diagnosis/list
+
+        show:
+            action_help: Show most recents diagnosis results
+            api: GET /diagnosis/show
+            arguments:
+                categories:
+                    help: Diagnosis categories to display (all by default)
+                    nargs: "*"
+                --full:
+                    help: Display additional information
+                    action: store_true
+                --issues:
+                    help: Only display issues
+                    action: store_true
+                --share:
+                    help: Share the logs using yunopaste
+                    action: store_true
+
+        run:
+            action_help: Show most recents diagnosis results
+            api: POST /diagnosis/run
+            arguments:
+                categories:
+                    help: Diagnosis categories to run (all by default)
+                    nargs: "*"
+                --force:
+                    help: Ignore the cached report even if it is still 'fresh'
+                    action: store_true
+
+        ignore:
+            action_help: Configure some diagnosis results to be ignored and therefore not considered as actual issues
+            api: POST /diagnosis/ignore
+            arguments:
+                --add-filter:
+                    help: "Add a filter. The first element should be a diagnosis category, and other criterias can be provided using the infos from the 'meta' sections in 'yunohost diagnosis show'. For example: 'dnsrecords domain=yolo.test category=xmpp'"
+                    nargs: "*"
+                    metavar: CRITERIA
+                --remove-filter:
+                    help: Remove a filter (it should be an existing filter as listed with --list)
+                    nargs: "*"
+                    metavar: CRITERIA
+                --list:
+                    help: List active ignore filters
+                    action: store_true

data/helpers.d/network

@@ -17,7 +17,7 @@ ynh_find_port () {
 	ynh_handle_getopts_args "$@"
 
 	test -n "$port" || ynh_die --message="The argument of ynh_find_port must be a valid port."
-	while netcat -z 127.0.0.1 $port       # Check if the port is free
+	while ss -nltu | grep -q -w :$port       # Check if the port is free
 	do
 		port=$((port+1))	# Else, pass to next port
 	done

data/hooks/diagnosis/00-basesystem.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+
+import os
+
+from moulinette.utils.filesystem import read_file
+from yunohost.diagnosis import Diagnoser
+from yunohost.utils.packages import ynh_packages_version
+
+
+class BaseSystemDiagnoser(Diagnoser):
+
+    id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
+    cache_duration = 3600 * 24
+    dependencies = []
+
+    def run(self):
+
+        # Kernel version
+        kernel_version = read_file('/proc/sys/kernel/osrelease').strip()
+        yield dict(meta={"test": "kernel"},
+                   status="INFO",
+                   summary=("diagnosis_basesystem_kernel", {"kernel_version": kernel_version}))
+
+        # FIXME / TODO : add virt/vm technology using systemd-detect-virt and/or machine arch
+
+        # Debian release
+        debian_version = read_file("/etc/debian_version").strip()
+        yield dict(meta={"test": "host"},
+                   status="INFO",
+                   summary=("diagnosis_basesystem_host", {"debian_version": debian_version}))
+
+        # Yunohost packages versions
+        ynh_packages = ynh_packages_version()
+        # We check if versions are consistent (e.g. all 3.6 and not 3 packages with 3.6 and the other with 3.5)
+        # This is a classical issue for upgrades that failed in the middle
+        # (or people upgrading half of the package because they did 'apt upgrade' instead of 'dist-upgrade')
+        # Here, ynh_core_version is for example "3.5.4.12", so [:3] is "3.5" and we check it's the same for all packages
+        ynh_core_version = ynh_packages["yunohost"]["version"]
+        consistent_versions = all(infos["version"][:3] == ynh_core_version[:3] for infos in ynh_packages.values())
+        ynh_version_details = [("diagnosis_basesystem_ynh_single_version", (package, infos["version"], infos["repo"]))
+                               for package, infos in ynh_packages.items()]
+
+        if consistent_versions:
+            yield dict(meta={"test": "ynh_versions"},
+                       data={"main_version": ynh_core_version, "repo": ynh_packages["yunohost"]["repo"]},
+                       status="INFO",
+                       summary=("diagnosis_basesystem_ynh_main_version",
+                                {"main_version": ynh_core_version,
+                                 "repo": ynh_packages["yunohost"]["repo"]}),
+                       details=ynh_version_details)
+        else:
+            yield dict(meta={"test": "ynh_versions"},
+                       data={"main_version": ynh_core_version, "repo": ynh_packages["yunohost"]["repo"]},
+                       status="ERROR",
+                       summary=("diagnosis_basesystem_ynh_inconsistent_versions", {}),
+                       details=ynh_version_details)
+
+
+def main(args, env, loggers):
+    return BaseSystemDiagnoser(args, env, loggers).diagnose()

data/hooks/diagnosis/10-ip.py

@@ -0,0 +1,150 @@
+#!/usr/bin/env python
+
+import os
+import random
+
+from moulinette.utils.network import download_text
+from moulinette.utils.process import check_output
+from moulinette.utils.filesystem import read_file
+
+from yunohost.diagnosis import Diagnoser
+
+
+class IPDiagnoser(Diagnoser):
+
+    id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
+    cache_duration = 60
+    dependencies = []
+
+    def run(self):
+
+        # ############################################################ #
+        # PING : Check that we can ping outside at least in ipv4 or v6 #
+        # ############################################################ #
+
+        can_ping_ipv4 = self.can_ping_outside(4)
+        can_ping_ipv6 = self.can_ping_outside(6)
+
+        if not can_ping_ipv4 and not can_ping_ipv6:
+            yield dict(meta={"test": "ping"},
+                       status="ERROR",
+                       summary=("diagnosis_ip_not_connected_at_all", {}))
+            # Not much else we can do if there's no internet at all
+            return
+
+        # ###################################################### #
+        # DNS RESOLUTION : Check that we can resolve domain name #
+        # (later needed to talk to ip. and ip6.yunohost.org)     #
+        # ###################################################### #
+
+        can_resolve_dns = self.can_resolve_dns()
+
+        # In every case, we can check that resolvconf seems to be okay
+        # (symlink managed by resolvconf service + pointing to dnsmasq)
+        good_resolvconf = self.resolvconf_is_symlink() and self.resolvconf_points_to_localhost()
+
+        # If we can't resolve domain names at all, that's a pretty big issue ...
+        # If it turns out that at the same time, resolvconf is bad, that's probably
+        # the cause of this, so we use a different message in that case
+        if not can_resolve_dns:
+            yield dict(meta={"test": "dnsresolv"},
+                       status="ERROR",
+                       summary=("diagnosis_ip_broken_dnsresolution", {}) if good_resolvconf
+                          else ("diagnosis_ip_broken_resolvconf", {}))
+            return
+        # Otherwise, if the resolv conf is bad but we were able to resolve domain name,
+        # still warn that we're using a weird resolv conf ...
+        elif not good_resolvconf:
+            yield dict(meta={"test": "dnsresolv"},
+                       status="WARNING",
+                       summary=("diagnosis_ip_weird_resolvconf", {}),
+                       details=[("diagnosis_ip_weird_resolvconf_details", ())])
+        else:
+            yield dict(meta={"test": "dnsresolv"},
+                       status="SUCCESS",
+                       summary=("diagnosis_ip_dnsresolution_working", {}))
+
+        # ##################################################### #
+        # IP DIAGNOSIS : Check that we're actually able to talk #
+        # to a web server to fetch current IPv4 and v6          #
+        # ##################################################### #
+
+        ipv4 = self.get_public_ip(4) if can_ping_ipv4 else None
+        ipv6 = self.get_public_ip(6) if can_ping_ipv6 else None
+
+        yield dict(meta={"test": "ip", "version": 4},
+                   data=ipv4,
+                   status="SUCCESS" if ipv4 else "ERROR",
+                   summary=("diagnosis_ip_connected_ipv4", {}) if ipv4
+                      else ("diagnosis_ip_no_ipv4", {}))
+
+        yield dict(meta={"test": "ip", "version": 6},
+                   data=ipv6,
+                   status="SUCCESS" if ipv6 else "WARNING",
+                   summary=("diagnosis_ip_connected_ipv6", {}) if ipv6
+                      else ("diagnosis_ip_no_ipv6", {}))
+
+        # TODO / FIXME : add some attempt to detect ISP (using whois ?) ?
+
+    def can_ping_outside(self, protocol=4):
+
+        assert protocol in [4, 6], "Invalid protocol version, it should be either 4 or 6 and was '%s'" % repr(protocol)
+
+        # We can know that ipv6 is not available directly if this file does not exists
+        if protocol == 6 and not os.path.exists("/proc/net/if_inet6"):
+            return False
+
+        # If we are indeed connected in ipv4 or ipv6, we should find a default route
+        routes = check_output("ip -%s route" % protocol).split("\n")
+        if not [r for r in routes if r.startswith("default")]:
+            return False
+
+        # We use the resolver file as a list of well-known, trustable (ie not google ;)) IPs that we can ping
+        resolver_file = "/usr/share/yunohost/templates/dnsmasq/plain/resolv.dnsmasq.conf"
+        resolvers = [r.split(" ")[1] for r in read_file(resolver_file).split("\n") if r.startswith("nameserver")]
+
+        if protocol == 4:
+            resolvers = [r for r in resolvers if ":" not in r]
+        if protocol == 6:
+            resolvers = [r for r in resolvers if ":" in r]
+
+        assert resolvers != [], "Uhoh, need at least one IPv%s DNS resolver in %s ..." % (protocol, resolver_file)
+
+        # So let's try to ping the first 4~5 resolvers (shuffled)
+        # If we succesfully ping any of them, we conclude that we are indeed connected
+        def ping(protocol, target):
+            return os.system("ping%s -c1 -W 3 %s >/dev/null 2>/dev/null" % ("" if protocol == 4 else "6", target)) == 0
+
+        random.shuffle(resolvers)
+        return any(ping(protocol, resolver) for resolver in resolvers[:5])
+
+    def can_resolve_dns(self):
+        return os.system("dig +short ip.yunohost.org >/dev/null 2>/dev/null") == 0
+
+    def resolvconf_is_symlink(self):
+        return os.path.realpath("/etc/resolv.conf") == "/run/resolvconf/resolv.conf"
+
+    def resolvconf_points_to_localhost(self):
+        file_ = "/etc/resolv.conf"
+        resolvers = [r.split(" ")[1] for r in read_file(file_).split("\n") if r.startswith("nameserver")]
+        return resolvers == ["127.0.0.1"]
+
+    def get_public_ip(self, protocol=4):
+
+        # FIXME - TODO : here we assume that DNS resolution for ip.yunohost.org is working
+        # but if we want to be able to diagnose DNS resolution issues independently from
+        # internet connectivity, we gotta rely on fixed IPs first....
+
+        assert protocol in [4, 6], "Invalid protocol version, it should be either 4 or 6 and was '%s'" % repr(protocol)
+
+        url = 'https://ip%s.yunohost.org' % ('6' if protocol == 6 else '')
+
+        try:
+            return download_text(url, timeout=30).strip()
+        except Exception as e:
+            self.logger_debug("Could not get public IPv%s : %s" % (str(protocol), str(e)))
+            return None
+
+
+def main(args, env, loggers):
+    return IPDiagnoser(args, env, loggers).diagnose()

data/hooks/diagnosis/12-dnsrecords.py

@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+
+import os
+
+from moulinette.utils.process import check_output
+from moulinette.utils.filesystem import read_file
+
+from yunohost.diagnosis import Diagnoser
+from yunohost.domain import domain_list, _build_dns_conf, _get_maindomain
+
+
+class DNSRecordsDiagnoser(Diagnoser):
+
+    id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
+    cache_duration = 3600 * 24
+    dependencies = ["ip"]
+
+    def run(self):
+
+        resolvers = read_file("/etc/resolv.dnsmasq.conf").split("\n")
+        ipv4_resolvers = [r.split(" ")[1] for r in resolvers if r.startswith("nameserver") and ":" not in r]
+        # FIXME some day ... handle ipv4-only and ipv6-only servers. For now we assume we have at least ipv4
+        assert ipv4_resolvers != [], "Uhoh, need at least one IPv4 DNS resolver ..."
+
+        self.resolver = ipv4_resolvers[0]
+        main_domain = _get_maindomain()
+
+        all_domains = domain_list()["domains"]
+        for domain in all_domains:
+            self.logger_debug("Diagnosing DNS conf for %s" % domain)
+            for report in self.check_domain(domain, domain == main_domain):
+                yield report
+
+        # FIXME : somewhere, should implement a check for reverse DNS ...
+
+        # FIXME / TODO : somewhere, could also implement a check for domain expiring soon
+
+    def check_domain(self, domain, is_main_domain):
+
+        expected_configuration = _build_dns_conf(domain)
+
+        # Here if there are no AAAA record, we should add something to expect "no" AAAA record
+        # to properly diagnose situations where people have a AAAA record but no IPv6
+
+        for category, records in expected_configuration.items():
+
+            discrepancies = []
+
+            for r in records:
+                current_value = self.get_current_record(domain, r["name"], r["type"]) or "None"
+                expected_value = r["value"] if r["value"] != "@" else domain + "."
+
+                if current_value == "None":
+                    discrepancies.append(("diagnosis_dns_missing_record", (r["type"], r["name"], expected_value)))
+                elif current_value != expected_value:
+                    discrepancies.append(("diagnosis_dns_discrepancy", (r["type"], r["name"], expected_value, current_value)))
+
+            if discrepancies:
+                status = "ERROR" if (category == "basic" or (is_main_domain and category != "extra")) else "WARNING"
+                summary = ("diagnosis_dns_bad_conf", {"domain": domain, "category": category})
+            else:
+                status = "SUCCESS"
+                summary = ("diagnosis_dns_good_conf", {"domain": domain, "category": category})
+
+            output = dict(meta={"domain": domain, "category": category},
+                          status=status,
+                          summary=summary)
+
+            if discrepancies:
+                output["details"] = discrepancies
+
+            yield output
+
+    def get_current_record(self, domain, name, type_):
+        if name == "@":
+            command = "dig +short @%s %s %s" % (self.resolver, type_, domain)
+        else:
+            command = "dig +short @%s %s %s.%s" % (self.resolver, type_, name, domain)
+        # FIXME : gotta handle case where this command fails ...
+        # e.g. no internet connectivity (dependency mechanism to good result from 'ip' diagosis ?)
+        # or the resolver is unavailable for some reason
+        output = check_output(command).strip()
+        if output.startswith('"') and output.endswith('"'):
+            output = '"' + ' '.join(output.replace('"', ' ').split()) + '"'
+        return output
+
+
+def main(args, env, loggers):
+    return DNSRecordsDiagnoser(args, env, loggers).diagnose()

data/hooks/diagnosis/14-ports.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+
+import os
+import requests
+
+from yunohost.diagnosis import Diagnoser
+from yunohost.utils.error import YunohostError
+
+
+class PortsDiagnoser(Diagnoser):
+
+    id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
+    cache_duration = 3600
+    dependencies = ["ip"]
+
+    def run(self):
+
+        # FIXME / TODO : in the future, maybe we want to report different
+        # things per port depending on how important they are
+        # (e.g. XMPP sounds to me much less important than other ports)
+        # Ideally, a port could be related to a service...
+        # FIXME / TODO : for now this list of port is hardcoded, might want
+        # to fetch this from the firewall.yml in /etc/yunohost/
+        ports = [22, 25, 53, 80, 443, 587, 993, 5222, 5269]
+
+        try:
+            r = requests.post('https://ynhdiagnoser.netlib.re/check-ports', json={'ports': ports}, timeout=30).json()
+            if "status" not in r.keys():
+                raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
+            elif r["status"] == "error":
+                if "content" in r.keys():
+                    raise Exception(r["content"])
+                else:
+                    raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
+            elif r["status"] != "ok" or "ports" not in r.keys() or not isinstance(r["ports"], dict):
+                raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
+        except Exception as e:
+            raise YunohostError("diagnosis_ports_could_not_diagnose", error=e)
+
+        for port in ports:
+            if r["ports"].get(str(port), None) is not True:
+                yield dict(meta={"port": port},
+                           status="ERROR",
+                           summary=("diagnosis_ports_unreachable", {"port": port}))
+            else:
+                yield dict(meta={},
+                           status="SUCCESS",
+                           summary=("diagnosis_ports_ok", {"port": port}))
+
+
+def main(args, env, loggers):
+    return PortsDiagnoser(args, env, loggers).diagnose()

data/hooks/diagnosis/16-http.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+
+import os
+import random
+import requests
+
+from yunohost.diagnosis import Diagnoser
+from yunohost.domain import domain_list
+from yunohost.utils.error import YunohostError
+
+
+class HttpDiagnoser(Diagnoser):
+
+    id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
+    cache_duration = 3600
+    dependencies = ["ip"]
+
+    def run(self):
+
+        nonce_digits = "0123456789abcedf"
+
+        all_domains = domain_list()["domains"]
+        for domain in all_domains:
+
+            nonce = ''.join(random.choice(nonce_digits) for i in range(16))
+            os.system("rm -rf /tmp/.well-known/ynh-diagnosis/")
+            os.system("mkdir -p /tmp/.well-known/ynh-diagnosis/")
+            os.system("touch /tmp/.well-known/ynh-diagnosis/%s" % nonce)
+
+            try:
+                r = requests.post('https://ynhdiagnoser.netlib.re/check-http', json={'domain': domain, "nonce": nonce}, timeout=30).json()
+                if "status" not in r.keys():
+                    raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
+                elif r["status"] == "error" and ("code" not in r.keys() or r["code"] not in ["error_http_check_connection_error", "error_http_check_unknown_error"]):
+                    if "content" in r.keys():
+                        raise Exception(r["content"])
+                    else:
+                        raise Exception("Bad syntax for response ? Raw json: %s" % str(r))
+            except Exception as e:
+                raise YunohostError("diagnosis_http_could_not_diagnose", error=e)
+
+            if r["status"] == "ok":
+                yield dict(meta={"domain": domain},
+                           status="SUCCESS",
+                           summary=("diagnosis_http_ok", {"domain": domain}))
+            else:
+                yield dict(meta={"domain": domain},
+                           status="ERROR",
+                           summary=("diagnosis_http_unreachable", {"domain": domain}))
+
+        # In there or idk where else ...
+        # try to diagnose hairpinning situation by crafting a request for the
+        # global ip (from within local network) and seeing if we're getting the right page ?
+
+
+def main(args, env, loggers):
+    return HttpDiagnoser(args, env, loggers).diagnose()

data/hooks/diagnosis/18-mail.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+
+import os
+
+from yunohost.diagnosis import Diagnoser
+
+
+class MailDiagnoser(Diagnoser):
+
+    id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
+    cache_duration = 3600
+    dependencies = ["ip"]
+
+    def run(self):
+
+        # Is outgoing port 25 filtered somehow ?
+        if os.system('/bin/nc -z -w2 yunohost.org 25') == 0:
+            yield dict(meta={"test": "ougoing_port_25"},
+                       status="SUCCESS",
+                       summary=("diagnosis_mail_ougoing_port_25_ok",{}))
+        else:
+            yield dict(meta={"test": "outgoing_port_25"},
+                       status="ERROR",
+                       summary=("diagnosis_mail_ougoing_port_25_blocked",{}))
+
+
+
+        # Mail blacklist using dig requests (c.f. ljf's code)
+
+        # SMTP reachability (c.f. check-smtp to be implemented on yunohost's remote diagnoser)
+
+        # ideally, SPF / DMARC / DKIM validation ... (c.f. https://github.com/alexAubin/yunoScripts/blob/master/yunoDKIM.py possibly though that looks horrible)
+
+        # check that the mail queue is not filled with hundreds of email pending
+
+        # check that the recent mail logs are not filled with thousand of email sending (unusual number of mail sent)
+
+        # check for unusual failed sending attempt being refused in the logs ?
+
+
+def main(args, env, loggers):
+    return MailDiagnoser(args, env, loggers).diagnose()

data/hooks/diagnosis/30-services.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+
+import os
+
+from yunohost.diagnosis import Diagnoser
+from yunohost.service import service_status
+
+# TODO : all these are arbitrary, should be collectively validated
+services_ignored = {"glances"}
+services_critical = {"dnsmasq", "fail2ban", "yunohost-firewall", "nginx", "slapd", "ssh"}
+# TODO / FIXME : we should do something about this postfix thing
+# The nominal value is to be "exited" ... some daemon is actually running
+# in a different thread that the thing started by systemd, which is fine
+# but somehow sometimes it gets killed and there's no easy way to detect it
+# Just randomly restarting it will fix ths issue. We should find some trick
+# to identify the PID of the process and check it's still up or idk
+services_expected_to_be_exited = {"postfix", "yunohost-firewall"}
+
+class ServicesDiagnoser(Diagnoser):
+
+    id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
+    cache_duration = 300
+    dependencies = []
+
+    def run(self):
+
+        all_result = service_status()
+
+        for service, result in sorted(all_result.items()):
+
+            if service in services_ignored:
+                continue
+
+            item = dict(meta={"service": service})
+            expected_status = "running" if service not in services_expected_to_be_exited else "exited"
+
+            # TODO / FIXME : might also want to check that services are enabled
+
+            if result["active"] != "active" or result["status"] != expected_status:
+                item["status"] = "WARNING" if service not in services_critical else "ERROR"
+                item["summary"] = ("diagnosis_services_bad_status", {"service": service, "status": result["active"] + "/" + result["status"]})
+
+                # TODO : could try to append the tail of the service log to the "details" key ...
+            else:
+                item["status"] = "SUCCESS"
+                item["summary"] = ("diagnosis_services_good_status", {"service": service, "status": result["active"] + "/" + result["status"]})
+
+            yield item
+
+def main(args, env, loggers):
+    return ServicesDiagnoser(args, env, loggers).diagnose()

data/hooks/diagnosis/50-systemresources.py

@@ -0,0 +1,85 @@
+#!/usr/bin/env python
+import os
+import psutil
+
+from yunohost.diagnosis import Diagnoser
+
+class SystemResourcesDiagnoser(Diagnoser):
+
+    id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
+    cache_duration = 3600 * 24
+    dependencies = []
+
+    def run(self):
+
+        #
+        # RAM
+        #
+
+        ram = psutil.virtual_memory()
+        ram_total_abs_MB = ram.total / (1024**2)
+        ram_available_abs_MB = ram.available / (1024**2)
+        ram_available_percent = round(100 * ram.available / ram.total)
+        item = dict(meta={"test": "ram"})
+        infos = {"total_abs_MB": ram_total_abs_MB, "available_abs_MB": ram_available_abs_MB, "available_percent": ram_available_percent}
+        if ram_available_abs_MB < 100 or ram_available_percent < 5:
+            item["status"] = "ERROR"
+            item["summary"] = ("diagnosis_ram_verylow", infos)
+        elif ram_available_abs_MB < 200 or ram_available_percent < 10:
+            item["status"] = "WARNING"
+            item["summary"] = ("diagnosis_ram_low", infos)
+        else:
+            item["status"] = "SUCCESS"
+            item["summary"] = ("diagnosis_ram_ok", infos)
+        yield item
+
+        #
+        # Swap
+        #
+
+        swap = psutil.swap_memory()
+        swap_total_abs_MB = swap.total / (1024*1024)
+        item = dict(meta={"test": "swap"})
+        infos = {"total_MB": swap_total_abs_MB}
+        if swap_total_abs_MB <= 0:
+            item["status"] = "ERROR"
+            item["summary"] = ("diagnosis_swap_none", infos)
+        elif swap_total_abs_MB <= 256:
+            item["status"] = "WARNING"
+            item["summary"] = ("diagnosis_swap_notsomuch", infos)
+        else:
+            item["status"] = "SUCCESS"
+            item["summary"] = ("diagnosis_swap_ok", infos)
+        yield item
+
+        #
+        # Disks usage
+        #
+
+        disk_partitions = psutil.disk_partitions()
+
+        for disk_partition in disk_partitions:
+            device = disk_partition.device
+            mountpoint = disk_partition.mountpoint
+
+            usage = psutil.disk_usage(mountpoint)
+            free_abs_GB = usage.free / (1024 ** 3)
+            free_percent = 100 - usage.percent
+
+            item = dict(meta={"test": "diskusage", "mountpoint": mountpoint})
+            infos = {"mountpoint": mountpoint, "device": device, "free_abs_GB": free_abs_GB, "free_percent": free_percent}
+            if free_abs_GB < 1 or free_percent < 5:
+                item["status"] = "ERROR"
+                item["summary"] = ("diagnosis_diskusage_verylow", infos)
+            elif free_abs_GB < 2 or free_percent < 10:
+                item["status"] = "WARNING"
+                item["summary"] = ("diagnosis_diskusage_low", infos)
+            else:
+                item["status"] = "SUCCESS"
+                item["summary"] = ("diagnosis_diskusage_ok", infos)
+
+            yield item
+
+
+def main(args, env, loggers):
+    return SystemResourcesDiagnoser(args, env, loggers).diagnose()

data/hooks/diagnosis/70-regenconf.py

@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+
+import os
+
+import subprocess
+from yunohost.diagnosis import Diagnoser
+from yunohost.regenconf import manually_modified_files, manually_modified_files_compared_to_debian_default
+
+
+class RegenconfDiagnoser(Diagnoser):
+
+    id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
+    cache_duration = 300
+    dependencies = []
+
+    def run(self):
+
+        # nginx -t
+        p = subprocess.Popen("nginx -t".split(),
+                             stdout=subprocess.PIPE,
+                             stderr=subprocess.STDOUT)
+        out, _ = p.communicate()
+
+        if p.returncode != 0:
+            yield dict(meta={"test": "nginx-t"},
+                       status="ERROR",
+                       summary=("diagnosis_regenconf_nginx_conf_broken", {}),
+                       details=[(out, ())]
+                       )
+
+        regenconf_modified_files = manually_modified_files()
+        debian_modified_files = manually_modified_files_compared_to_debian_default(ignore_handled_by_regenconf=True)
+
+        if regenconf_modified_files == []:
+            yield dict(meta={"test": "regenconf"},
+                       status="SUCCESS",
+                       summary=("diagnosis_regenconf_allgood", {})
+                       )
+        else:
+            for f in regenconf_modified_files:
+                yield dict(meta={"test": "regenconf", "file": f},
+                           status="WARNING",
+                           summary=("diagnosis_regenconf_manually_modified", {"file": f}),
+                           details=[("diagnosis_regenconf_manually_modified_details", {})]
+                           )
+
+        for f in debian_modified_files:
+            yield dict(meta={"test": "debian", "file": f},
+                       status="WARNING",
+                       summary=("diagnosis_regenconf_manually_modified_debian", {"file": f}),
+                       details=[("diagnosis_regenconf_manually_modified_debian_details", {})]
+                       )
+
+
+def main(args, env, loggers):
+    return RegenconfDiagnoser(args, env, loggers).diagnose()

data/hooks/diagnosis/90-security.py

@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+
+import os
+import json
+import subprocess
+
+from yunohost.diagnosis import Diagnoser
+from moulinette.utils.filesystem import read_json, write_to_json
+
+
+class SecurityDiagnoser(Diagnoser):
+
+    id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1]
+    cache_duration = 3600
+    dependencies = []
+
+    def run(self):
+
+        "CVE-2017-5754"
+
+        if self.is_vulnerable_to_meltdown():
+            yield dict(meta={"test": "meltdown"},
+                       status="ERROR",
+                       summary=("diagnosis_security_vulnerable_to_meltdown", {}),
+                       details=[("diagnosis_security_vulnerable_to_meltdown_details", ())]
+                       )
+        else:
+            yield dict(meta={},
+                       status="SUCCESS",
+                       summary=("diagnosis_security_all_good", {})
+                       )
+
+
+    def is_vulnerable_to_meltdown(self):
+        # meltdown CVE: https://security-tracker.debian.org/tracker/CVE-2017-5754
+
+        # We use a cache file to avoid re-running the script so many times,
+        # which can be expensive (up to around 5 seconds on ARM)
+        # and make the admin appear to be slow (c.f. the calls to diagnosis
+        # from the webadmin)
+        #
+        # The cache is in /tmp and shall disappear upon reboot
+        # *or* we compare it to dpkg.log modification time
+        # such that it's re-ran if there was package upgrades
+        # (e.g. from yunohost)
+        cache_file = "/tmp/yunohost-meltdown-diagnosis"
+        dpkg_log = "/var/log/dpkg.log"
+        if os.path.exists(cache_file):
+            if not os.path.exists(dpkg_log) or os.path.getmtime(cache_file) > os.path.getmtime(dpkg_log):
+                self.logger_debug("Using cached results for meltdown checker, from %s" % cache_file)
+                return read_json(cache_file)[0]["VULNERABLE"]
+
+        # script taken from https://github.com/speed47/spectre-meltdown-checker
+        # script commit id is store directly in the script
+        SCRIPT_PATH = "/usr/lib/moulinette/yunohost/vendor/spectre-meltdown-checker/spectre-meltdown-checker.sh"
+
+        # '--variant 3' corresponds to Meltdown
+        # example output from the script:
+        # [{"NAME":"MELTDOWN","CVE":"CVE-2017-5754","VULNERABLE":false,"INFOS":"PTI mitigates the vulnerability"}]
+        try:
+            self.logger_debug("Running meltdown vulnerability checker")
+            call = subprocess.Popen("bash %s --batch json --variant 3" %
+                                    SCRIPT_PATH, shell=True,
+                                    stdout=subprocess.PIPE,
+                                    stderr=subprocess.PIPE)
+
+            # TODO / FIXME : here we are ignoring error messages ...
+            # in particular on RPi2 and other hardware, the script complains about
+            # "missing some kernel info (see -v), accuracy might be reduced"
+            # Dunno what to do about that but we probably don't want to harass
+            # users with this warning ...
+            output, err = call.communicate()
+            assert call.returncode in (0, 2, 3), "Return code: %s" % call.returncode
+
+            # If there are multiple lines, sounds like there was some messages
+            # in stdout that are not json >.> ... Try to get the actual json
+            # stuff which should be the last line
+            output = output.strip()
+            if "\n" in output:
+                self.logger_debug("Original meltdown checker output : %s" % output)
+                output = output.split("\n")[-1]
+
+            CVEs = json.loads(output)
+            assert len(CVEs) == 1
+            assert CVEs[0]["NAME"] == "MELTDOWN"
+        except Exception as e:
+            import traceback
+            traceback.print_exc()
+            self.logger_warning("Something wrong happened when trying to diagnose Meltdown vunerability, exception: %s" % e)
+            raise Exception("Command output for failed meltdown check: '%s'" % output)
+
+        self.logger_debug("Writing results from meltdown checker to cache file, %s" % cache_file)
+        write_to_json(cache_file, CVEs)
+        return CVEs[0]["VULNERABLE"]
+
+
+def main(args, env, loggers):
+    return SecurityDiagnoser(args, env, loggers).diagnose()

data/templates/glances/glances.default

@@ -1,5 +0,0 @@
-# Default is to launch glances with '-s' option.
-DAEMON_ARGS="-s -B 127.0.0.1"
-
-# Change to 'true' to have glances running at startup
-RUN="true"

data/templates/nginx/server.tpl.conf

@@ -16,6 +16,10 @@ server {
         return 301 https://$http_host$request_uri;
     }
 
+    location /.well-known/ynh-diagnosis/ {
+        alias /tmp/.well-known/ynh-diagnosis/;
+    }
+
     location /.well-known/autoconfig/mail/ {
         alias /var/www/.well-known/{{ domain }}/autoconfig/mail/;
     }

data/templates/yunohost/services.yml

@@ -17,7 +17,6 @@ redis-server:
 mysql:
   log: [/var/log/mysql.log,/var/log/mysql.err]
   alternates: ['mariadb']
-glances: {}
 ssh:
   log: /var/log/auth.log
 metronome:
@@ -32,6 +31,7 @@ yunohost-firewall:
   need_lock: true
 nslcd:
   log: /var/log/syslog
+glances: null
 nsswitch: null
 ssl: null
 yunohost: null

debian/control

@@ -15,7 +15,7 @@ Depends: ${python:Depends}, ${misc:Depends}
  , python-psutil, python-requests, python-dnspython, python-openssl
  , python-apt, python-miniupnpc, python-dbus, python-jinja2
  , python-toml
- , glances, apt-transport-https
+ , apt-transport-https
  , dnsutils, bind9utils, unzip, git, curl, cron, wget, jq
  , ca-certificates, netcat-openbsd, iproute2
  , mariadb-server, php-mysql | php-mysqlnd

locales/ar.json

@@ -211,8 +211,8 @@
     "mail_domain_unknown": "Unknown mail address domain '{domain:s}'",
     "mail_forward_remove_failed": "Unable to remove mail forward '{mail:s}'",
     "mailbox_used_space_dovecot_down": "Dovecot mailbox service need to be up, if you want to get mailbox used space",
-    "maindomain_change_failed": "Unable to change the main domain",
+    "main_domain_change_failed": "Unable to change the main domain",
-    "maindomain_changed": "The main domain has been changed",
+    "main_domain_changed": "The main domain has been changed",
     "migrate_tsig_end": "Migration to hmac-sha512 finished",
     "migrate_tsig_failed": "Migrating the dyndns domain {domain} to hmac-sha512 failed, rolling back. Error: {error_code} - {error}",
     "migrate_tsig_start": "Not secure enough key algorithm detected for TSIG signature of domain '{domain}', initiating migration to the more secure one hmac-sha512",
@@ -404,7 +404,7 @@
     "log_user_create": "إضافة المستخدم '{}'",
     "log_user_delete": "حذف المستخدم '{}'",
     "log_user_update": "تحديث معلومات المستخدم '{}'",
-    "log_tools_maindomain": "جعل '{}' كنطاق أساسي",
+    "log_domain_main_domain": "جعل '{}' كنطاق أساسي",
     "log_tools_upgrade": "تحديث حُزم ديبيان",
     "log_tools_shutdown": "إطفاء الخادم",
     "log_tools_reboot": "إعادة تشغيل الخادم",

locales/ca.json

@@ -271,7 +271,7 @@
     "log_user_create": "Afegeix l'usuari « {} »",
     "log_user_delete": "Elimina l'usuari « {} »",
     "log_user_update": "Actualitza la informació de l'usuari « {} »",
-    "log_tools_maindomain": "Fes de « {} » el domini principal",
+    "log_domain_main_domain": "Fes de « {} » el domini principal",
     "log_tools_migrations_migrate_forward": "Migrar",
     "log_tools_migrations_migrate_backward": "Migrar endarrera",
     "log_tools_postinstall": "Fer la post instal·lació del servidor YunoHost",
@@ -289,8 +289,8 @@
     "mail_forward_remove_failed": "No s'han pogut eliminar el reenviament de correu «{mail:s}»",
     "mailbox_used_space_dovecot_down": "S'ha d'engegar el servei de correu Dovecot, per poder obtenir l'espai utilitzat per la bústia de correu",
     "mail_unavailable": "Aquesta adreça de correu està reservada i ha de ser atribuïda automàticament el primer usuari",
-    "maindomain_change_failed": "No s'ha pogut canviar el domini principal",
+    "main_domain_change_failed": "No s'ha pogut canviar el domini principal",
-    "maindomain_changed": "S'ha canviat el domini principal",
+    "main_domain_changed": "S'ha canviat el domini principal",
     "migrate_tsig_end": "La migració cap a HMAC-SHA-512 s'ha acabat",
     "migrate_tsig_failed": "Ha fallat la migració del domini DynDNS «{domain}» cap a HMAC-SHA-512, anul·lant les modificacions. Error: {error_code}, {error}",
     "migrate_tsig_start": "L'algoritme de generació de claus no es prou segur per a la signatura TSIG del domini «{domain}», començant la migració cap a un de més segur HMAC-SHA-512",
@@ -626,5 +626,6 @@
     "permission_already_up_to_date": "No s'ha actualitzat el permís perquè la petició d'afegir/eliminar ja corresponent a l'estat actual.",
     "permission_currently_allowed_for_visitors": "El permís ja el tenen el grup de visitants a més d'altres grups. Segurament s'hauria de revocar el permís al grup dels visitants o eliminar els altres grups als que s'ha atribuït.",
     "permission_currently_allowed_for_all_users": "El permís ha el té el grup de tots els usuaris (all_users) a més d'altres grups. Segurament s'hauria de revocar el permís a «all_users» o eliminar els altres grups als que s'ha atribuït.",
-    "permission_require_account": "El permís {permission} només té sentit per als usuaris que tenen un compte, i per tant no es pot activar per als visitants."
+    "permission_require_account": "El permís {permission} només té sentit per als usuaris que tenen un compte, i per tant no es pot activar per als visitants.",
+    "app_remove_after_failed_install": "Eliminant l'aplicació després que hagi fallat la instal·lació…"
 }

locales/de.json

@@ -104,8 +104,8 @@
     "mail_alias_remove_failed": "E-Mail Alias '{mail:s}' konnte nicht entfernt werden",
     "mail_domain_unknown": "Unbekannte Mail Domain '{domain:s}'",
     "mail_forward_remove_failed": "Mailweiterleitung '{mail:s}' konnte nicht entfernt werden",
-    "maindomain_change_failed": "Die Hauptdomain konnte nicht geändert werden",
+    "main_domain_change_failed": "Die Hauptdomain konnte nicht geändert werden",
-    "maindomain_changed": "Die Hauptdomain wurde geändert",
+    "main_domain_changed": "Die Hauptdomain wurde geändert",
     "monitor_disabled": "Das Servermonitoring wurde erfolgreich deaktiviert",
     "monitor_enabled": "Das Servermonitoring wurde aktiviert",
     "monitor_glances_con_failed": "Verbindung mit Glances nicht möglich",
@@ -293,7 +293,7 @@
     "backup_abstract_method": "Diese Backup-Methode wird noch nicht unterstützt",
     "backup_applying_method_tar": "Erstellen des Backup-tar Archives…",
     "backup_applying_method_copy": "Kopiere alle Dateien ins Backup…",
-    "app_change_url_no_script": "Die Anwendung '{app_name:s}' unterstützt bisher keine URL-Modufikation. Vielleicht gibt es eine Aktualisierung.",
+    "app_change_url_no_script": "Die Anwendung '{app_name:s}' unterstützt bisher keine URL-Modifikation. Vielleicht sollte sie aktualisiert werden.",
     "app_location_unavailable": "Diese URL ist nicht verfügbar oder wird von einer installierten Anwendung genutzt:\n{apps:s}",
     "backup_applying_method_custom": "Rufe die benutzerdefinierte Backup-Methode '{method:s}' auf…",
     "backup_archive_system_part_not_available": "Der System-Teil '{part:s}' ist in diesem Backup nicht enthalten",
@@ -350,7 +350,7 @@
     "app_start_remove": "Anwendung {app} wird entfernt…",
     "app_start_install": "Anwendung {app} wird installiert…",
     "app_not_upgraded": "Die App '{failed_app}' konnte nicht aktualisiert werden. Infolgedessen wurden die folgenden App-Upgrades abgebrochen: {apps}",
-    "app_make_default_location_already_used": "Die App \"{app}\" kann nicht als Standard für die Domain \"{domain}\" festgelegt werden. Sie wird bereits von der anderen App \"{other_app}\" verwendet",
+    "app_make_default_location_already_used": "Die App \"{app}\" kann nicht als Standard für die Domain \"{domain}\" festgelegt werden. Sie wird bereits von der App \"{other_app}\" verwendet",
     "aborting": "Breche ab.",
     "app_action_cannot_be_ran_because_required_services_down": "Diese App erfordert einige Dienste, die derzeit nicht verfügbar sind. Bevor Sie fortfahren, sollten Sie versuchen, die folgenden Dienste neu zu starten (und möglicherweise untersuchen, warum sie nicht verfügbar sind): {services}",
     "already_up_to_date": "Nichts zu tun. Alles ist bereits auf dem neusten Stand.",
@@ -414,5 +414,8 @@
     "global_settings_key_doesnt_exists": "Der Schlüssel'{settings_key:s}' existiert nicht in den globalen Einstellungen, du kannst  alle verfügbaren Schlüssel sehen, indem du 'yunohost settings list' ausführst",
     "log_app_makedefault": "Mache '{}' zur Standard-Anwendung",
     "hook_json_return_error": "Konnte die Rückkehr vom Einsprungpunkt {path:s} nicht lesen. Fehler: {msg:s}. Unformatierter Inhalt: {raw_content}",
-    "app_full_domain_unavailable": "Es tut uns leid, aber diese Anwendung erfordert die Installation einer vollständigen Domäne, aber einige andere Anwendungen sind bereits auf der Domäne'{domain}' installiert. Eine mögliche Lösung ist das Hinzufügen und Verwenden einer Subdomain, die dieser Anwendung zugeordnet ist."
+    "app_full_domain_unavailable": "Es tut uns leid, aber diese Anwendung erfordert die Installation auf einer eigenen Domain, aber einige andere Anwendungen sind bereits auf der Domäne'{domain}' installiert. Eine mögliche Lösung ist das Hinzufügen und Verwenden einer Subdomain, die dieser Anwendung zugeordnet ist.",
+    "app_install_failed": "Installation von {app} fehlgeschlagen: {error}",
+    "app_install_script_failed": "Im Installationsscript ist ein Fehler aufgetreten",
+    "app_remove_after_failed_install": "Entfernen der App nach fehlgeschlagener Installation…"
 }

locales/en.json

@@ -21,7 +21,6 @@
     "app_extraction_failed": "Could not extract the installation files",
     "app_full_domain_unavailable": "Sorry, this app must be installed on a domain of its own, but other apps are already installed on the domain '{domain}'. You could use a subdomain dedicated to this app instead.",
     "app_id_invalid": "Invalid app ID",
-    "app_incompatible": "The app {app} is incompatible with your YunoHost version",
     "app_install_files_invalid": "These files cannot be installed",
     "app_install_failed": "Could not install {app}: {error}",
     "app_install_script_failed": "An error occurred inside the app installation script",
@@ -146,19 +145,82 @@
     "confirm_app_install_thirdparty": "DANGER! This app is not part of Yunohost's app catalog. Installing third-party apps may compromise the integrity and security of your system. You should probably NOT install it unless you know what you are doing. NO SUPPORT will be provided if this app doesn't work or break your system… If you are willing to take that risk anyway, type '{answers:s}'",
     "custom_app_url_required": "You must provide a URL to upgrade your custom app {app:s}",
     "custom_appslist_name_required": "You must provide a name for your custom app list",
-    "diagnosis_debian_version_error": "Could not retrieve the Debian version: {error}",
+    "diagnosis_basesystem_host": "Server is running Debian {debian_version}.",
-    "diagnosis_kernel_version_error": "Could not retrieve kernel version: {error}",
+    "diagnosis_basesystem_kernel": "Server is running Linux kernel {kernel_version}",
-    "diagnosis_monitor_disk_error": "Could not monitor disks: {error}",
+    "diagnosis_basesystem_ynh_single_version": "{0} version: {1} ({2})",
-    "diagnosis_monitor_system_error": "Could not monitor system: {error}",
+    "diagnosis_basesystem_ynh_main_version": "Server is running YunoHost {main_version} ({repo})",
-    "diagnosis_no_apps": "No such installed app",
+    "diagnosis_basesystem_ynh_inconsistent_versions": "You are running inconsistents versions of the YunoHost packages ... most probably because of a failed or partial upgrade.",
-    "dpkg_is_broken": "You cannot do this right now because dpkg/APT (the system package managers) seems to be in a broken state… You can try to solve this issue by connecting through SSH and running `sudo dpkg --configure -a`.",
+    "diagnosis_display_tip_web": "You can go to the Diagnosis section (in the home screen) to see the issues found.",
-    "dpkg_lock_not_available": "This command can't be ran right now because another program seems to be using the lock of dpkg (the system package manager)",
+    "diagnosis_display_tip_cli": "You can run 'yunohost diagnosis show --issues' to display the issues found.",
-    "domain_cannot_remove_main": "Cannot remove main domain. Set one first",
+    "diagnosis_failed_for_category": "Diagnosis failed for category '{category}' : {error}",
+    "diagnosis_cache_still_valid": "(Cache still valid for {category} diagnosis. Not re-diagnosing yet!)",
+    "diagnosis_cant_run_because_of_dep": "Can't run diagnosis for {category} while there are important issues related to {dep}.",
+    "diagnosis_ignored_issues": "(+ {nb_ignored} ignored issue(s))",
+    "diagnosis_found_errors": "Found {errors} significant issue(s) related to {category}!",
+    "diagnosis_found_errors_and_warnings": "Found {errors} significant issue(s) (and {warnings} warning(s)) related to {category}!",
+    "diagnosis_found_warnings": "Found {warnings} item(s) that could be improved for {category}.",
+    "diagnosis_everything_ok": "Everything looks good for {category}!",
+    "diagnosis_failed": "Failed to fetch diagnosis result for category '{category}' : {error}",
+    "diagnosis_ip_connected_ipv4": "The server is connected to the Internet through IPv4 !",
+    "diagnosis_ip_no_ipv4": "The server does not have a working IPv4.",
+    "diagnosis_ip_connected_ipv6": "The server is connected to the Internet through IPv6 !",
+    "diagnosis_ip_no_ipv6": "The server does not have a working IPv6.",
+    "diagnosis_ip_not_connected_at_all": "The server does not seem to be connected to the Internet at all!?",
+    "diagnosis_ip_dnsresolution_working": "Domain name resolution is working!",
+    "diagnosis_ip_broken_dnsresolution": "Domain name resolution seems to be broken for some reason ... Is a firewall blocking DNS requests ?",
+    "diagnosis_ip_broken_resolvconf": "Domain name resolution seems to be broken on your server, which seems related to /etc/resolv.conf not pointing to 127.0.0.1.",
+    "diagnosis_ip_weird_resolvconf": "DNS resolution seems to be working, but be careful that you seem to be using a custom /etc/resolv.conf.",
+    "diagnosis_ip_weird_resolvconf_details": "Instead, this file should be a symlink to /etc/resolvconf/run/resolv.conf itself pointing to 127.0.0.1 (dnsmasq). The actual resolvers should be configured via /etc/resolv.dnsmasq.conf.",
+    "diagnosis_dns_good_conf": "Good DNS configuration for domain {domain} (category {category})",
+    "diagnosis_dns_bad_conf": "Bad / missing DNS configuration for domain {domain} (category {category})",
+    "diagnosis_dns_missing_record": "According to the recommended DNS configuration, you should add a DNS record with type {0}, name {1} and value {2}",
+    "diagnosis_dns_discrepancy": "According to the recommended DNS configuration, the value for the DNS record with type {0} and name {1} should be {2}, not {3}.",
+    "diagnosis_services_good_status": "Service {service} is {status} as expected!",
+    "diagnosis_services_bad_status": "Service {service} is {status} :/",
+    "diagnosis_diskusage_verylow": "Storage {mountpoint} (on device {device}) has only {free_abs_GB} GB ({free_percent}%) space remaining. You should really consider cleaning up some space.",
+    "diagnosis_diskusage_low": "Storage {mountpoint} (on device {device}) has only {free_abs_GB} GB ({free_percent}%) space remaining. Be careful.",
+    "diagnosis_diskusage_ok": "Storage {mountpoint} (on device {device}) still has {free_abs_GB} GB ({free_percent}%) space left!",
+    "diagnosis_ram_verylow": "The system has only {available_abs_MB} MB ({available_percent}%) RAM left! (out of {total_abs_MB} MB)",
+    "diagnosis_ram_low": "The system has {available_abs_MB} MB ({available_percent}%) RAM left out of {total_abs_MB} MB. Be careful.",
+    "diagnosis_ram_ok": "The system still has {available_abs_MB} MB ({available_percent}%) RAM left out of {total_abs_MB} MB.",
+    "diagnosis_swap_none": "The system has no swap at all. You should consider adding at least 256 MB of swap to avoid situations where the system runs out of memory.",
+    "diagnosis_swap_notsomuch": "The system has only {total_MB} MB swap. You should consider having at least 256 MB to avoid situations where the system runs out of memory.",
+    "diagnosis_swap_ok": "The system has {total_MB} MB of swap!",
+    "diagnosis_mail_ougoing_port_25_ok": "Outgoing port 25 is not blocked and email can be sent to other servers.",
+    "diagnosis_mail_ougoing_port_25_blocked": "Outgoing port 25 appears to be blocked. You should try to unblock it in your internet service provider (or hoster) configuration panel. Meanwhile, the server won't be able to send emails to other servers.",
+    "diagnosis_regenconf_allgood": "All configurations files are in line with the recommended configuration!",
+    "diagnosis_regenconf_manually_modified": "Configuration file {file} was manually modified.",
+    "diagnosis_regenconf_manually_modified_details": "This is probably OK as long as you know what you're doing ;) !",
+    "diagnosis_regenconf_manually_modified_debian": "Configuration file {file} was manually modified compared to Debian's default.",
+    "diagnosis_regenconf_manually_modified_debian_details": "This may probably be OK, but gotta keep an eye on it...",
+    "diagnosis_regenconf_nginx_conf_broken": "The nginx configuration appears to be broken!",
+    "diagnosis_security_all_good": "No critical security vulnerability was found.",
+    "diagnosis_security_vulnerable_to_meltdown": "You appear vulnerable to the Meltdown criticial security vulnerability",
+    "diagnosis_security_vulnerable_to_meltdown_details": "To fix this, you should upgrade your system and reboot to load the new linux kernel (or contact your server provider if this doesn't work). See https://meltdownattack.com/ for more infos.",
+    "diagnosis_description_basesystem": "Base system",
+    "diagnosis_description_ip": "Internet connectivity",
+    "diagnosis_description_dnsrecords": "DNS records",
+    "diagnosis_description_services": "Services status check",
+    "diagnosis_description_systemresources": "System resources",
+    "diagnosis_description_ports": "Ports exposure",
+    "diagnosis_description_http": "HTTP exposure",
+    "diagnosis_description_mail": "Email",
+    "diagnosis_description_regenconf": "System configurations",
+    "diagnosis_description_security": "Security checks",
+    "diagnosis_ports_could_not_diagnose": "Could not diagnose if ports are reachable from outside. Error: {error}",
+    "diagnosis_ports_unreachable": "Port {port} is not reachable from outside.",
+    "diagnosis_ports_ok": "Port {port} is reachable from outside.",
+    "diagnosis_http_could_not_diagnose": "Could not diagnose if domain is reachable from outside. Error: {error}",
+    "diagnosis_http_ok": "Domain {domain} is reachable from outside.",
+    "diagnosis_http_unreachable": "Domain {domain} is unreachable through HTTP from outside.",
+    "diagnosis_unknown_categories": "The following categories are unknown : {categories}",
+    "domain_cannot_remove_main": "You cannot remove '{domain:s}' since it's the main domain, you need first to set another domain as the main domain using 'yunohost domain main-domain -n <another-domain>', here is the list of candidate domains: {other_domains:s}",
+    "domain_cannot_remove_main_add_new_one": "You cannot remove '{domain:s}' since it's the main domain and your only domain, you need to first add another domain using 'yunohost domain add <another-domain.com>', then set is as the main domain using 'yunohost domain main-domain -n <another-domain.com>' and then you can remove the domain '{domain:s}' using 'yunohost domain remove {domain:s}'.'",
     "domain_cert_gen_failed": "Could not generate certificate",
     "domain_created": "Domain created",
-    "domain_creation_failed": "Could not create domain {domain}: {error}",
+    "domain_creation_failed": "Unable to create domain {domain}: {error}",
     "domain_deleted": "Domain deleted",
-    "domain_deletion_failed": "Could not delete domain {domain}: {error}",
+    "domain_deletion_failed": "Unable to delete domain {domain}: {error}",
     "domain_dns_conf_is_just_a_recommendation": "This command shows you the *recommended* configuration. It does not actually set up the DNS configuration for you. It is your responsability to configure your DNS zone in your registrar according to this recommendation.",
     "domain_dyndns_already_subscribed": "You have already subscribed to a DynDNS domain",
     "domain_dyndns_root_unknown": "Unknown DynDNS root domain",
@@ -169,6 +231,8 @@
     "domains_available": "Available domains:",
     "done": "Done",
     "downloading": "Downloading…",
+    "dpkg_is_broken": "You cannot do this right now because dpkg/APT (the system package managers) seems to be in a broken state… You can try to solve this issue by connecting through SSH and running `sudo dpkg --configure -a`.",
+    "dpkg_lock_not_available": "This command can't be ran right now because another program seems to be using the lock of dpkg (the system package manager)",
     "dyndns_could_not_check_provide": "Could not check if {provider:s} can provide {domain:s}.",
     "dyndns_could_not_check_available": "Could not check if {domain:s} is available on {provider:s}.",
     "dyndns_cron_installed": "DynDNS cron job created",
@@ -276,7 +340,7 @@
     "log_user_update": "Update user info of '{}'",
     "log_user_permission_update": "Update accesses for permission '{}'",
     "log_user_permission_reset": "Reset permission '{}'",
-    "log_tools_maindomain": "Make '{}' the main domain",
+    "log_domain_main_domain": "Make '{}' as main domain",
     "log_tools_migrations_migrate_forward": "Migrate forward",
     "log_tools_postinstall": "Postinstall your YunoHost server",
     "log_tools_upgrade": "Upgrade system packages",
@@ -291,8 +355,8 @@
     "mailbox_disabled": "E-mail turned off for user {user:s}",
     "mailbox_used_space_dovecot_down": "The Dovecot mailbox service needs to be up, if you want to fetch used mailbox space",
     "mail_unavailable": "This e-mail address is reserved and shall be automatically allocated to the very first user",
-    "maindomain_change_failed": "Could not change the main domain",
+    "main_domain_change_failed": "Unable to change the main domain",
-    "maindomain_changed": "The main domain now changed",
+    "main_domain_changed": "The main domain has been changed",
     "migrate_tsig_end": "Migration to HMAC-SHA-512 finished",
     "migrate_tsig_failed": "Could not migrate the DynDNS domain '{domain}' to HMAC-SHA-512, rolling back. Error: {error_code}, {error}",
     "migrate_tsig_start": "Insufficiently secure key algorithm detected for TSIG signature of the domain '{domain}', initiating migration to the more secure HMAC-SHA-512",
@@ -369,26 +433,12 @@
     "migrations_skip_migration": "Skipping migration {id}…",
     "migrations_success_forward": "Migration {id} completed",
     "migrations_to_be_ran_manually":  "Migration {id} has to be run manually. Please go to Tools → Migrations on the webadmin page, or run `yunohost tools migrations migrate`.",
-    "monitor_disabled": "Server monitoring now off",
-    "monitor_enabled": "Server monitoring now on",
-    "monitor_glances_con_failed": "Could not connect to Glances server",
-    "monitor_not_enabled": "Server monitoring is off",
-    "monitor_period_invalid": "Invalid time period",
-    "monitor_stats_file_not_found": "Could not find the statistics file",
-    "monitor_stats_no_update": "No monitoring statistics to update",
-    "monitor_stats_period_unavailable": "No available statistics for the period",
-    "mountpoint_unknown": "Unknown mountpoint",
     "mysql_db_creation_failed": "Could not create MySQL database",
     "mysql_db_init_failed": "Could not initialize MySQL database",
     "mysql_db_initialized": "The MySQL database is now initialized",
-    "network_check_mx_ko": "DNS MX record is not set",
-    "network_check_smtp_ko": "Outbound e-mail (SMTP port 25) seems to be blocked by your network",
-    "network_check_smtp_ok": "Outbound e-mail (SMTP port 25) is not blocked",
     "no_internet_connection": "The server is not connected to the Internet",
     "not_enough_disk_space": "Not enough free space on '{path:s}'",
-    "operation_interrupted": "Was the operation manually interrupted?",
+    "operation_interrupted": "The operation was manually interrupted?",
-    "package_not_installed": "The package '{pkgname}' is not installed",
-    "package_unexpected_error": "An unexpected error occurred processing the package '{pkgname}'",
     "package_unknown": "Unknown package '{pkgname}'",
     "packages_upgrade_failed": "Could not upgrade all the packages",
     "password_listed": "This password is among the most used password in the world. Please choose something more unique.",
@@ -475,7 +525,6 @@
     "service_description_dnsmasq": "Handles domain name resolution (DNS)",
     "service_description_dovecot": "Allows e-mail clients to access/fetch email (via IMAP and POP3)",
     "service_description_fail2ban": "Protects against brute-force and other kinds of attacks from the Internet",
-    "service_description_glances": "Monitors system info on your server",
     "service_description_metronome": "Manage XMPP instant messaging accounts",
     "service_description_mysql": "Stores app data (SQL database)",
     "service_description_nginx": "Serves or provides access to all the websites hosted on your server",
@@ -525,7 +574,6 @@
     "tools_upgrade_special_packages_completed": "YunoHost package upgrade completed.\nPress [Enter] to get the command line back",
     "unbackup_app": "App '{app:s}' will not be saved",
     "unexpected_error": "Something unexpected went wrong: {error}",
-    "unit_unknown": "Unknown unit '{unit:s}'",
     "unlimit": "No quota",
     "unrestore_app": "App '{app:s}' will not be restored",
     "update_apt_cache_failed": "Could not to update the cache of APT (Debian's package manager). Here is a dump of the sources.list lines, which might help identify problematic lines: \n{sourceslist}",

locales/eo.json

@@ -141,7 +141,7 @@
     "field_invalid": "Nevalida kampo '{:s}'",
     "log_app_makedefault": "Faru '{}' la defaŭlta apliko",
     "migration_0003_still_on_jessie_after_main_upgrade": "Io okazis malbone dum la ĉefa ĝisdatigo: Ĉu la sistemo ankoraŭ estas en Jessie‽ Por esplori la aferon, bonvolu rigardi {log}:s …",
-    "migration_0011_can_not_backup_before_migration": "La sekurkopio de la sistemo antaŭ la migrado malsukcesis. Migrado malsukcesis. Eraro: {error:s}",
+    "migration_0011_can_not_backup_before_migration": "La sekurkopio de la sistemo ne povis finiĝi antaŭ ol la migrado malsukcesis. Eraro: {error:s}",
     "migration_0011_create_group": "Krei grupon por ĉiu uzanto…",
     "backup_system_part_failed": "Ne eblis sekurkopi la sistemon de '{part:s}'",
     "global_settings_setting_security_postfix_compatibility": "Kongruo vs sekureca kompromiso por la Postfix-servilo. Afektas la ĉifradojn (kaj aliajn aspektojn pri sekureco)",
@@ -151,8 +151,8 @@
     "migration_0011_backup_before_migration": "Krei sekurkopion de LDAP-datumbazo kaj agordojn antaŭ la efektiva migrado.",
     "migration_0011_LDAP_config_dirty": "Similas ke vi agordis vian LDAP-agordon. Por ĉi tiu migrado la LDAP-agordo bezonas esti ĝisdatigita.\nVi devas konservi vian aktualan agordon, reintaligi la originalan agordon per funkciado de \"yunohost iloj regen-conf -f\" kaj reprovi la migradon",
     "migration_0011_migrate_permission": "Migrado de permesoj de agordoj al aplikoj al LDAP…",
-    "migration_0011_migration_failed_trying_to_rollback": "Migrado malsukcesis ... provante reverti la sistemon.",
+    "migration_0011_migration_failed_trying_to_rollback": "Ne povis migri ... provante redakti la sistemon.",
-    "migrations_dependencies_not_satisfied": "Ne eblas kuri migradon {id} ĉar unue vi devas ruli ĉi tiujn migradojn: {dependencies_id}",
+    "migrations_dependencies_not_satisfied": "Rulu ĉi tiujn migradojn: '{dependencies_id}', antaŭ migrado {id}.",
     "migrations_failed_to_load_migration": "Ne povis ŝarĝi migradon {id}: {error}",
     "migrations_exclusive_options": "'--auto', '--skip' kaj '--force-rerun' estas reciproke ekskluzivaj ebloj.",
     "migrations_must_provide_explicit_targets": "Vi devas provizi eksplicitajn celojn kiam vi uzas '--skip' aŭ '--force-rerun'",
@@ -162,7 +162,7 @@
     "tools_upgrade_cant_hold_critical_packages": "Ne povis teni kritikajn pakojn…",
     "upnp_dev_not_found": "Neniu UPnP-aparato trovita",
     "migration_description_0012_postgresql_password_to_md5_authentication": "Devigu PostgreSQL-aŭtentigon uzi MD5 por lokaj ligoj",
-    "migration_0011_done": "Migrado sukcesis. Vi nun kapablas administri uzantajn grupojn.",
+    "migration_0011_done": "Migrado finiĝis. Vi nun kapablas administri uzantajn grupojn.",
     "migration_0011_LDAP_update_failed": "Ne povis ĝisdatigi LDAP. Eraro: {error:s}",
     "pattern_password": "Devas esti almenaŭ 3 signoj longaj",
     "root_password_desynchronized": "La pasvorta administranto estis ŝanĝita, sed YunoHost ne povis propagandi ĉi tion al la radika pasvorto!",
@@ -194,9 +194,9 @@
     "migration_0011_rollback_success": "Sistemo ruliĝis reen.",
     "migration_0011_update_LDAP_database": "Ĝisdatigante LDAP-datumbazon…",
     "migration_0011_update_LDAP_schema": "Ĝisdatigante LDAP-skemon…",
-    "migration_0011_failed_to_remove_stale_object": "Malsukcesis forigi neokazan objekton {dn}: {error}",
+    "migration_0011_failed_to_remove_stale_object": "Ne povis forigi neuzatan objekton {dn}: {error}",
     "migrations_already_ran": "Tiuj migradoj estas jam faritaj: {ids}",
-    "migrations_no_such_migration": "Estas neniu migrado nomata {id}",
+    "migrations_no_such_migration": "Estas neniu migrado nomata '{id}'",
     "permission_already_allowed": "Grupo '{group}' jam havas permeson '{permission}' ebligita'",
     "permission_already_disallowed": "Grupo '{group}' jam havas permeson '{permission}' malebligita'",
     "permission_cannot_remove_main": "Forigo de ĉefa permeso ne rajtas",
@@ -266,7 +266,7 @@
     "migration_description_0008_ssh_conf_managed_by_yunohost_step2": "Lasu la SSH-agordon estu administrata de YunoHost (paŝo 2, manlibro)",
     "restore_confirm_yunohost_installed": "Ĉu vi vere volas restarigi jam instalitan sistemon? [{answers:s}]",
     "pattern_positive_number": "Devas esti pozitiva nombro",
-    "monitor_stats_file_not_found": "Statistika dosiero ne trovita",
+    "monitor_stats_file_not_found": "Ne povis trovi la statistikan dosieron",
     "certmanager_error_no_A_record": "Neniu DNS 'A' rekordo trovita por '{domain:s}'. Vi bezonas atentigi vian domajnan nomon al via maŝino por povi instali atestilon Lasu-Ĉifri. (Se vi scias, kion vi faras, uzu '--no-checks' por malŝalti tiujn ĉekojn.)",
     "update_apt_cache_failed": "Ne eblis ĝisdatigi la kaŝmemoron de APT (paka administranto de Debian). Jen rubujo de la sources.list-linioj, kiuj povus helpi identigi problemajn liniojn:\n{sourcelist}",
     "migrations_no_migrations_to_run": "Neniuj migradoj por funkcii",
@@ -339,7 +339,7 @@
     "log_app_upgrade": "Ĝisdatigu la aplikon '{}'",
     "log_help_to_get_failed_log": "La operacio '{desc}' ne povis finiĝi. Bonvolu dividi la plenan ŝtipon de ĉi tiu operacio per la komando 'yunohost log display {name} --share' por akiri helpon",
     "migration_description_0002_migrate_to_tsig_sha256": "Plibonigu sekurecon de DynDNS TSIG-ĝisdatigoj per SHA-512 anstataŭ MD5",
-    "monitor_disabled": "Servila monitorado nun malŝaltis",
+    "monitor_disabled": "Servilo-monitorado nun malŝaltita",
     "pattern_port": "Devas esti valida havena numero (t.e. 0-65535)",
     "port_already_closed": "Haveno {port:d} estas jam fermita por {ip_version:s} rilatoj",
     "hook_name_unknown": "Nekonata hoko-nomo '{name:s}'",
@@ -407,7 +407,7 @@
     "migration_0003_not_jessie": "La nuna Debian-distribuo ne estas Jessie!",
     "user_unknown": "Nekonata uzanto: {user:s}",
     "migrations_to_be_ran_manually": "Migrado {id} devas funkcii permane. Bonvolu iri al Iloj → Migradoj en la retpaĝa paĝo, aŭ kuri `yunohost tools migrations migrate`.",
-    "migration_0008_warning": "Se vi komprenas tiujn avertojn kaj konsentas lasi YunoHost pretervidi vian nunan agordon, faru la migradon. Alie, vi ankaŭ povas salti la migradon - kvankam ĝi ne rekomendas.",
+    "migration_0008_warning": "Se vi komprenas tiujn avertojn kaj volas ke YunoHost preterlasu vian nunan agordon, faru la migradon. Alie, vi ankaŭ povas salti la migradon, kvankam ĝi ne rekomendas.",
     "certmanager_cert_renew_success": "Ni Ĉifru atestilon renovigitan por la domajno '{domain:s}'",
     "global_settings_reset_success": "Antaŭaj agordoj nun estas rezervitaj al {path:s}",
     "pattern_domain": "Devas esti valida domajna nomo (t.e. mia-domino.org)",
@@ -477,14 +477,14 @@
     "log_tools_maindomain": "Faru de '{}' la ĉefa domajno",
     "maindomain_change_failed": "Ne povis ŝanĝi la ĉefan domajnon",
     "mail_domain_unknown": "Nevalida retadreso por domajno '{domain:s}'. Bonvolu uzi domajnon administritan de ĉi tiu servilo.",
-    "migrations_cant_reach_migration_file": "Ne povis aliri migrajn dosierojn ĉe la vojo% s",
+    "migrations_cant_reach_migration_file": "Ne povis aliri migrajn dosierojn ĉe la vojo '% s'",
     "pattern_email": "Devas esti valida retpoŝtadreso (t.e.iu@domain.org)",
     "mail_alias_remove_failed": "Ne povis forigi retpoŝton alias '{mail:s}'",
     "regenconf_file_manually_removed": "La dosiero de agordo '{conf}' estis forigita permane, kaj ne estos kreita",
-    "monitor_enabled": "Servila monitorado nun ŝaltis",
+    "monitor_enabled": "Servilo-monitorado nun",
     "domain_exists": "La domajno jam ekzistas",
     "migration_description_0001_change_cert_group_to_sslcert": "Ŝanĝu grupajn permesojn de 'metronomo' al 'ssl-cert'",
-    "mysql_db_creation_failed": "MySQL-datumbazkreado malsukcesis",
+    "mysql_db_creation_failed": "Ne povis krei MySQL-datumbazon",
     "ldap_initialized": "LDAP inicializis",
     "migrate_tsig_not_needed": "Vi ne ŝajnas uzi DynDNS-domajnon, do neniu migrado necesas.",
     "certmanager_domain_cert_not_selfsigned": "La atestilo por domajno {domajno:s} ne estas mem-subskribita. Ĉu vi certas, ke vi volas anstataŭigi ĝin? (Uzu '--force' por fari tion.)",
@@ -495,7 +495,7 @@
     "global_settings_bad_choice_for_enum": "Malbona elekto por agordo {setting:s}, ricevita '{choice:s}', sed disponeblaj elektoj estas: {available_choices:s}",
     "server_shutdown": "La servilo haltos",
     "log_tools_migrations_migrate_forward": "Migri antaŭen",
-    "migration_0008_no_warning": "Neniu grava risko identigita pri superregado de via SSH-agordo, tamen oni ne povas esti absolute certa;)! Ekfunkciu la migradon por superregi ĝin. Alie, vi ankaŭ povas salti la migradon - kvankam ĝi ne rekomendas.",
+    "migration_0008_no_warning": "Supersalti vian SSH-agordon estu sekura, kvankam ĉi tio ne povas esti promesita! Ekfunkciu la migradon por superregi ĝin. Alie, vi ankaŭ povas salti la migradon, kvankam ĝi ne rekomendas.",
     "regenconf_now_managed_by_yunohost": "La agorda dosiero '{conf}' nun estas administrata de YunoHost (kategorio {category}).",
     "server_reboot_confirm": "Ĉu la servilo rekomencos tuj, ĉu vi certas? [{answers:s}]",
     "log_app_install": "Instalu la aplikon '{}'",
@@ -563,5 +563,6 @@
     "permission_currently_allowed_for_visitors": "Ĉi tiu permeso estas nuntempe donita al vizitantoj aldone al aliaj grupoj. Vi probable volas aŭ forigi la permeson de \"vizitantoj\" aŭ forigi la aliajn grupojn al kiuj ĝi nun estas koncedita.",
     "permission_currently_allowed_for_all_users": "Ĉi tiu permeso estas nuntempe donita al ĉiuj uzantoj aldone al aliaj grupoj. Vi probable volas aŭ forigi la permeson \"all_users\" aŭ forigi la aliajn grupojn, kiujn ĝi nuntempe donas.",
     "app_install_failed": "Ne povis instali {app} : {error}",
-    "app_install_script_failed": "Eraro okazis en la skripto de instalado de la app"
+    "app_install_script_failed": "Eraro okazis en la skripto de instalado de la app",
+    "app_remove_after_failed_install": "Forigado de la app post la instala fiasko …"
 }

locales/es.json

@@ -121,8 +121,8 @@
     "mail_alias_remove_failed": "No se pudo eliminar el alias de correo «{mail:s}»",
     "mail_domain_unknown": "Dirección de correo no válida para el dominio «{domain:s}». Use un dominio administrado por este servidor.",
     "mail_forward_remove_failed": "No se pudo eliminar el reenvío de correo «{mail:s}»",
-    "maindomain_change_failed": "No se pudo cambiar el dominio principal",
+    "main_domain_change_failed": "No se pudo cambiar el dominio principal",
-    "maindomain_changed": "El dominio principal ha cambiado",
+    "main_domain_changed": "El dominio principal ha cambiado",
     "monitor_disabled": "La monitorización del servidor está ahora desactivada",
     "monitor_enabled": "La monitorización del servidor está ahora activada",
     "monitor_glances_con_failed": "No se pudo conectar al servidor de Glances",
@@ -637,5 +637,6 @@
     "permission_already_up_to_date": "El permiso no se ha actualizado porque las peticiones de incorporación o eliminación ya coinciden con el estado actual.",
     "permission_currently_allowed_for_visitors": "Este permiso se concede actualmente a los visitantes además de otros grupos. Probablemente quiere o eliminar el permiso de «visitors» o eliminar los otros grupos a los que está otorgado actualmente.",
     "permission_currently_allowed_for_all_users": "Este permiso se concede actualmente a todos los usuarios además de los otros grupos. Probablemente quiere o eliminar el permiso de «all_users» o eliminar los otros grupos a los que está otorgado actualmente.",
-    "permission_require_account": "El permiso {permission} solo tiene sentido para usuarios con una cuenta y, por lo tanto, no se puede activar para visitantes."
+    "permission_require_account": "El permiso {permission} solo tiene sentido para usuarios con una cuenta y, por lo tanto, no se puede activar para visitantes.",
+    "app_remove_after_failed_install": "Eliminando la aplicación tras el fallo de instalación…"
 }

locales/eu.json

@@ -1 +1,3 @@
-{}
+{
+    "password_too_simple_1": "Pasahitzak gutxienez 8 karaktere izan behar ditu"
+}

locales/fr.json

@@ -122,8 +122,8 @@
     "mail_alias_remove_failed": "Impossible de supprimer l’alias de courriel '{mail:s}'",
     "mail_domain_unknown": "Le domaine '{domain:s}' de cette adress de courriel n'est pas valide. Merci d'utiliser un domain administré par ce serveur.",
     "mail_forward_remove_failed": "Impossible de supprimer le courriel de transfert '{mail:s}'",
-    "maindomain_change_failed": "Impossible de modifier le domaine principal",
+    "main_domain_change_failed": "Impossible de modifier le domaine principal",
-    "maindomain_changed": "Le domaine principal modifié",
+    "main_domain_changed": "Le domaine principal modifié",
     "monitor_disabled": "Surveillance du serveur est maintenant arrêté",
     "monitor_enabled": "La supervision du serveur est maintenant allumée",
     "monitor_glances_con_failed": "Impossible de se connecter au serveur Glances",
@@ -454,7 +454,7 @@
     "log_user_create": "Ajouter l’utilisateur '{}'",
     "log_user_delete": "Supprimer l’utilisateur '{}'",
     "log_user_update": "Mettre à jour les informations de l’utilisateur '{}'",
-    "log_tools_maindomain": "Faire de '{}' le domaine principal",
+    "log_domain_main_domain": "Faire de '{}' le domaine principal",
     "log_tools_migrations_migrate_forward": "Migrer vers",
     "log_tools_migrations_migrate_backward": "Revenir en arrière",
     "log_tools_postinstall": "Faire la post-installation de votre serveur YunoHost",
@@ -664,5 +664,6 @@
     "permission_currently_allowed_for_all_users": "Cette autorisation est actuellement accordée à tous les utilisateurs en plus des autres groupes. Vous voudrez probablement soit supprimer l'autorisation 'all_users', soit supprimer les autres groupes auxquels il est actuellement autorisé.",
     "app_install_failed": "Impossible d'installer {app}: {error}",
     "app_install_script_failed": "Une erreur est survenue dans le script d'installation de l'application",
-    "permission_require_account": "Permission {permission} n'a de sens que pour les utilisateurs ayant un compte et ne peut donc pas être activé pour les visiteurs."
+    "permission_require_account": "Permission {permission} n'a de sens que pour les utilisateurs ayant un compte et ne peut donc pas être activé pour les visiteurs.",
+    "app_remove_after_failed_install": "Supprimer l'application après l'échec de l'installation…"
 }

locales/it.json

@@ -136,8 +136,8 @@
     "mail_domain_unknown": "Dominio d'indirizzo mail '{domain:s}' sconosciuto",
     "mail_forward_remove_failed": "Impossibile rimuovere la mail inoltrata '{mail:s}'",
     "mailbox_used_space_dovecot_down": "Il servizio di posta elettronica Dovecot deve essere attivato se vuoi riportare lo spazio usato dalla posta elettronica",
-    "maindomain_change_failed": "Impossibile cambiare il dominio principale",
+    "main_domain_change_failed": "Impossibile cambiare il dominio principale",
-    "maindomain_changed": "Il dominio principale è stato cambiato",
+    "main_domain_changed": "Il dominio principale è stato cambiato",
     "monitor_disabled": "Il monitoraggio del sistema è stato disattivato",
     "monitor_enabled": "Il monitoraggio del sistema è stato attivato",
     "monitor_glances_con_failed": "Impossibile collegarsi al server Glances",
@@ -402,7 +402,7 @@
     "log_user_create": "Aggiungi l'utente '{}'",
     "log_user_delete": "Elimina l'utente '{}'",
     "log_user_update": "Aggiornate le informazioni dell'utente '{}'",
-    "log_tools_maindomain": "Rendi '{}' dominio principale",
+    "log_domain_main_domain": "Rendi '{}' dominio principale",
     "log_tools_migrations_migrate_forward": "Migra avanti",
     "log_tools_migrations_migrate_backward": "Migra indietro",
     "log_tools_postinstall": "Postinstallazione del tuo server YunoHost",

locales/oc.json

@@ -180,8 +180,8 @@
     "invalid_url_format": "Format d’URL pas valid",
     "ldap_initialized": "L’annuari LDAP es inicializat",
     "license_undefined": "indefinida",
-    "maindomain_change_failed": "Modificacion impossibla del domeni màger",
+    "main_domain_change_failed": "Modificacion impossibla del domeni màger",
-    "maindomain_changed": "Lo domeni màger es estat modificat",
+    "main_domain_changed": "Lo domeni màger es estat modificat",
     "migrate_tsig_end": "La migracion cap a hmac-sha512 es acabada",
     "migrate_tsig_wait_2": "2 minutas…",
     "migrate_tsig_wait_3": "1 minuta…",
@@ -440,7 +440,7 @@
     "log_user_create": "Ajustar l’utilizaire « {} »",
     "log_user_delete": "Levar l’utilizaire « {} »",
     "log_user_update": "Actualizar las informacions a l’utilizaire « {} »",
-    "log_tools_maindomain": "Far venir « {} » lo domeni màger",
+    "log_domain_main_domain": "Far venir « {} » lo domeni màger",
     "log_tools_migrations_migrate_forward": "Migrar",
     "log_tools_migrations_migrate_backward": "Tornar en arrièr",
     "log_tools_postinstall": "Realizar la post installacion del servidor YunoHost",

locales/pt.json

@@ -74,8 +74,8 @@
     "mail_alias_remove_failed": "Não foi possível remover a etiqueta de correio '{mail:s}'",
     "mail_domain_unknown": "Domínio de endereço de correio '{domain:s}' inválido. Por favor, usa um domínio administrado per esse servidor.",
     "mail_forward_remove_failed": "Não foi possível remover o reencaminhamento de correio '{mail:s}'",
-    "maindomain_change_failed": "Incapaz alterar o domínio raiz",
+    "main_domain_change_failed": "Incapaz alterar o domínio raiz",
-    "maindomain_changed": "Domínio raiz alterado com êxito",
+    "main_domain_changed": "Domínio raiz alterado com êxito",
     "monitor_disabled": "Monitorização do servidor parada com êxito",
     "monitor_enabled": "Monitorização do servidor ativada com êxito",
     "monitor_glances_con_failed": "Não foi possível ligar ao servidor Glances",

locales/sv.json

@@ -1,3 +1,11 @@
 {
-    "password_too_simple_1": "Lösenordet måste bestå av minst åtta tecken"
+    "password_too_simple_1": "Lösenordet måste bestå av minst åtta tecken",
+    "app_action_broke_system": "Åtgärden verkar ha fått följande viktiga tjänster att haverera: {services}",
+    "already_up_to_date": "Ingenting att göra. Allt är redan uppdaterat.",
+    "admin_password": "Administratörslösenord",
+    "admin_password_too_long": "Välj gärna ett lösenord som inte innehåller fler än 127 tecken",
+    "admin_password_change_failed": "Kan inte byta lösenord",
+    "action_invalid": "Ej tillåten åtgärd '{action:s}'",
+    "admin_password_changed": "Administratörskontots lösenord ändrades",
+    "aborting": "Avbryter."
 }

locales/tr.json

@@ -1 +1,3 @@
-{}
+{
+    "password_too_simple_1": "Şifre en az 8 karakter uzunluğunda olmalı"
+}

src/yunohost/app.py

@@ -1107,28 +1107,6 @@ def app_clearaccess(apps):
     return {'allowed_users': output}
 
 
-def app_debug(app):
-    """
-    Display debug informations for an app
-
-    Keyword argument:
-        app
-    """
-    manifest = _get_manifest_of_app(os.path.join(APPS_SETTING_PATH, app))
-
-    return {
-        'name': manifest['id'],
-        'label': manifest['name'],
-        'services': [{
-            "name": x,
-            "logs": [{
-                "file_name": y,
-                "file_content": "\n".join(z),
-            } for (y, z) in sorted(service_log(x).items(), key=lambda x: x[0])],
-        } for x in sorted(manifest.get("services", []))]
-    }
-
-
 @is_unit_operation()
 def app_makedefault(operation_logger, app, domain=None):
     """
@@ -1465,7 +1443,8 @@ def app_ssowatconf():
     for domain in domains:
         skipped_urls.extend([domain + '/yunohost/admin', domain + '/yunohost/api'])
 
-    # Authorize ACME challenge url
+    # Authorize ynh remote diagnosis, ACME challenge and mail autoconfig urls
+    skipped_regex.append("^[^/]*/%.well%-known/ynh%-diagnosis/.*$")
     skipped_regex.append("^[^/]*/%.well%-known/acme%-challenge/.*$")
     skipped_regex.append("^[^/]*/%.well%-known/autoconfig/mail/config%-v1%.1%.xml.*$")
 
@@ -2474,38 +2453,14 @@ def _check_manifest_requirements(manifest, app_instance_name):
     """Check if required packages are met from the manifest"""
     requirements = manifest.get('requirements', dict())
 
-    # FIXME: Deprecate min_version key
+    if not requirements:
-    if 'min_version' in manifest:
-        requirements['yunohost'] = '>> {0}'.format(manifest['min_version'])
-        logger.debug("the manifest key 'min_version' is deprecated, "
-                     "use 'requirements' instead.")
-
-    # Validate multi-instance app
-    if is_true(manifest.get('multi_instance', False)):
-        # Handle backward-incompatible change introduced in yunohost >= 2.3.6
-        # See https://github.com/YunoHost/issues/issues/156
-        yunohost_req = requirements.get('yunohost', None)
-        if (not yunohost_req or
-                not packages.SpecifierSet(yunohost_req) & '>= 2.3.6'):
-            raise YunohostError('{0}{1}'.format(
-                m18n.g('colon', m18n.n('app_incompatible'), app=app_instance_name),
-                m18n.n('app_package_need_update', app=app_instance_name)))
-    elif not requirements:
         return
 
     logger.debug(m18n.n('app_requirements_checking', app=app_instance_name))
 
-    # Retrieve versions of each required package
-    try:
-        versions = packages.get_installed_version(
-            *requirements.keys(), strict=True, as_dict=True)
-    except packages.PackageException as e:
-        raise YunohostError('app_requirements_failed', error=str(e), app=app_instance_name)
-
     # Iterate over requirements
     for pkgname, spec in requirements.items():
-        version = versions[pkgname]
+        if not packages.meets_version_specifier(pkgname, spec):
-        if version not in packages.SpecifierSet(spec):
             raise YunohostError('app_requirements_unmeet',
                                 pkgname=pkgname, version=version,
                                 spec=spec, app=app_instance_name)

src/yunohost/backup.py

@@ -48,7 +48,6 @@ from yunohost.app import (
 from yunohost.hook import (
     hook_list, hook_info, hook_callback, hook_exec, CUSTOM_HOOK_FOLDER
 )
-from yunohost.monitor import binary_to_human
 from yunohost.tools import tools_postinstall
 from yunohost.regenconf import regen_conf
 from yunohost.log import OperationLogger
@@ -2492,3 +2491,23 @@ def disk_usage(path):
 
     du_output = subprocess.check_output(['du', '-sb', path])
     return int(du_output.split()[0].decode('utf-8'))
+
+
+def binary_to_human(n, customary=False):
+    """
+    Convert bytes or bits into human readable format with binary prefix
+    Keyword argument:
+        n -- Number to convert
+        customary -- Use customary symbol instead of IEC standard
+    """
+    symbols = ('Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi')
+    if customary:
+        symbols = ('K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y')
+    prefix = {}
+    for i, s in enumerate(symbols):
+        prefix[s] = 1 << (i + 1) * 10
+    for s in reversed(symbols):
+        if n >= prefix[s]:
+            value = float(n) / prefix[s]
+            return '%.1f%s' % (value, s)
+    return "%s" % n

src/yunohost/data_migrations/0011_setup_group_permission.py

@@ -7,7 +7,7 @@ from moulinette.utils.log import getActionLogger
 from moulinette.utils.filesystem import read_yaml
 
 from yunohost.tools import Migration
-from yunohost.user import user_group_create, user_group_update
+from yunohost.user import user_list, user_group_create, user_group_update
 from yunohost.app import app_setting, app_list
 from yunohost.regenconf import regen_conf, BACKUP_CONF_DIR
 from yunohost.permission import permission_create, user_permission_update, permission_sync_to_user
@@ -109,10 +109,11 @@ class MyMigration(Migration):
 
             url = "/" if domain and path else None
             if permission:
-                allowed_groups = permission.split(',')
+                known_users = user_list()["users"].keys()
+                allowed = [user for user in permission.split(',') if user in known_users]
             else:
-                allowed_groups = ["all_users"]
+                allowed = ["all_users"]
-            permission_create(app+".main", url=url, allowed=allowed_groups, sync_perm=False)
+            permission_create(app+".main", url=url, allowed=allowed, sync_perm=False)
 
             app_setting(app, 'allowed_users', delete=True)
 

src/yunohost/diagnosis.py

@@ -0,0 +1,426 @@
+# -*- coding: utf-8 -*-
+
+""" License
+
+    Copyright (C) 2018 YunoHost
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program; if not, see http://www.gnu.org/licenses
+
+"""
+
+""" diagnosis.py
+
+    Look for possible issues on the server
+"""
+
+import os
+import time
+
+from moulinette import m18n, msettings
+from moulinette.utils import log
+from moulinette.utils.filesystem import read_json, write_to_json, read_yaml, write_to_yaml
+
+from yunohost.utils.error import YunohostError
+from yunohost.hook import hook_list, hook_exec
+
+logger = log.getActionLogger('yunohost.diagnosis')
+
+DIAGNOSIS_CACHE = "/var/cache/yunohost/diagnosis/"
+DIAGNOSIS_CONFIG_FILE = '/etc/yunohost/diagnosis.yml'
+
+def diagnosis_list():
+    all_categories_names = [h for h, _ in _list_diagnosis_categories()]
+    return {"categories": all_categories_names}
+
+
+def diagnosis_show(categories=[], issues=False, full=False, share=False):
+
+    # Get all the categories
+    all_categories = _list_diagnosis_categories()
+    all_categories_names = [category for category, _ in all_categories]
+
+    # Check the requested category makes sense
+    if categories == []:
+        categories = all_categories_names
+    else:
+        unknown_categories = [c for c in categories if c not in all_categories_names]
+        if unknown_categories:
+            raise YunohostError('diagnosis_unknown_categories', categories=", ".join(categories))
+
+    # Fetch all reports
+    all_reports = []
+    for category in categories:
+        try:
+            report = Diagnoser.get_cached_report(category)
+        except Exception as e:
+            logger.error(m18n.n("diagnosis_failed", category=category, error=str(e)))
+        else:
+            add_ignore_flag_to_issues(report)
+            if not full:
+                del report["timestamp"]
+                del report["cached_for"]
+                report["items"] = [item for item in report["items"] if not item["ignored"]]
+                for item in report["items"]:
+                    del item["meta"]
+                    del item["ignored"]
+                    if "data" in item:
+                        del item["data"]
+            if issues:
+                report["items"] = [item for item in report["items"] if item["status"] in ["WARNING", "ERROR"]]
+                # Ignore this category if no issue was found
+                if not report["items"]:
+                    continue
+
+            all_reports.append(report)
+
+    if share:
+        from yunohost.utils.yunopaste import yunopaste
+        content = _dump_human_readable_reports(all_reports)
+        url = yunopaste(content)
+
+        logger.info(m18n.n("log_available_on_yunopaste", url=url))
+        if msettings.get('interface') == 'api':
+            return {"url": url}
+        else:
+            return
+    else:
+        return {"reports": all_reports}
+
+def _dump_human_readable_reports(reports):
+
+    output = ""
+
+    for report in reports:
+        output += "=================================\n"
+        output += "{description} ({id})\n".format(**report)
+        output += "=================================\n\n"
+        for item in report["items"]:
+            output += "[{status}] {summary}\n".format(**item)
+            for detail in item.get("details", []):
+                output += "  - " + detail + "\n"
+            output += "\n"
+        output += "\n\n"
+
+    return(output)
+
+
+def diagnosis_run(categories=[], force=False):
+
+    # Get all the categories
+    all_categories = _list_diagnosis_categories()
+    all_categories_names = [category for category, _ in all_categories]
+
+    # Check the requested category makes sense
+    if categories == []:
+        categories = all_categories_names
+    else:
+        unknown_categories = [c for c in categories if c not in all_categories_names]
+        if unknown_categories:
+            raise YunohostError('diagnosis_unknown_categories', categories=", ".join(unknown_categories))
+
+    issues = []
+    # Call the hook ...
+    diagnosed_categories = []
+    for category in categories:
+        logger.debug("Running diagnosis for %s ..." % category)
+        path = [p for n, p in all_categories if n == category][0]
+
+        try:
+            code, report = hook_exec(path, args={"force": force}, env=None)
+        except Exception as e:
+            logger.error(m18n.n("diagnosis_failed_for_category", category=category, error=str(e)), exc_info=True)
+        else:
+            diagnosed_categories.append(category)
+            if report != {}:
+                issues.extend([item for item in report["items"] if item["status"] in ["WARNING", "ERROR"]])
+
+    if issues:
+        if msettings.get("interface") == "api":
+            logger.info(m18n.n("diagnosis_display_tip_web"))
+        else:
+            logger.info(m18n.n("diagnosis_display_tip_cli"))
+
+    return
+
+
+def diagnosis_ignore(add_filter=None, remove_filter=None, list=False):
+    """
+    This action is meant for the admin to ignore issues reported by the
+    diagnosis system if they are known and understood by the admin.  For
+    example, the lack of ipv6 on an instance, or badly configured XMPP dns
+    records if the admin doesn't care so much about XMPP. The point being that
+    the diagnosis shouldn't keep complaining about those known and "expected"
+    issues, and instead focus on new unexpected issues that could arise.
+
+    For example, to ignore badly XMPP dnsrecords for domain yolo.test:
+
+        yunohost diagnosis ignore --add-filter dnsrecords domain=yolo.test category=xmpp
+                                                  ^              ^             ^
+                                            the general    additional       other
+                                            diagnosis       criterias       criteria
+                                            category to    to target        to target
+                                            act on           specific       specific
+                                                             reports        reports
+    Or to ignore all dnsrecords issues:
+
+        yunohost diagnosis ignore --add-filter dnsrecords
+
+    The filters are stored in the diagnosis configuration in a data structure like:
+
+    ignore_filters: {
+        "ip": [
+           {"version": 6}     # Ignore all issues related to ipv6
+        ],
+        "dnsrecords": [
+           {"domain": "yolo.test", "category": "xmpp"}, # Ignore all issues related to DNS xmpp records for yolo.test
+           {}                                           # Ignore all issues about dnsrecords
+        ]
+    }
+    """
+
+    # Ignore filters are stored in
+    configuration = _diagnosis_read_configuration()
+
+    if list:
+        return {"ignore_filters": configuration.get("ignore_filters", {})}
+
+    def validate_filter_criterias(filter_):
+
+        # Get all the categories
+        all_categories = _list_diagnosis_categories()
+        all_categories_names = [category for category, _ in all_categories]
+
+        # Sanity checks for the provided arguments
+        if len(filter_) == 0:
+            raise YunohostError("You should provide at least one criteria being the diagnosis category to ignore")
+        category = filter_[0]
+        if category not in all_categories_names:
+            raise YunohostError("%s is not a diagnosis category" % category)
+        if any("=" not in criteria for criteria in filter_[1:]):
+            raise YunohostError("Extra criterias should be of the form key=value (e.g. domain=yolo.test)")
+
+        # Convert the provided criteria into a nice dict
+        criterias = {c.split("=")[0]: c.split("=")[1] for c in filter_[1:]}
+
+        return category, criterias
+
+    if add_filter:
+
+        category, criterias = validate_filter_criterias(add_filter)
+
+        # Fetch current issues for the requested category
+        current_issues_for_this_category = diagnosis_show(categories=[category], issues=True, full=True)
+        current_issues_for_this_category = current_issues_for_this_category["reports"][0].get("items", {})
+
+        # Accept the given filter only if the criteria effectively match an existing issue
+        if not any(issue_matches_criterias(i, criterias) for i in current_issues_for_this_category):
+            raise YunohostError("No issues was found matching the given criteria.")
+
+        # Make sure the subdicts/lists exists
+        if "ignore_filters" not in configuration:
+            configuration["ignore_filters"] = {}
+        if category not in configuration["ignore_filters"]:
+            configuration["ignore_filters"][category] = []
+
+        if criterias in configuration["ignore_filters"][category]:
+            logger.warning("This filter already exists.")
+            return
+
+        configuration["ignore_filters"][category].append(criterias)
+        _diagnosis_write_configuration(configuration)
+        logger.success("Filter added")
+        return
+
+    if remove_filter:
+
+        category, criterias = validate_filter_criterias(remove_filter)
+
+        # Make sure the subdicts/lists exists
+        if "ignore_filters" not in configuration:
+            configuration["ignore_filters"] = {}
+        if category not in configuration["ignore_filters"]:
+            configuration["ignore_filters"][category] = []
+
+        if criterias not in configuration["ignore_filters"][category]:
+            raise YunohostError("This filter does not exists.")
+
+        configuration["ignore_filters"][category].remove(criterias)
+        _diagnosis_write_configuration(configuration)
+        logger.success("Filter removed")
+        return
+
+
+def _diagnosis_read_configuration():
+    if not os.path.exists(DIAGNOSIS_CONFIG_FILE):
+        return {}
+
+    return read_yaml(DIAGNOSIS_CONFIG_FILE)
+
+
+def _diagnosis_write_configuration(conf):
+    write_to_yaml(DIAGNOSIS_CONFIG_FILE, conf)
+
+
+def issue_matches_criterias(issue, criterias):
+    """
+    e.g. an issue with:
+       meta:
+          domain: yolo.test
+          category: xmpp
+
+    matches the criterias {"domain": "yolo.test"}
+    """
+    for key, value in criterias.items():
+        if key not in issue["meta"]:
+            return False
+        if str(issue["meta"][key]) != value:
+            return False
+    return True
+
+def add_ignore_flag_to_issues(report):
+    """
+    Iterate over issues in a report, and flag them as ignored if they match an
+    ignored filter from the configuration
+
+    N.B. : for convenience. we want to make sure the "ignored" key is set for
+    every item in the report
+    """
+
+    ignore_filters = _diagnosis_read_configuration().get("ignore_filters", {}).get(report["id"], [])
+
+    for report_item in report["items"]:
+        report_item["ignored"] = False
+        if report_item["status"] not in ["WARNING", "ERROR"]:
+            continue
+        for criterias in ignore_filters:
+            if issue_matches_criterias(report_item, criterias):
+                report_item["ignored"] = True
+                break
+
+
+############################################################
+
+
+class Diagnoser():
+
+    def __init__(self, args, env, loggers):
+
+        # FIXME ? That stuff with custom loggers is weird ... (mainly inherited from the bash hooks, idk)
+        self.logger_debug, self.logger_warning, self.logger_info = loggers
+        self.env = env
+        self.args = args or {}
+        self.cache_file = Diagnoser.cache_file(self.id_)
+        self.description = Diagnoser.get_description(self.id_)
+
+    def cached_time_ago(self):
+
+        if not os.path.exists(self.cache_file):
+            return 99999999
+        return time.time() - os.path.getmtime(self.cache_file)
+
+    def write_cache(self, report):
+        if not os.path.exists(DIAGNOSIS_CACHE):
+            os.makedirs(DIAGNOSIS_CACHE)
+        return write_to_json(self.cache_file, report)
+
+    def diagnose(self):
+
+        if not self.args.get("force", False) and self.cached_time_ago() < self.cache_duration:
+            self.logger_debug("Cache still valid : %s" % self.cache_file)
+            logger.info(m18n.n("diagnosis_cache_still_valid", category=self.description))
+            return 0, {}
+
+        for dependency in self.dependencies:
+            dep_report = Diagnoser.get_cached_report(dependency)
+            dep_errors = [item for item in dep_report["items"] if item["status"] == "ERROR"]
+            if dep_errors:
+                logger.error(m18n.n("diagnosis_cant_run_because_of_dep", category=self.description, dep=Diagnoser.get_description(dependency)))
+                return 1, {}
+
+        self.logger_debug("Running diagnostic for %s" % self.id_)
+
+        items = list(self.run())
+
+        new_report = {"id": self.id_,
+                      "cached_for": self.cache_duration,
+                      "items": items}
+
+        self.logger_debug("Updating cache %s" % self.cache_file)
+        self.write_cache(new_report)
+        Diagnoser.i18n(new_report)
+        add_ignore_flag_to_issues(new_report)
+
+        errors   = [item for item in new_report["items"] if item["status"] == "ERROR" and not item["ignored"]]
+        warnings = [item for item in new_report["items"] if item["status"] == "WARNING" and not item["ignored"]]
+        errors_ignored = [item for item in new_report["items"] if item["status"] == "ERROR" and item["ignored"]]
+        warning_ignored = [item for item in new_report["items"] if item["status"] == "WARNING" and item["ignored"]]
+        ignored_msg = " " + m18n.n("diagnosis_ignored_issues", nb_ignored=len(errors_ignored+warning_ignored)) if errors_ignored or warning_ignored else ""
+
+        if errors and warnings:
+            logger.error(m18n.n("diagnosis_found_errors_and_warnings", errors=len(errors), warnings=len(warnings), category=new_report["description"]) + ignored_msg)
+        elif errors:
+            logger.error(m18n.n("diagnosis_found_errors", errors=len(errors), category=new_report["description"]) + ignored_msg)
+        elif warnings:
+            logger.warning(m18n.n("diagnosis_found_warnings", warnings=len(warnings), category=new_report["description"]) + ignored_msg)
+        else:
+            logger.success(m18n.n("diagnosis_everything_ok", category=new_report["description"]) + ignored_msg)
+
+        return 0, new_report
+
+    @staticmethod
+    def cache_file(id_):
+        return os.path.join(DIAGNOSIS_CACHE, "%s.json" % id_)
+
+    @staticmethod
+    def get_cached_report(id_):
+        filename = Diagnoser.cache_file(id_)
+        report = read_json(filename)
+        report["timestamp"] = int(os.path.getmtime(filename))
+        Diagnoser.i18n(report)
+        return report
+
+    @staticmethod
+    def get_description(id_):
+        key = "diagnosis_description_" + id_
+        descr = m18n.n(key)
+        # If no description available, fallback to id
+        return descr if descr != key else id_
+
+    @staticmethod
+    def i18n(report):
+
+        # "Render" the strings with m18n.n
+        # N.B. : we do those m18n.n right now instead of saving the already-translated report
+        # because we can't be sure we'll redisplay the infos with the same locale as it
+        # was generated ... e.g. if the diagnosing happened inside a cron job with locale EN
+        # instead of FR used by the actual admin...
+
+        report["description"] = Diagnoser.get_description(report["id"])
+
+        for item in report["items"]:
+            summary_key, summary_args = item["summary"]
+            item["summary"] = m18n.n(summary_key, **summary_args)
+
+            if "details" in item:
+                item["details"] = [m18n.n(key, *values) for key, values in item["details"]]
+
+
+def _list_diagnosis_categories():
+    hooks_raw = hook_list("diagnosis", list_by="priority", show_info=True)["hooks"]
+    hooks = []
+    for _, some_hooks in sorted(hooks_raw.items(), key=lambda h: int(h[0])):
+        for name, info in some_hooks.items():
+            hooks.append((name, info["path"]))
+
+    return hooks

src/yunohost/domain.py

@@ -34,6 +34,7 @@ from moulinette.utils.log import getActionLogger
 
 import yunohost.certificate
 
+from yunohost.app import app_ssowatconf
 from yunohost.regenconf import regen_conf
 from yunohost.utils.network import get_public_ip
 from yunohost.log import is_unit_operation
@@ -154,7 +155,14 @@ def domain_remove(operation_logger, domain, force=False):
 
     # Check domain is not the main domain
     if domain == _get_maindomain():
-        raise YunohostError('domain_cannot_remove_main')
+        other_domains = domain_list()["domains"]
+        other_domains.remove(domain)
+
+        if other_domains:
+            raise YunohostError('domain_cannot_remove_main',
+                                domain=domain, other_domains="\n * " + ("\n * ".join(other_domains)))
+        else:
+            raise YunohostError('domain_cannot_remove_main_add_new_one', domain=domain)
 
     # Check if apps are installed on the domain
     for app in os.listdir('/etc/yunohost/apps/'):
@@ -233,6 +241,63 @@ def domain_dns_conf(domain, ttl=None):
     return result
 
 
+@is_unit_operation()
+def domain_main_domain(operation_logger, new_main_domain=None):
+    """
+    Check the current main domain, or change it
+
+    Keyword argument:
+        new_main_domain -- The new domain to be set as the main domain
+
+    """
+    from yunohost.tools import _set_hostname
+
+    # If no new domain specified, we return the current main domain
+    if not new_main_domain:
+        return {'current_main_domain': _get_maindomain()}
+
+    # Check domain exists
+    if new_main_domain not in domain_list()['domains']:
+        raise YunohostError('domain_unknown')
+
+    operation_logger.related_to.append(('domain', new_main_domain))
+    operation_logger.start()
+
+    # Apply changes to ssl certs
+    ssl_key = "/etc/ssl/private/yunohost_key.pem"
+    ssl_crt = "/etc/ssl/private/yunohost_crt.pem"
+    new_ssl_key = "/etc/yunohost/certs/%s/key.pem" % new_main_domain
+    new_ssl_crt = "/etc/yunohost/certs/%s/crt.pem" % new_main_domain
+
+    try:
+        if os.path.exists(ssl_key) or os.path.lexists(ssl_key):
+            os.remove(ssl_key)
+        if os.path.exists(ssl_crt) or os.path.lexists(ssl_crt):
+            os.remove(ssl_crt)
+
+        os.symlink(new_ssl_key, ssl_key)
+        os.symlink(new_ssl_crt, ssl_crt)
+
+        _set_maindomain(new_main_domain)
+    except Exception as e:
+        logger.warning("%s" % e, exc_info=1)
+        raise YunohostError('main_domain_change_failed')
+
+    _set_hostname(new_main_domain)
+
+    # Generate SSOwat configuration file
+    app_ssowatconf()
+
+    # Regen configurations
+    try:
+        with open('/etc/yunohost/installed', 'r'):
+            regen_conf()
+    except IOError:
+        pass
+
+    logger.success(m18n.n('main_domain_changed'))
+
+
 def domain_cert_status(domain_list, full=False):
     return yunohost.certificate.certificate_status(domain_list, full)
 

src/yunohost/monitor.py

@@ -1,740 +0,0 @@
-# -*- coding: utf-8 -*-
-
-""" License
-
-    Copyright (C) 2013 YunoHost
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program; if not, see http://www.gnu.org/licenses
-
-"""
-
-""" yunohost_monitor.py
-
-    Monitoring functions
-"""
-import re
-import json
-import time
-import psutil
-import calendar
-import subprocess
-import xmlrpclib
-import os.path
-import os
-import dns.resolver
-import cPickle as pickle
-from datetime import datetime
-
-from moulinette import m18n
-from yunohost.utils.error import YunohostError
-from moulinette.utils.log import getActionLogger
-
-from yunohost.utils.network import get_public_ip
-from yunohost.domain import _get_maindomain
-
-logger = getActionLogger('yunohost.monitor')
-
-GLANCES_URI = 'http://127.0.0.1:61209'
-STATS_PATH = '/var/lib/yunohost/stats'
-CRONTAB_PATH = '/etc/cron.d/yunohost-monitor'
-
-
-def monitor_disk(units=None, mountpoint=None, human_readable=False):
-    """
-    Monitor disk space and usage
-
-    Keyword argument:
-        units -- Unit(s) to monitor
-        mountpoint -- Device mountpoint
-        human_readable -- Print sizes in human readable format
-
-    """
-    glances = _get_glances_api()
-    result_dname = None
-    result = {}
-
-    if units is None:
-        units = ['io', 'filesystem']
-
-    _format_dname = lambda d: (os.path.realpath(d)).replace('/dev/', '')
-
-    # Get mounted devices
-    devices = {}
-    for p in psutil.disk_partitions(all=True):
-        if not p.device.startswith('/dev/') or not p.mountpoint:
-            continue
-        if mountpoint is None:
-            devices[_format_dname(p.device)] = p.mountpoint
-        elif mountpoint == p.mountpoint:
-            dn = _format_dname(p.device)
-            devices[dn] = p.mountpoint
-            result_dname = dn
-    if len(devices) == 0:
-        if mountpoint is not None:
-            raise YunohostError('mountpoint_unknown')
-        return result
-
-    # Retrieve monitoring for unit(s)
-    for u in units:
-        if u == 'io':
-            # Define setter
-            if len(units) > 1:
-                def _set(dn, dvalue):
-                    try:
-                        result[dn][u] = dvalue
-                    except KeyError:
-                        result[dn] = {u: dvalue}
-            else:
-                def _set(dn, dvalue):
-                    result[dn] = dvalue
-
-            # Iterate over values
-            devices_names = devices.keys()
-            for d in json.loads(glances.getDiskIO()):
-                dname = d.pop('disk_name')
-                try:
-                    devices_names.remove(dname)
-                except:
-                    continue
-                else:
-                    _set(dname, d)
-            for dname in devices_names:
-                _set(dname, 'not-available')
-        elif u == 'filesystem':
-            # Define setter
-            if len(units) > 1:
-                def _set(dn, dvalue):
-                    try:
-                        result[dn][u] = dvalue
-                    except KeyError:
-                        result[dn] = {u: dvalue}
-            else:
-                def _set(dn, dvalue):
-                    result[dn] = dvalue
-
-            # Iterate over values
-            devices_names = devices.keys()
-            for d in json.loads(glances.getFs()):
-                dname = _format_dname(d.pop('device_name'))
-                try:
-                    devices_names.remove(dname)
-                except:
-                    continue
-                else:
-                    d['avail'] = d['size'] - d['used']
-                    if human_readable:
-                        for i in ['used', 'avail', 'size']:
-                            d[i] = binary_to_human(d[i]) + 'B'
-                    _set(dname, d)
-            for dname in devices_names:
-                _set(dname, 'not-available')
-        else:
-            raise YunohostError('unit_unknown', unit=u)
-
-    if result_dname is not None:
-        return result[result_dname]
-    return result
-
-
-def monitor_network(units=None, human_readable=False):
-    """
-    Monitor network interfaces
-
-    Keyword argument:
-        units -- Unit(s) to monitor
-        human_readable -- Print sizes in human readable format
-
-    """
-    glances = _get_glances_api()
-    result = {}
-
-    if units is None:
-        units = ['check', 'usage', 'infos']
-
-    # Get network devices and their addresses
-    # TODO / FIXME : use functions in utils/network.py to manage this
-    devices = {}
-    output = subprocess.check_output('ip addr show'.split())
-    for d in re.split('^(?:[0-9]+: )', output, flags=re.MULTILINE):
-        # Extract device name (1) and its addresses (2)
-        m = re.match('([^\s@]+)(?:@[\S]+)?: (.*)', d, flags=re.DOTALL)
-        if m:
-            devices[m.group(1)] = m.group(2)
-
-    # Retrieve monitoring for unit(s)
-    for u in units:
-        if u == 'check':
-            result[u] = {}
-            domain = _get_maindomain()
-            cmd_check_smtp = os.system('/bin/nc -z -w1 yunohost.org 25')
-            if cmd_check_smtp == 0:
-                smtp_check = m18n.n('network_check_smtp_ok')
-            else:
-                smtp_check = m18n.n('network_check_smtp_ko')
-
-            try:
-                answers = dns.resolver.query(domain, 'MX')
-                mx_check = {}
-                i = 0
-                for server in answers:
-                    mx_id = 'mx%s' % i
-                    mx_check[mx_id] = server
-                    i = i + 1
-            except:
-                mx_check = m18n.n('network_check_mx_ko')
-            result[u] = {
-                'smtp_check': smtp_check,
-                'mx_check': mx_check
-            }
-        elif u == 'usage':
-            result[u] = {}
-            for i in json.loads(glances.getNetwork()):
-                iname = i['interface_name']
-                if iname in devices.keys():
-                    del i['interface_name']
-                    if human_readable:
-                        for k in i.keys():
-                            if k != 'time_since_update':
-                                i[k] = binary_to_human(i[k]) + 'B'
-                    result[u][iname] = i
-                else:
-                    logger.debug('interface name %s was not found', iname)
-        elif u == 'infos':
-            p_ipv4 = get_public_ip() or 'unknown'
-
-            # TODO / FIXME : use functions in utils/network.py to manage this
-            l_ip = 'unknown'
-            for name, addrs in devices.items():
-                if name == 'lo':
-                    continue
-                if not isinstance(l_ip, dict):
-                    l_ip = {}
-                l_ip[name] = _extract_inet(addrs)
-
-            gateway = 'unknown'
-            output = subprocess.check_output('ip route show'.split())
-            m = re.search('default via (.*) dev ([a-z]+[0-9]?)', output)
-            if m:
-                addr = _extract_inet(m.group(1), True)
-                if len(addr) == 1:
-                    proto, gateway = addr.popitem()
-
-            result[u] = {
-                'public_ip': p_ipv4,
-                'local_ip': l_ip,
-                'gateway': gateway,
-            }
-        else:
-            raise YunohostError('unit_unknown', unit=u)
-
-    if len(units) == 1:
-        return result[units[0]]
-    return result
-
-
-def monitor_system(units=None, human_readable=False):
-    """
-    Monitor system informations and usage
-
-    Keyword argument:
-        units -- Unit(s) to monitor
-        human_readable -- Print sizes in human readable format
-
-    """
-    glances = _get_glances_api()
-    result = {}
-
-    if units is None:
-        units = ['memory', 'cpu', 'process', 'uptime', 'infos']
-
-    # Retrieve monitoring for unit(s)
-    for u in units:
-        if u == 'memory':
-            ram = json.loads(glances.getMem())
-            swap = json.loads(glances.getMemSwap())
-            if human_readable:
-                for i in ram.keys():
-                    if i != 'percent':
-                        ram[i] = binary_to_human(ram[i]) + 'B'
-                for i in swap.keys():
-                    if i != 'percent':
-                        swap[i] = binary_to_human(swap[i]) + 'B'
-            result[u] = {
-                'ram': ram,
-                'swap': swap
-            }
-        elif u == 'cpu':
-            result[u] = {
-                'load': json.loads(glances.getLoad()),
-                'usage': json.loads(glances.getCpu())
-            }
-        elif u == 'process':
-            result[u] = json.loads(glances.getProcessCount())
-        elif u == 'uptime':
-            result[u] = (str(datetime.now() - datetime.fromtimestamp(psutil.boot_time())).split('.')[0])
-        elif u == 'infos':
-            result[u] = json.loads(glances.getSystem())
-        else:
-            raise YunohostError('unit_unknown', unit=u)
-
-    if len(units) == 1 and not isinstance(result[units[0]], str):
-        return result[units[0]]
-    return result
-
-
-def monitor_update_stats(period):
-    """
-    Update monitoring statistics
-
-    Keyword argument:
-        period -- Time period to update (day, week, month)
-
-    """
-    if period not in ['day', 'week', 'month']:
-        raise YunohostError('monitor_period_invalid')
-
-    stats = _retrieve_stats(period)
-    if not stats:
-        stats = {'disk': {}, 'network': {}, 'system': {}, 'timestamp': []}
-
-    monitor = None
-    # Get monitoring stats
-    if period == 'day':
-        monitor = _monitor_all('day')
-    else:
-        t = stats['timestamp']
-        p = 'day' if period == 'week' else 'week'
-        if len(t) > 0:
-            monitor = _monitor_all(p, t[len(t) - 1])
-        else:
-            monitor = _monitor_all(p, 0)
-    if not monitor:
-        raise YunohostError('monitor_stats_no_update')
-
-    stats['timestamp'].append(time.time())
-
-    # Append disk stats
-    for dname, units in monitor['disk'].items():
-        disk = {}
-        # Retrieve current stats for disk name
-        if dname in stats['disk'].keys():
-            disk = stats['disk'][dname]
-
-        for unit, values in units.items():
-            # Continue if unit doesn't contain stats
-            if not isinstance(values, dict):
-                continue
-
-            # Retrieve current stats for unit and append new ones
-            curr = disk[unit] if unit in disk.keys() else {}
-            if unit == 'io':
-                disk[unit] = _append_to_stats(curr, values, 'time_since_update')
-            elif unit == 'filesystem':
-                disk[unit] = _append_to_stats(curr, values, ['fs_type', 'mnt_point'])
-        stats['disk'][dname] = disk
-
-    # Append network stats
-    net_usage = {}
-    for iname, values in monitor['network']['usage'].items():
-        # Continue if units doesn't contain stats
-        if not isinstance(values, dict):
-            continue
-
-        # Retrieve current stats and append new ones
-        curr = {}
-        if 'usage' in stats['network'] and iname in stats['network']['usage']:
-            curr = stats['network']['usage'][iname]
-        net_usage[iname] = _append_to_stats(curr, values, 'time_since_update')
-    stats['network'] = {'usage': net_usage, 'infos': monitor['network']['infos']}
-
-    # Append system stats
-    for unit, values in monitor['system'].items():
-        # Continue if units doesn't contain stats
-        if not isinstance(values, dict):
-            continue
-
-        # Set static infos unit
-        if unit == 'infos':
-            stats['system'][unit] = values
-            continue
-
-        # Retrieve current stats and append new ones
-        curr = stats['system'][unit] if unit in stats['system'].keys() else {}
-        stats['system'][unit] = _append_to_stats(curr, values)
-
-    _save_stats(stats, period)
-
-
-def monitor_show_stats(period, date=None):
-    """
-    Show monitoring statistics
-
-    Keyword argument:
-        period -- Time period to show (day, week, month)
-
-    """
-    if period not in ['day', 'week', 'month']:
-        raise YunohostError('monitor_period_invalid')
-
-    result = _retrieve_stats(period, date)
-    if result is False:
-        raise YunohostError('monitor_stats_file_not_found')
-    elif result is None:
-        raise YunohostError('monitor_stats_period_unavailable')
-    return result
-
-
-def monitor_enable(with_stats=False):
-    """
-    Enable server monitoring
-
-    Keyword argument:
-        with_stats -- Enable monitoring statistics
-
-    """
-    from yunohost.service import (service_status, service_enable,
-                                  service_start)
-
-    glances = service_status('glances')
-    if glances['status'] != 'running':
-        service_start('glances')
-    if glances['loaded'] != 'enabled':
-        service_enable('glances')
-
-    # Install crontab
-    if with_stats:
-        # day: every 5 min  #  week: every 1 h  #  month: every 4 h  #
-        rules = ('*/5 * * * * root {cmd} day >> /dev/null\n'
-                 '3 * * * * root {cmd} week >> /dev/null\n'
-                 '6 */4 * * * root {cmd} month >> /dev/null').format(
-            cmd='/usr/bin/yunohost --quiet monitor update-stats')
-        with open(CRONTAB_PATH, 'w') as f:
-            f.write(rules)
-
-    logger.success(m18n.n('monitor_enabled'))
-
-
-def monitor_disable():
-    """
-    Disable server monitoring
-
-    """
-    from yunohost.service import (service_status, service_disable,
-                                  service_stop)
-
-    glances = service_status('glances')
-    if glances['status'] != 'inactive':
-        service_stop('glances')
-    if glances['loaded'] != 'disabled':
-        try:
-            service_disable('glances')
-        except YunohostError as e:
-            logger.warning(e.strerror)
-
-    # Remove crontab
-    try:
-        os.remove(CRONTAB_PATH)
-    except:
-        pass
-
-    logger.success(m18n.n('monitor_disabled'))
-
-
-def _get_glances_api():
-    """
-    Retrieve Glances API running on the local server
-
-    """
-    try:
-        p = xmlrpclib.ServerProxy(GLANCES_URI)
-        p.system.methodHelp('getAll')
-    except (xmlrpclib.ProtocolError, IOError):
-        pass
-    else:
-        return p
-
-    from yunohost.service import service_status
-
-    if service_status('glances')['status'] != 'running':
-        raise YunohostError('monitor_not_enabled')
-    raise YunohostError('monitor_glances_con_failed')
-
-
-def _extract_inet(string, skip_netmask=False, skip_loopback=True):
-    """
-    Extract IP addresses (v4 and/or v6) from a string limited to one
-    address by protocol
-
-    Keyword argument:
-        string -- String to search in
-        skip_netmask -- True to skip subnet mask extraction
-        skip_loopback -- False to include addresses reserved for the
-            loopback interface
-
-    Returns:
-        A dict of {protocol: address} with protocol one of 'ipv4' or 'ipv6'
-
-    """
-    ip4_pattern = '((25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}'
-    ip6_pattern = '(((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)'
-    ip4_pattern += '/[0-9]{1,2})' if not skip_netmask else ')'
-    ip6_pattern += '/[0-9]{1,3})' if not skip_netmask else ')'
-    result = {}
-
-    for m in re.finditer(ip4_pattern, string):
-        addr = m.group(1)
-        if skip_loopback and addr.startswith('127.'):
-            continue
-
-        # Limit to only one result
-        result['ipv4'] = addr
-        break
-
-    for m in re.finditer(ip6_pattern, string):
-        addr = m.group(1)
-        if skip_loopback and addr == '::1':
-            continue
-
-        # Limit to only one result
-        result['ipv6'] = addr
-        break
-
-    return result
-
-
-def binary_to_human(n, customary=False):
-    """
-    Convert bytes or bits into human readable format with binary prefix
-
-    Keyword argument:
-        n -- Number to convert
-        customary -- Use customary symbol instead of IEC standard
-
-    """
-    symbols = ('Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi')
-    if customary:
-        symbols = ('K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y')
-    prefix = {}
-    for i, s in enumerate(symbols):
-        prefix[s] = 1 << (i + 1) * 10
-    for s in reversed(symbols):
-        if n >= prefix[s]:
-            value = float(n) / prefix[s]
-            return '%.1f%s' % (value, s)
-    return "%s" % n
-
-
-def _retrieve_stats(period, date=None):
-    """
-    Retrieve statistics from pickle file
-
-    Keyword argument:
-        period -- Time period to retrieve (day, week, month)
-        date -- Date of stats to retrieve
-
-    """
-    pkl_file = None
-
-    # Retrieve pickle file
-    if date is not None:
-        timestamp = calendar.timegm(date)
-        pkl_file = '%s/%d_%s.pkl' % (STATS_PATH, timestamp, period)
-    else:
-        pkl_file = '%s/%s.pkl' % (STATS_PATH, period)
-    if not os.path.isfile(pkl_file):
-        return False
-
-    # Read file and process its content
-    with open(pkl_file, 'r') as f:
-        result = pickle.load(f)
-    if not isinstance(result, dict):
-        return None
-    return result
-
-
-def _save_stats(stats, period, date=None):
-    """
-    Save statistics to pickle file
-
-    Keyword argument:
-        stats -- Stats dict to save
-        period -- Time period of stats (day, week, month)
-        date -- Date of stats
-
-    """
-    pkl_file = None
-
-    # Set pickle file name
-    if date is not None:
-        timestamp = calendar.timegm(date)
-        pkl_file = '%s/%d_%s.pkl' % (STATS_PATH, timestamp, period)
-    else:
-        pkl_file = '%s/%s.pkl' % (STATS_PATH, period)
-    if not os.path.isdir(STATS_PATH):
-        os.makedirs(STATS_PATH)
-
-    # Limit stats
-    if date is None:
-        t = stats['timestamp']
-        limit = {'day': 86400, 'week': 604800, 'month': 2419200}
-        if (t[len(t) - 1] - t[0]) > limit[period]:
-            begin = t[len(t) - 1] - limit[period]
-            stats = _filter_stats(stats, begin)
-
-    # Write file content
-    with open(pkl_file, 'w') as f:
-        pickle.dump(stats, f)
-    return True
-
-
-def _monitor_all(period=None, since=None):
-    """
-    Monitor all units (disk, network and system) for the given period
-    If since is None, real-time monitoring is returned. Otherwise, the
-    mean of stats since this timestamp is calculated and returned.
-
-    Keyword argument:
-        period -- Time period to monitor (day, week, month)
-        since -- Timestamp of the stats beginning
-
-    """
-    result = {'disk': {}, 'network': {}, 'system': {}}
-
-    # Real-time stats
-    if period == 'day' and since is None:
-        result['disk'] = monitor_disk()
-        result['network'] = monitor_network()
-        result['system'] = monitor_system()
-        return result
-
-    # Retrieve stats and calculate mean
-    stats = _retrieve_stats(period)
-    if not stats:
-        return None
-    stats = _filter_stats(stats, since)
-    if not stats:
-        return None
-    result = _calculate_stats_mean(stats)
-
-    return result
-
-
-def _filter_stats(stats, t_begin=None, t_end=None):
-    """
-    Filter statistics by beginning and/or ending timestamp
-
-    Keyword argument:
-        stats -- Dict stats to filter
-        t_begin -- Beginning timestamp
-        t_end -- Ending timestamp
-
-    """
-    if t_begin is None and t_end is None:
-        return stats
-
-    i_begin = i_end = None
-    # Look for indexes of timestamp interval
-    for i, t in enumerate(stats['timestamp']):
-        if t_begin and i_begin is None and t >= t_begin:
-            i_begin = i
-        if t_end and i != 0 and i_end is None and t > t_end:
-            i_end = i
-    # Check indexes
-    if i_begin is None:
-        if t_begin and t_begin > stats['timestamp'][0]:
-            return None
-        i_begin = 0
-    if i_end is None:
-        if t_end and t_end < stats['timestamp'][0]:
-            return None
-        i_end = len(stats['timestamp'])
-    if i_begin == 0 and i_end == len(stats['timestamp']):
-        return stats
-
-    # Filter function
-    def _filter(s, i, j):
-        for k, v in s.items():
-            if isinstance(v, dict):
-                s[k] = _filter(v, i, j)
-            elif isinstance(v, list):
-                s[k] = v[i:j]
-        return s
-
-    stats = _filter(stats, i_begin, i_end)
-    return stats
-
-
-def _calculate_stats_mean(stats):
-    """
-    Calculate the weighted mean for each statistic
-
-    Keyword argument:
-        stats -- Stats dict to process
-
-    """
-    timestamp = stats['timestamp']
-    t_sum = sum(timestamp)
-    del stats['timestamp']
-
-    # Weighted mean function
-    def _mean(s, t, ts):
-        for k, v in s.items():
-            if isinstance(v, dict):
-                s[k] = _mean(v, t, ts)
-            elif isinstance(v, list):
-                try:
-                    nums = [float(x * t[i]) for i, x in enumerate(v)]
-                except:
-                    pass
-                else:
-                    s[k] = sum(nums) / float(ts)
-        return s
-
-    stats = _mean(stats, timestamp, t_sum)
-    return stats
-
-
-def _append_to_stats(stats, monitor, statics=[]):
-    """
-    Append monitoring statistics to current statistics
-
-    Keyword argument:
-        stats -- Current stats dict
-        monitor -- Monitoring statistics
-        statics -- List of stats static keys
-
-    """
-    if isinstance(statics, str):
-        statics = [statics]
-
-    # Appending function
-    def _append(s, m, st):
-        for k, v in m.items():
-            if k in st:
-                s[k] = v
-            elif isinstance(v, dict):
-                if k not in s:
-                    s[k] = {}
-                s[k] = _append(s[k], v, st)
-            else:
-                if k not in s:
-                    s[k] = []
-                if isinstance(v, list):
-                    s[k].extend(v)
-                else:
-                    s[k].append(v)
-        return s
-
-    stats = _append(stats, monitor, statics)
-    return stats

src/yunohost/regenconf.py

@@ -131,6 +131,16 @@ def regen_conf(operation_logger, names=[], with_diff=False, force=False, dry_run
                           show_info=False)['hooks']
         names.remove('ssh')
 
+    # Dirty hack for legacy code : avoid attempting to regen the conf for
+    # glances because it got removed ...  This is only needed *once*
+    # during the upgrade from 3.7 to 3.8 because Yunohost will attempt to
+    # regen glance's conf *before* it gets automatically removed from
+    # services.yml (which will happens only during the regen-conf of
+    # 'yunohost', so at the very end of the regen-conf cycle) Anyway,
+    # this can be safely removed once we're in >= 4.0
+    if "glances" in names:
+        names.remove("glances")
+
     pre_result = hook_callback('conf_regen', names, pre_callback=_pre_call)
 
     # Keep only the hook names with at least one success
@@ -525,31 +535,32 @@ def _process_regen_conf(system_conf, new_conf=None, save=True):
 
 def manually_modified_files():
 
-    # We do this to have --quiet, i.e. don't throw a whole bunch of logs
-    # just to fetch this...
-    # Might be able to optimize this by looking at what the regen conf does
-    # and only do the part that checks file hashes...
-    cmd = "yunohost tools regen-conf --dry-run --output-as json --quiet"
-    j = json.loads(subprocess.check_output(cmd.split()))
-
-    # j is something like :
-    # {"postfix": {"applied": {}, "pending": {"/etc/postfix/main.cf": {"status": "modified"}}}
-
     output = []
-    for app, actions in j.items():
+    regenconf_categories = _get_regenconf_infos()
-        for action, files in actions.items():
+    for category, infos in regenconf_categories.items():
-            for filename, infos in files.items():
+        conffiles = infos["conffiles"]
-                if infos["status"] == "modified":
+        for path, hash_ in conffiles.items():
-                    output.append(filename)
+            if hash_ != _calculate_hash(path):
+                output.append(path)
 
     return output
 
 
-def manually_modified_files_compared_to_debian_default():
+def manually_modified_files_compared_to_debian_default(ignore_handled_by_regenconf=False):
 
     # from https://serverfault.com/a/90401
-    r = subprocess.check_output("dpkg-query -W -f='${Conffiles}\n' '*' \
+    files = subprocess.check_output("dpkg-query -W -f='${Conffiles}\n' '*' \
-                                | awk 'OFS=\"  \"{print $2,$1}' \
+                                   | awk 'OFS=\"  \"{print $2,$1}' \
-                                | md5sum -c 2>/dev/null \
+                                   | md5sum -c 2>/dev/null \
-                                | awk -F': ' '$2 !~ /OK/{print $1}'", shell=True)
+                                   | awk -F': ' '$2 !~ /OK/{print $1}'", shell=True)
-    return r.strip().split("\n")
+    files = files.strip().split("\n")
+
+    if ignore_handled_by_regenconf:
+        regenconf_categories = _get_regenconf_infos()
+        regenconf_files = []
+        for infos in regenconf_categories.values():
+            regenconf_files.extend(infos["conffiles"].keys())
+
+        files = [f for f in files if f not in regenconf_files]
+
+    return files

src/yunohost/tools.py

@@ -30,23 +30,20 @@ import json
 import subprocess
 import pwd
 import socket
-from xmlrpclib import Fault
 from importlib import import_module
-from collections import OrderedDict
 
 from moulinette import msignals, m18n
 from moulinette.utils.log import getActionLogger
 from moulinette.utils.process import check_output, call_async_output
 from moulinette.utils.filesystem import read_json, write_to_json, read_yaml, write_to_yaml
+
 from yunohost.app import _update_appslist, app_info, app_upgrade, app_ssowatconf, app_list
-from yunohost.domain import domain_add, domain_list, _get_maindomain, _set_maindomain
+from yunohost.domain import domain_add, domain_list
 from yunohost.dyndns import _dyndns_available, _dyndns_provides
 from yunohost.firewall import firewall_upnp
-from yunohost.service import service_status, service_start, service_enable
+from yunohost.service import service_start, service_enable
 from yunohost.regenconf import regen_conf
-from yunohost.monitor import monitor_disk, monitor_system
+from yunohost.utils.packages import _dump_sources_list, _list_upgradable_apt_packages
-from yunohost.utils.packages import ynh_packages_version, _dump_sources_list, _list_upgradable_apt_packages
-from yunohost.utils.network import get_public_ip
 from yunohost.utils.error import YunohostError
 from yunohost.log import is_unit_operation, OperationLogger
 
@@ -164,60 +161,10 @@ def tools_adminpw(new_password, check_strength=True):
         logger.success(m18n.n('admin_password_changed'))
 
 
-@is_unit_operation()
+def tools_maindomain(new_main_domain=None):
-def tools_maindomain(operation_logger, new_domain=None):
+    from yunohost.domain import domain_main_domain
-    """
+    logger.warning(m18n.g("deprecated_command_alias", prog="yunohost", old="tools maindomain", new="domain main-domain"))
-    Check the current main domain, or change it
+    return domain_main_domain(new_main_domain=new_main_domain)
-
-    Keyword argument:
-        new_domain -- The new domain to be set as the main domain
-
-    """
-
-    # If no new domain specified, we return the current main domain
-    if not new_domain:
-        return {'current_main_domain': _get_maindomain()}
-
-    # Check domain exists
-    if new_domain not in domain_list()['domains']:
-        raise YunohostError('domain_unknown')
-
-    operation_logger.related_to.append(('domain', new_domain))
-    operation_logger.start()
-
-    # Apply changes to ssl certs
-    ssl_key = "/etc/ssl/private/yunohost_key.pem"
-    ssl_crt = "/etc/ssl/private/yunohost_crt.pem"
-    new_ssl_key = "/etc/yunohost/certs/%s/key.pem" % new_domain
-    new_ssl_crt = "/etc/yunohost/certs/%s/crt.pem" % new_domain
-
-    try:
-        if os.path.exists(ssl_key) or os.path.lexists(ssl_key):
-            os.remove(ssl_key)
-        if os.path.exists(ssl_crt) or os.path.lexists(ssl_crt):
-            os.remove(ssl_crt)
-
-        os.symlink(new_ssl_key, ssl_key)
-        os.symlink(new_ssl_crt, ssl_crt)
-
-        _set_maindomain(new_domain)
-    except Exception as e:
-        logger.warning("%s" % e, exc_info=1)
-        raise YunohostError('maindomain_change_failed')
-
-    _set_hostname(new_domain)
-
-    # Generate SSOwat configuration file
-    app_ssowatconf()
-
-    # Regen configurations
-    try:
-        with open('/etc/yunohost/installed', 'r'):
-            regen_conf()
-    except IOError:
-        pass
-
-    logger.success(m18n.n('maindomain_changed'))
 
 
 def _set_hostname(hostname, pretty_hostname=None):
@@ -281,6 +228,7 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
 
     """
     from yunohost.utils.password import assert_password_is_strong_enough
+    from yunohost.domain import domain_main_domain
 
     dyndns_provider = "dyndns.yunohost.org"
 
@@ -395,7 +343,7 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
     # New domain config
     regen_conf(['nsswitch'], force=True)
     domain_add(domain, dyndns)
-    tools_maindomain(domain)
+    domain_main_domain(domain)
 
     # Change LDAP admin password
     tools_adminpw(password, check_strength=not force_password)
@@ -723,184 +671,6 @@ def tools_upgrade(operation_logger, apps=None, system=False):
             operation_logger.success()
 
 
-def tools_diagnosis(private=False):
-    """
-    Return global info about current yunohost instance to help debugging
-
-    """
-    diagnosis = OrderedDict()
-
-    # Debian release
-    try:
-        with open('/etc/debian_version', 'r') as f:
-            debian_version = f.read().rstrip()
-    except IOError as e:
-        logger.warning(m18n.n('diagnosis_debian_version_error', error=format(e)), exc_info=1)
-    else:
-        diagnosis['host'] = "Debian %s" % debian_version
-
-    # Kernel version
-    try:
-        with open('/proc/sys/kernel/osrelease', 'r') as f:
-            kernel_version = f.read().rstrip()
-    except IOError as e:
-        logger.warning(m18n.n('diagnosis_kernel_version_error', error=format(e)), exc_info=1)
-    else:
-        diagnosis['kernel'] = kernel_version
-
-    # Packages version
-    diagnosis['packages'] = ynh_packages_version()
-
-    diagnosis["backports"] = check_output("dpkg -l |awk '/^ii/ && $3 ~ /bpo[6-8]/ {print $2}'").split()
-
-    # Server basic monitoring
-    diagnosis['system'] = OrderedDict()
-    try:
-        disks = monitor_disk(units=['filesystem'], human_readable=True)
-    except (YunohostError, Fault) as e:
-        logger.warning(m18n.n('diagnosis_monitor_disk_error', error=format(e)), exc_info=1)
-    else:
-        diagnosis['system']['disks'] = {}
-        for disk in disks:
-            if isinstance(disks[disk], str):
-                diagnosis['system']['disks'][disk] = disks[disk]
-            else:
-                diagnosis['system']['disks'][disk] = 'Mounted on %s, %s (%s free)' % (
-                    disks[disk]['mnt_point'],
-                    disks[disk]['size'],
-                    disks[disk]['avail']
-                )
-
-    try:
-        system = monitor_system(units=['cpu', 'memory'], human_readable=True)
-    except YunohostError as e:
-        logger.warning(m18n.n('diagnosis_monitor_system_error', error=format(e)), exc_info=1)
-    else:
-        diagnosis['system']['memory'] = {
-            'ram': '%s (%s free)' % (system['memory']['ram']['total'], system['memory']['ram']['free']),
-            'swap': '%s (%s free)' % (system['memory']['swap']['total'], system['memory']['swap']['free']),
-        }
-
-    # nginx -t
-    p = subprocess.Popen("nginx -t".split(),
-                         stdout=subprocess.PIPE,
-                         stderr=subprocess.STDOUT)
-    out, _ = p.communicate()
-    diagnosis["nginx"] = out.strip().split("\n")
-    if p.returncode != 0:
-        logger.error(out)
-
-    # Services status
-    services = service_status()
-    diagnosis['services'] = {}
-
-    for service in services:
-        diagnosis['services'][service] = "%s (%s)" % (services[service]['status'], services[service]['loaded'])
-
-    # YNH Applications
-    try:
-        applications = app_list()['apps']
-    except YunohostError as e:
-        diagnosis['applications'] = m18n.n('diagnosis_no_apps')
-    else:
-        diagnosis['applications'] = {}
-        for application in applications:
-            if application['installed']:
-                diagnosis['applications'][application['id']] = application['label'] if application['label'] else application['name']
-
-    # Private data
-    if private:
-        diagnosis['private'] = OrderedDict()
-
-        # Public IP
-        diagnosis['private']['public_ip'] = {}
-        diagnosis['private']['public_ip']['IPv4'] = get_public_ip(4)
-        diagnosis['private']['public_ip']['IPv6'] = get_public_ip(6)
-
-        # Domains
-        diagnosis['private']['domains'] = domain_list()['domains']
-
-        diagnosis['private']['regen_conf'] = regen_conf(with_diff=True, dry_run=True)
-
-    try:
-        diagnosis['security'] = {
-            "CVE-2017-5754": {
-                "name": "meltdown",
-                "vulnerable": _check_if_vulnerable_to_meltdown(),
-            }
-        }
-    except Exception as e:
-        import traceback
-        traceback.print_exc()
-        logger.warning("Unable to check for meltdown vulnerability: %s" % e)
-
-    return diagnosis
-
-
-def _check_if_vulnerable_to_meltdown():
-    # meltdown CVE: https://security-tracker.debian.org/tracker/CVE-2017-5754
-
-    # We use a cache file to avoid re-running the script so many times,
-    # which can be expensive (up to around 5 seconds on ARM)
-    # and make the admin appear to be slow (c.f. the calls to diagnosis
-    # from the webadmin)
-    #
-    # The cache is in /tmp and shall disappear upon reboot
-    # *or* we compare it to dpkg.log modification time
-    # such that it's re-ran if there was package upgrades
-    # (e.g. from yunohost)
-    cache_file = "/tmp/yunohost-meltdown-diagnosis"
-    dpkg_log = "/var/log/dpkg.log"
-    if os.path.exists(cache_file):
-        if not os.path.exists(dpkg_log) or os.path.getmtime(cache_file) > os.path.getmtime(dpkg_log):
-            logger.debug("Using cached results for meltdown checker, from %s" % cache_file)
-            return read_json(cache_file)[0]["VULNERABLE"]
-
-    # script taken from https://github.com/speed47/spectre-meltdown-checker
-    # script commit id is store directly in the script
-    file_dir = os.path.split(__file__)[0]
-    SCRIPT_PATH = os.path.join(file_dir, "./vendor/spectre-meltdown-checker/spectre-meltdown-checker.sh")
-
-    # '--variant 3' corresponds to Meltdown
-    # example output from the script:
-    # [{"NAME":"MELTDOWN","CVE":"CVE-2017-5754","VULNERABLE":false,"INFOS":"PTI mitigates the vulnerability"}]
-    try:
-        logger.debug("Running meltdown vulnerability checker")
-        call = subprocess.Popen("bash %s --batch json --variant 3" %
-                                SCRIPT_PATH, shell=True,
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE)
-
-        # TODO / FIXME : here we are ignoring error messages ...
-        # in particular on RPi2 and other hardware, the script complains about
-        # "missing some kernel info (see -v), accuracy might be reduced"
-        # Dunno what to do about that but we probably don't want to harass
-        # users with this warning ...
-        output, err = call.communicate()
-        assert call.returncode in (0, 2, 3), "Return code: %s" % call.returncode
-
-        # If there are multiple lines, sounds like there was some messages
-        # in stdout that are not json >.> ... Try to get the actual json
-        # stuff which should be the last line
-        output = output.strip()
-        if "\n" in output:
-            logger.debug("Original meltdown checker output : %s" % output)
-            output = output.split("\n")[-1]
-
-        CVEs = json.loads(output)
-        assert len(CVEs) == 1
-        assert CVEs[0]["NAME"] == "MELTDOWN"
-    except Exception as e:
-        import traceback
-        traceback.print_exc()
-        logger.warning("Something wrong happened when trying to diagnose Meltdown vunerability, exception: %s" % e)
-        raise Exception("Command output for failed meltdown check: '%s'" % output)
-
-    logger.debug("Writing results from meltdown checker to cache file, %s" % cache_file)
-    write_to_json(cache_file, CVEs)
-    return CVEs[0]["VULNERABLE"]
-
-
 def tools_port_available(port):
     """
     Check availability of a local port

src/yunohost/utils/packages.py

@@ -33,36 +33,6 @@ logger = logging.getLogger('yunohost.utils.packages')
 
 # Exceptions -----------------------------------------------------------------
 
-class PackageException(Exception):
-
-    """Base exception related to a package
-
-    Represent an exception related to the package named `pkgname`. If no
-    `message` is provided, it will first try to use the translation key
-    `message_key` if defined by the derived class. Otherwise, a standard
-    message will be used.
-
-    """
-    message_key = 'package_unexpected_error'
-
-    def __init__(self, pkgname, message=None):
-        super(PackageException, self).__init__(
-            message or m18n.n(self.message_key, pkgname=pkgname))
-        self.pkgname = pkgname
-
-
-class UnknownPackage(PackageException):
-
-    """The package is not found in the cache."""
-    message_key = 'package_unknown'
-
-
-class UninstalledPackage(PackageException):
-
-    """The package is not installed."""
-    message_key = 'package_not_installed'
-
-
 class InvalidSpecifier(ValueError):
 
     """An invalid specifier was found."""
@@ -402,43 +372,43 @@ def get_installed_version(*pkgnames, **kwargs):
     """Get the installed version of package(s)
 
     Retrieve one or more packages named `pkgnames` and return their installed
-    version as a dict or as a string if only one is requested and `as_dict` is
+    version as a dict or as a string if only one is requested.
-    `False`. If `strict` is `True`, an exception will be raised if a package
-    is unknown or not installed.
 
     """
     versions = OrderedDict()
     cache = apt.Cache()
 
     # Retrieve options
-    as_dict = kwargs.get('as_dict', False)
-    strict = kwargs.get('strict', False)
     with_repo = kwargs.get('with_repo', False)
 
     for pkgname in pkgnames:
         try:
             pkg = cache[pkgname]
         except KeyError:
-            if strict:
-                raise UnknownPackage(pkgname)
             logger.warning(m18n.n('package_unknown', pkgname=pkgname))
+            if with_repo:
+                versions[pkgname] = {
+                    "version": None,
+                    "repo": None,
+                }
+            else:
+                versions[pkgname] = None
             continue
 
         try:
             version = pkg.installed.version
         except AttributeError:
-            if strict:
-                raise UninstalledPackage(pkgname)
             version = None
 
         try:
             # stable, testing, unstable
             repo = pkg.installed.origins[0].component
         except AttributeError:
-            if strict:
-                raise UninstalledPackage(pkgname)
             repo = ""
 
+        if repo == "now":
+            repo = "local"
+
         if with_repo:
             versions[pkgname] = {
                 "version": version,
@@ -449,7 +419,7 @@ def get_installed_version(*pkgnames, **kwargs):
         else:
             versions[pkgname] = version
 
-    if len(pkgnames) == 1 and not as_dict:
+    if len(pkgnames) == 1:
         return versions[pkgnames[0]]
     return versions