Merge from stretch-unstable

README.md

@@ -9,7 +9,7 @@ This repository is the core of YunoHost code.
 </a>
 
 ## Issues
-- [Please report issues on YunoHost bugtracker](https://dev.yunohost.org/projects/yunohost/issues) (no registration needed).
+- [Please report issues on YunoHost bugtracker](https://github.com/YunoHost/issues).
 
 ## Contribute
 - You can develop on this repository using [ynh-dev tool](https://github.com/YunoHost/ynh-dev) with `use-git`  sub-command.

bin/yunohost

@@ -9,8 +9,8 @@ import argparse
 IN_DEVEL = False
 
 # Level for which loggers will log
-LOGGERS_LEVEL = 'INFO'
-TTY_LOG_LEVEL = 'SUCCESS'
+LOGGERS_LEVEL = 'DEBUG'
+TTY_LOG_LEVEL = 'INFO'
 
 # Handlers that will be used by loggers
 #  - file: log to the file LOG_DIR/LOG_FILE
@@ -58,10 +58,6 @@ def _parse_cli_args():
         action='store_true', default=False,
         help="Log and print debug messages",
     )
-    parser.add_argument('--verbose',
-        action='store_true', default=False,
-        help="Be more verbose in the output",
-    )
     parser.add_argument('--quiet',
         action='store_true', default=False,
         help="Don't produce any output",
@@ -92,13 +88,13 @@ def _parse_cli_args():
 
     return (parser, opts, args)
 
-def _init_moulinette(debug=False, verbose=False, quiet=False):
+def _init_moulinette(debug=False, quiet=False):
     """Configure logging and initialize the moulinette"""
     # Define loggers handlers
     handlers = set(LOGGERS_HANDLERS)
     if quiet and 'tty' in handlers:
         handlers.remove('tty')
-    elif verbose and 'tty' not in handlers:
+    elif 'tty' not in handlers:
         handlers.append('tty')
 
     root_handlers = set(handlers)
@@ -108,10 +104,8 @@ def _init_moulinette(debug=False, verbose=False, quiet=False):
     # Define loggers level
     level = LOGGERS_LEVEL
     tty_level = TTY_LOG_LEVEL
-    if verbose:
-        tty_level = 'INFO'
     if debug:
-        tty_level = level = 'DEBUG'
+        tty_level = 'DEBUG'
 
     # Custom logging configuration
     logging = {
@@ -196,7 +190,7 @@ if __name__ == '__main__':
         sys.exit(1)
 
     parser, opts, args = _parse_cli_args()
-    _init_moulinette(opts.debug, opts.verbose, opts.quiet)
+    _init_moulinette(opts.debug, opts.quiet)
 
     # Check that YunoHost is installed
     if not os.path.isfile('/etc/yunohost/installed') and \

bin/yunoprompt

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Fetch ips
+ip=$(hostname --all-ip-address)
+
+# Fetch SSH fingerprints
+i=0
+for key in /etc/ssh/ssh_host_*_key.pub ; do 
+    output=$(ssh-keygen -l -f $key)
+    fingerprint[$i]=" - $(echo $output | cut -d' ' -f2) $(echo $output| cut -d' ' -f4)"
+    i=$(($i + 1))
+done
+
+#
+# Build the logo
+#
+
+LOGO=$(cat << 'EOF'
+  __   __  __   __  __    _  _______  __   __  _______  _______  _______
+ |  | |  ||  | |  ||  |  | ||       ||  | |  ||       ||       ||       |
+ |  |_|  ||  | |  ||   |_| ||   _   ||  |_|  ||   _   ||  _____||_     _|
+ |       ||  |_|  ||       ||  | |  ||       ||  | |  || |_____   |   |
+ |_     _||       ||  _    ||  |_|  ||   _   ||  |_|  ||_____  |  |   |
+   |   |  |       || | |   ||       ||  | |  ||       | _____| |  |   |
+   |___|  |_______||_|  |__||_______||__| |__||_______||_______|  |___|
+EOF
+)
+
+# ' Put a quote in comment to make vim happy about syntax highlighting :s
+
+#
+# Build the actual message
+#
+
+LOGO_AND_FINGERPRINTS=$(cat << EOF
+
+$LOGO
+
+ IP: ${ip}
+ SSH fingerprints:
+ ${fingerprint[0]}
+ ${fingerprint[1]}
+ ${fingerprint[2]}
+ ${fingerprint[3]}
+ ${fingerprint[4]}
+
+EOF
+)
+
+if [[ -f /etc/yunohost/installed ]]
+then
+    echo "$LOGO_AND_FINGERPRINTS" > /etc/issue
+else
+    sleep 5
+    chvt 2
+    echo "$LOGO_AND_FINGERPRINTS"
+    echo -e "\e[m Post-installation \e[0m"
+    echo "Congratulations! YunoHost has been successfully installed.\nTwo more steps are required to activate the services of your server."
+    read -p "Proceed to post-installation? (y/n) " -n 1
+    RESULT=1
+    while [ $RESULT -gt 0 ]; do
+        if [[ $REPLY =~ ^[Nn]$ ]]; then
+            chvt 1
+            exit 0
+        fi
+        echo -e "\n"
+        /usr/bin/yunohost tools postinstall
+        let RESULT=$?
+        if [ $RESULT -gt 0 ]; then
+            echo -e "\n"
+            read -p "Retry? (y/n) " -n 1
+        fi
+    done
+fi

data/actionsmap/yunohost.yml

@@ -214,6 +214,78 @@ user:
                 username:
                     help: Username or email to get information
 
+    subcategories:
+
+        ssh:
+            subcategory_help: Manage ssh access
+            actions:
+                ### user_ssh_enable()
+                allow:
+                    action_help: Allow the user to uses ssh
+                    api: POST /users/ssh/enable
+                    configuration:
+                        authenticate: all
+                    arguments:
+                        username:
+                            help: Username of the user
+                            extra:
+                                pattern: *pattern_username
+
+                ### user_ssh_disable()
+                disallow:
+                    action_help: Disallow the user to uses ssh
+                    api: POST /users/ssh/disable
+                    configuration:
+                        authenticate: all
+                    arguments:
+                        username:
+                            help: Username of the user
+                            extra:
+                                pattern: *pattern_username
+
+                ### user_ssh_keys_list()
+                list-keys:
+                    action_help: Show user's authorized ssh keys
+                    api: GET /users/ssh/keys
+                    configuration:
+                        authenticate: all
+                    arguments:
+                        username:
+                            help: Username of the user
+                            extra:
+                                pattern: *pattern_username
+
+                ### user_ssh_keys_add()
+                add-key:
+                    action_help: Add a new authorized ssh key for this user
+                    api: POST /users/ssh/key
+                    configuration:
+                        authenticate: all
+                    arguments:
+                        username:
+                            help: Username of the user
+                            extra:
+                                pattern: *pattern_username
+                        key:
+                            help: The key to be added
+                        -c:
+                            full: --comment
+                            help: Optionnal comment about the key
+
+                ### user_ssh_keys_remove()
+                remove-key:
+                    action_help: Remove an authorized ssh key for this user
+                    api: DELETE /users/ssh/key
+                    configuration:
+                        authenticate: all
+                    arguments:
+                        username:
+                            help: Username of the user
+                            extra:
+                                pattern: *pattern_username
+                        key:
+                            help: The key to be removed
+
 
 #############################
 #          Domain           #
@@ -708,7 +780,7 @@ backup:
 
         ### backup_create()
         create:
-            action_help: Create a backup local archive
+            action_help: Create a backup local archive. If neither --apps or --system are given, this will backup all apps and all system parts. If only --apps if given, this will only backup apps and no system parts. Similarly, if only --system is given, this will only backup system parts and no apps.
             api: POST /backup
             arguments:
                 -n:
@@ -716,7 +788,7 @@ backup:
                     help: Name of the backup archive
                     extra:
                         pattern: &pattern_backup_archive_name
-                            - !!str ^[\w\-\._]{1,30}(?<!\.)$
+                            - !!str ^[\w\-\._]{1,50}(?<!\.)$
                             - "pattern_backup_archive_name"
                 -d:
                     full: --description
@@ -732,28 +804,15 @@ backup:
                     help: List of backup methods to apply (copy or tar by default)
                     nargs: "*"
                 --system:
-                    help: List of system parts to backup (all by default)
+                    help: List of system parts to backup (or all if none given).
                     nargs: "*"
                 --apps:
-                    help: List of application names to backup (all by default)
+                    help: List of application names to backup (or all if none given)
                     nargs: "*"
-                --hooks:
-                    help: (Deprecated) See --system
-                    nargs: "*"
-                --ignore-system:
-                    help: Do not backup system
-                    action: store_true
-                --ignore-apps:
-                    help: Do not backup apps
-                    action: store_true
-                --ignore-hooks:
-                    help: (Deprecated) See --ignore-system
-                    action: store_true
-
 
         ### backup_restore()
         restore:
-            action_help: Restore from a local backup archive
+            action_help: Restore from a local backup archive. If neither --apps or --system are given, this will restore all apps and all system parts in the archive. If only --apps if given, this will only restore apps and no system parts. Similarly, if only --system is given, this will only restore system parts and no apps.
             api: POST /backup/restore/<name>
             configuration:
                 authenticate: all
@@ -762,23 +821,11 @@ backup:
                 name:
                     help: Name of the local backup archive
                 --system:
-                    help: List of system parts to restore (all by default)
+                    help: List of system parts to restore (or all if none is given)
                     nargs: "*"
                 --apps:
-                    help: List of application names to restore (all by default)
+                    help: List of application names to restore (or all if none is given)
                     nargs: "*"
-                --hooks:
-                    help: (Deprecated) See --system
-                    nargs: "*"
-                --ignore-system:
-                    help: Do not restore system parts
-                    action: store_true
-                --ignore-apps:
-                    help: Do not restore apps
-                    action: store_true
-                --ignore-hooks:
-                    help: (Deprecated) See --ignore-system
-                    action: store_true
                 --force:
                     help: Force restauration on an already installed system
                     action: store_true
@@ -1483,6 +1530,13 @@ tools:
               list:
                   action_help: List migrations
                   api: GET /migrations
+                  arguments:
+                    --pending:
+                        help: list only pending migrations
+                        action: store_true
+                    --done:
+                        help: list only migrations already performed
+                        action: store_true
 
               ### tools_migrations_migrate()
               migrate:
@@ -1497,7 +1551,12 @@ tools:
                         help: skip the migration(s), use it only if you know what you are doing
                         full: --skip
                         action: store_true
-
+                    --auto:
+                        help: automatic mode, won't run manual migrations, use it only if you know what you are doing
+                        action: store_true
+                    --accept-disclaimer:
+                        help: accept disclaimers of migration (please read them before using this option)
+                        action: store_true
 
               ### tools_migrations_state()
               state:

data/helpers.d/backend

@@ -2,7 +2,7 @@
 #
 # usage: ynh_use_logrotate [logfile] [--non-append]
 # | arg: logfile - absolute path of logfile
-# | option: --non-append - Replace the config file instead of appending this new config.
+# | arg: --non-append - (Option) Replace the config file instead of appending this new config.
 #
 # If no argument provided, a standard directory will be use. /var/log/${app}
 # You can provide a path with the directory only or with the logfile.
@@ -64,19 +64,24 @@ ynh_remove_logrotate () {
 
 # Create a dedicated systemd config
 #
-# This will use a template in ../conf/systemd.service
-# and will replace the following keywords with 
-# global variables that should be defined before calling
+# usage: ynh_add_systemd_config [service] [template]
+# | arg: service - Service name (optionnal, $app by default)
+# | arg: template - Name of template file (optionnal, this is 'systemd' by default, meaning ./conf/systemd.service will be used as template)
+#
+# This will use the template ../conf/<templatename>.service
+# to generate a systemd config, by replacing the following keywords
+# with global variables that should be defined before calling
 # this helper :
 #
 #   __APP__       by  $app
 #   __FINALPATH__ by  $final_path
 #
-# usage: ynh_add_systemd_config
 ynh_add_systemd_config () {
-	finalsystemdconf="/etc/systemd/system/$app.service"
+	local service_name="${1:-$app}"
+
+	finalsystemdconf="/etc/systemd/system/$service_name.service"
 	ynh_backup_if_checksum_is_different "$finalsystemdconf"
-	sudo cp ../conf/systemd.service "$finalsystemdconf"
+	sudo cp ../conf/${2:-systemd.service} "$finalsystemdconf"
 
 	# To avoid a break by set -u, use a void substitution ${var:-}. If the variable is not set, it's simply set with an empty variable.
 	# Substitute in a nginx config file only if the variable is not empty
@@ -89,24 +94,34 @@ ynh_add_systemd_config () {
 	ynh_store_file_checksum "$finalsystemdconf"
 
 	sudo chown root: "$finalsystemdconf"
-	sudo systemctl enable $app
+	sudo systemctl enable $service_name
 	sudo systemctl daemon-reload
 }
 
 # Remove the dedicated systemd config
 #
-# usage: ynh_remove_systemd_config
+# usage: ynh_remove_systemd_config [service]
+# | arg: service - Service name (optionnal, $app by default)
+#
 ynh_remove_systemd_config () {
-	local finalsystemdconf="/etc/systemd/system/$app.service"
+	local service_name="${1:-$app}"
+
+	local finalsystemdconf="/etc/systemd/system/$service_name.service"
 	if [ -e "$finalsystemdconf" ]; then
-		sudo systemctl stop $app
-		sudo systemctl disable $app
+		sudo systemctl stop $service_name
+		sudo systemctl disable $service_name
 		ynh_secure_remove "$finalsystemdconf"
+		sudo systemctl daemon-reload
 	fi
 }
 
 # Create a dedicated nginx config
 #
+# usage: ynh_add_nginx_config "list of others variables to replace"
+#
+# | arg: list of others variables to replace separeted by a space
+# |      for example : 'path_2 port_2 ...'
+#
 # This will use a template in ../conf/nginx.conf
 #   __PATH__      by  $path_url
 #   __DOMAIN__    by  $domain
@@ -114,9 +129,13 @@ ynh_remove_systemd_config () {
 #   __NAME__      by  $app
 #   __FINALPATH__ by  $final_path
 #
-# usage: ynh_add_nginx_config
+#  And dynamic variables (from the last example) :
+#   __PATH_2__    by $path_2
+#   __PORT_2__    by $port_2
+#
 ynh_add_nginx_config () {
 	finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf"
+	local others_var=${1:-}
 	ynh_backup_if_checksum_is_different "$finalnginxconf"
 	sudo cp ../conf/nginx.conf "$finalnginxconf"
 
@@ -140,6 +159,22 @@ ynh_add_nginx_config () {
 	if test -n "${final_path:-}"; then
 		ynh_replace_string "__FINALPATH__" "$final_path" "$finalnginxconf"
 	fi
+
+	# Replace all other variable given as arguments
+	for var_to_replace in $others_var
+	do
+		# ${var_to_replace^^} make the content of the variable on upper-cases
+		# ${!var_to_replace} get the content of the variable named $var_to_replace 
+		ynh_replace_string "__${var_to_replace^^}__" "${!var_to_replace}" "$finalnginxconf"
+	done
+	
+	if [ "${path_url:-}" != "/" ]
+	then
+		ynh_replace_string "^#sub_path_only" "" "$finalnginxconf"
+	else
+		ynh_replace_string "^#root_path_only" "" "$finalnginxconf"
+	fi
+
 	ynh_store_file_checksum "$finalnginxconf"
 
 	sudo systemctl reload nginx

data/helpers.d/filesystem

@@ -46,7 +46,15 @@ ynh_backup() {
     local SRC_PATH="$1"
     local DEST_PATH="${2:-}"
     local IS_BIG="${3:-0}"
+    BACKUP_CORE_ONLY=${BACKUP_CORE_ONLY:-0}
 
+    # If backing up core only (used by ynh_backup_before_upgrade),
+    # don't backup big data items
+    if [ "$IS_BIG" == "1" ] && [ "$BACKUP_CORE_ONLY" == "1" ] ; then
+      echo "$SRC_PATH will not be saved, because backup_core_only is set." >&2
+      return 0
+    fi
+    
     # ==============================================================================
     # Format correctly source and destination paths
     # ==============================================================================
@@ -136,6 +144,8 @@ ynh_restore () {
 
 # Return the path in the archive where has been stocked the origin path
 #
+# [internal]
+#
 # usage: _get_archive_path ORIGIN_PATH
 _get_archive_path () {
     # For security reasons we use csv python library to read the CSV
@@ -165,6 +175,9 @@ with open(sys.argv[1], 'r') as backup_file:
 # the destination will be ORIGIN_PATH or if the ORIGIN_PATH doesn't exist in
 # the archive, the destination will be searched into backup.csv
 #
+# If DEST_PATH already exists and is lighter than 500 Mo, a backup will be made in 
+# /home/yunohost.conf/backup/. Otherwise, the existing file is removed.
+#
 # examples:
 # ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf"
 # # if apps/wordpress/etc/nginx/conf.d/$domain.d/$app.conf exists, restore it into
@@ -186,6 +199,20 @@ ynh_restore_file () {
         ARCHIVE_PATH="$YNH_BACKUP_DIR/$(_get_archive_path \"$ORIGIN_PATH\")"
     fi
 
+    # Move the old directory if it already exists
+    if [[ -e "${DEST_PATH}" ]]
+    then
+        # Check if the file/dir size is less than 500 Mo
+        if [[ $(du -sb ${DEST_PATH} | cut -d"/" -f1) -le "500000000" ]]
+        then
+            local backup_file="/home/yunohost.conf/backup/${DEST_PATH}.backup.$(date '+%Y%m%d.%H%M%S')"
+            mkdir -p "$(dirname "$backup_file")"
+            mv "${DEST_PATH}" "$backup_file"	# Move the current file or directory
+        else
+            ynh_secure_remove ${DEST_PATH}
+        fi
+    fi
+
     # Restore ORIGIN_PATH into DEST_PATH
     mkdir -p $(dirname "$DEST_PATH")
 
@@ -203,6 +230,9 @@ ynh_restore_file () {
 }
 
 # Deprecated helper since it's a dangerous one!
+#
+# [internal]
+#
 ynh_bind_or_cp() {
     local AS_ROOT=${3:-0}
     local NO_ROOT=0
@@ -213,6 +243,8 @@ ynh_bind_or_cp() {
 
 # Create a directory under /tmp
 #
+# [internal]
+#
 # Deprecated helper
 #
 # usage: ynh_mkdir_tmp

data/helpers.d/ip

@@ -1,10 +1,10 @@
 # Validate an IP address
 #
+# usage: ynh_validate_ip [family] [ip_address]
+# | ret: 0 for valid ip addresses, 1 otherwise
+#
 # example: ynh_validate_ip 4 111.222.333.444
 #
-# usage: ynh_validate_ip <family> <ip_address>
-#
-# exit code : 0 for valid ip addresses, 1 otherwise
 ynh_validate_ip()
 {
   # http://stackoverflow.com/questions/319279/how-to-validate-ip-address-in-python#319298
@@ -31,8 +31,8 @@ EOF
 # example: ynh_validate_ip4 111.222.333.444
 #
 # usage: ynh_validate_ip4 <ip_address>
+# | ret: 0 for valid ipv4 addresses, 1 otherwise
 #
-# exit code : 0 for valid ipv4 addresses, 1 otherwise
 ynh_validate_ip4()
 {
   ynh_validate_ip 4 $1
@@ -44,8 +44,8 @@ ynh_validate_ip4()
 # example: ynh_validate_ip6 2000:dead:beef::1
 #
 # usage: ynh_validate_ip6 <ip_address>
+# | ret: 0 for valid ipv6 addresses, 1 otherwise
 #
-# exit code : 0 for valid ipv6 addresses, 1 otherwise
 ynh_validate_ip6()
 {
   ynh_validate_ip 6 $1

data/helpers.d/mysql

@@ -35,6 +35,8 @@ ynh_mysql_execute_file_as_root() {
 
 # Create a database and grant optionnaly privilegies to a user
 #
+# [internal]
+#
 # usage: ynh_mysql_create_db db [user [pwd]]
 # | arg: db - the database name to create
 # | arg: user - the user to grant privilegies
@@ -56,6 +58,8 @@ ynh_mysql_create_db() {
 
 # Drop a database
 #
+# [internal]
+#
 # If you intend to drop the database *and* the associated user,
 # consider using ynh_mysql_remove_db instead.
 #
@@ -78,6 +82,8 @@ ynh_mysql_dump_db() {
 
 # Create a user
 #
+# [internal]
+#
 # usage: ynh_mysql_create_user user pwd [host]
 # | arg: user - the user name to create
 # | arg: pwd - the password to identify user by
@@ -90,7 +96,7 @@ ynh_mysql_create_user() {
 #
 # usage: ynh_mysql_user_exists user
 # | arg: user - the user for which to check existence
-function ynh_mysql_user_exists()
+ynh_mysql_user_exists()
 {
    local user=$1
    if [[ -z $(ynh_mysql_execute_as_root "SELECT User from mysql.user WHERE User = '$user';") ]]
@@ -103,6 +109,8 @@ function ynh_mysql_user_exists()
 
 # Drop a user
 #
+# [internal]
+#
 # usage: ynh_mysql_drop_user user
 # | arg: user - the user name to drop
 ynh_mysql_drop_user() {
@@ -153,7 +161,7 @@ ynh_mysql_remove_db () {
 # Sanitize a string intended to be the name of a database
 # (More specifically : replace - and . by _)
 #
-# Exemple: dbname=$(ynh_sanitize_dbid $app)
+# example: dbname=$(ynh_sanitize_dbid $app)
 #
 # usage: ynh_sanitize_dbid name
 # | arg: name - name to correct/sanitize

data/helpers.d/nodejs

@@ -0,0 +1,196 @@
+n_install_dir="/opt/node_n"
+node_version_path="$n_install_dir/n/versions/node"
+# N_PREFIX is the directory of n, it needs to be loaded as a environment variable.
+export N_PREFIX="$n_install_dir"
+
+# Install Node version management
+#
+# [internal]
+#
+# usage: ynh_install_n
+ynh_install_n () {
+	echo "Installation of N - Node.js version management" >&2
+	# Build an app.src for n
+	mkdir -p "../conf"
+	echo "SOURCE_URL=https://github.com/tj/n/archive/v2.1.7.tar.gz
+SOURCE_SUM=2ba3c9d4dd3c7e38885b37e02337906a1ee91febe6d5c9159d89a9050f2eea8f" > "../conf/n.src"
+	# Download and extract n
+	ynh_setup_source "$n_install_dir/git" n
+	# Install n
+	(cd "$n_install_dir/git"
+	PREFIX=$N_PREFIX make install 2>&1)
+}
+
+# Load the version of node for an app, and set variables.
+#
+# ynh_use_nodejs has to be used in any app scripts before using node for the first time.
+#
+# 2 variables are available:
+#   - $nodejs_path: The absolute path of node for the chosen version.
+#   - $nodejs_version: Just the version number of node for this app. Stored as 'nodejs_version' in settings.yml.
+# And 2 alias stored in variables:
+#   - $nodejs_use_version: An old variable, not used anymore. Keep here to not break old apps
+#     NB: $PATH will contain the path to node, it has to be propagated to any other shell which needs to use it.
+#     That's means it has to be added to any systemd script.
+#
+# usage: ynh_use_nodejs
+ynh_use_nodejs () {
+	nodejs_version=$(ynh_app_setting_get $app nodejs_version)
+
+	nodejs_use_version="echo \"Deprecated command, should be removed\""
+
+	# Get the absolute path of this version of node
+	nodejs_path="$node_version_path/$nodejs_version/bin"
+
+	# Load the path of this version of node in $PATH
+	[[ :$PATH: == *":$nodejs_path"* ]] || PATH="$nodejs_path:$PATH"
+}
+
+# Install a specific version of nodejs
+#
+# n (Node version management) uses the PATH variable to store the path of the version of node it is going to use.
+# That's how it changes the version
+#
+# ynh_install_nodejs will install the version of node provided as argument by using n.
+#
+# usage: ynh_install_nodejs [nodejs_version]
+# | arg: nodejs_version - Version of node to install.
+#        If possible, prefer to use major version number (e.g. 8 instead of 8.10.0).
+#        The crontab will handle the update of minor versions when needed.
+ynh_install_nodejs () {
+	# Use n, https://github.com/tj/n to manage the nodejs versions
+	nodejs_version="$1"
+
+	# Create $n_install_dir
+	mkdir -p "$n_install_dir"
+
+	# Load n path in PATH
+	CLEAR_PATH="$n_install_dir/bin:$PATH"
+	# Remove /usr/local/bin in PATH in case of node prior installation
+	PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
+
+	# Move an existing node binary, to avoid to block n.
+	test -x /usr/bin/node && mv /usr/bin/node /usr/bin/node_n
+	test -x /usr/bin/npm && mv /usr/bin/npm /usr/bin/npm_n
+
+	# If n is not previously setup, install it
+	if ! test $(n --version > /dev/null 2>&1)
+	then
+		ynh_install_n
+	fi
+
+	# Modify the default N_PREFIX in n script
+	ynh_replace_string "^N_PREFIX=\${N_PREFIX-.*}$" "N_PREFIX=\${N_PREFIX-$N_PREFIX}" "$n_install_dir/bin/n"
+
+	# Restore /usr/local/bin in PATH
+	PATH=$CLEAR_PATH
+
+	# And replace the old node binary.
+	test -x /usr/bin/node_n && mv /usr/bin/node_n /usr/bin/node
+	test -x /usr/bin/npm_n && mv /usr/bin/npm_n /usr/bin/npm
+
+	# Install the requested version of nodejs
+	n $nodejs_version
+
+	# Find the last "real" version for this major version of node.
+	real_nodejs_version=$(find $node_version_path/$nodejs_version* -maxdepth 0 | sort --version-sort | tail --lines=1)
+	real_nodejs_version=$(basename $real_nodejs_version)
+
+	# Create a symbolic link for this major version if the file doesn't already exist
+	if [ ! -e "$node_version_path/$nodejs_version" ]
+	then
+		ln --symbolic --force --no-target-directory $node_version_path/$real_nodejs_version $node_version_path/$nodejs_version
+	fi
+
+	# Store the ID of this app and the version of node requested for it
+	echo "$YNH_APP_ID:$nodejs_version" | tee --append "$n_install_dir/ynh_app_version"
+
+	# Store nodejs_version into the config of this app
+	ynh_app_setting_set $app nodejs_version $nodejs_version
+
+	# Build the update script and set the cronjob
+	ynh_cron_upgrade_node
+
+	ynh_use_nodejs
+}
+
+# Remove the version of node used by the app.
+#
+# This helper will check if another app uses the same version of node,
+# if not, this version of node will be removed.
+# If no other app uses node, n will be also removed.
+#
+# usage: ynh_remove_nodejs
+ynh_remove_nodejs () {
+	nodejs_version=$(ynh_app_setting_get $app nodejs_version)
+
+	# Remove the line for this app
+	sed --in-place "/$YNH_APP_ID:$nodejs_version/d" "$n_install_dir/ynh_app_version"
+
+	# If no other app uses this version of nodejs, remove it.
+	if ! grep --quiet "$nodejs_version" "$n_install_dir/ynh_app_version"
+	then
+		$n_install_dir/bin/n rm $nodejs_version
+	fi
+
+	# If no other app uses n, remove n
+	if [ ! -s "$n_install_dir/ynh_app_version" ]
+	then
+		ynh_secure_remove "$n_install_dir"
+		ynh_secure_remove "/usr/local/n"
+	fi
+}
+
+# Set a cron design to update your node versions
+#
+# [internal]
+#
+# This cron will check and update all minor node versions used by your apps.
+#
+# usage: ynh_cron_upgrade_node
+ynh_cron_upgrade_node () {
+	# Build the update script
+	cat > "$n_install_dir/node_update.sh" << EOF
+#!/bin/bash
+
+version_path="$node_version_path"
+n_install_dir="$n_install_dir"
+
+# Log the date
+date
+
+# List all real installed version of node
+all_real_version="\$(find \$version_path/* -maxdepth 0 -type d | sed "s@\$version_path/@@g")"
+
+# Keep only the major version number of each line
+all_real_version=\$(echo "\$all_real_version" | sed 's/\..*\$//')
+
+# Remove double entries
+all_real_version=\$(echo "\$all_real_version" | sort --unique)
+
+# Read each major version
+while read version
+do
+	echo "Update of the version \$version"
+	sudo \$n_install_dir/bin/n \$version
+
+	# Find the last "real" version for this major version of node.
+	real_nodejs_version=\$(find \$version_path/\$version* -maxdepth 0 | sort --version-sort | tail --lines=1)
+	real_nodejs_version=\$(basename \$real_nodejs_version)
+
+	# Update the symbolic link for this version
+	sudo ln --symbolic --force --no-target-directory \$version_path/\$real_nodejs_version \$version_path/\$version
+done <<< "\$(echo "\$all_real_version")"
+EOF
+
+	chmod +x "$n_install_dir/node_update.sh"
+
+	# Build the cronjob
+	cat > "/etc/cron.daily/node_update" << EOF
+#!/bin/bash
+
+$n_install_dir/node_update.sh >> $n_install_dir/node_update.log
+EOF
+
+	chmod +x "/etc/cron.daily/node_update"
+}

data/helpers.d/package

@@ -26,9 +26,11 @@ ynh_package_version() {
 
 # APT wrapper for non-interactive operation
 #
+# [internal]
+#
 # usage: ynh_apt update
 ynh_apt() {
-    DEBIAN_FRONTEND=noninteractive sudo apt-get -y -qq $@
+    DEBIAN_FRONTEND=noninteractive sudo apt-get -y $@
 }
 
 # Update package index files
@@ -73,6 +75,8 @@ ynh_package_autopurge() {
 
 # Build and install a package from an equivs control file
 #
+# [internal]
+#
 # example: generate an empty control file with `equivs-control`, adjust its
 #          content and use helper to build and install the package:
 #              ynh_package_install_from_equivs /path/to/controlfile
@@ -97,6 +101,10 @@ ynh_package_install_from_equivs () {
 
     # Build and install the package
     local TMPDIR=$(mktemp -d)
+
+    # Force the compatibility level at 10, levels below are deprecated 
+    echo 10 > /usr/share/equivs/template/debian/compat
+
     # Note that the cd executes into a sub shell
     # Create a fake deb package with equivs-build and the given control file
     # Install the fake package without its dependencies with dpkg
@@ -105,7 +113,7 @@ ynh_package_install_from_equivs () {
      && equivs-build ./control 1>/dev/null \
      && sudo dpkg --force-depends \
           -i "./${pkgname}_${pkgversion}_all.deb" 2>&1 \
-     && ynh_package_install -f)
+     && ynh_package_install -f) || ynh_die "Unable to install dependencies"
     [[ -n "$TMPDIR" ]] && rm -rf $TMPDIR	# Remove the temp dir.
 
     # check if the package is actually installed
@@ -117,8 +125,13 @@ ynh_package_install_from_equivs () {
 #
 # usage: ynh_install_app_dependencies dep [dep [...]]
 # | arg: dep - the package name to install in dependence
+#   You can give a choice between some package with this syntax : "dep1|dep2"
+#   Example : ynh_install_app_dependencies dep1 dep2 "dep3|dep4|dep5"
+#   This mean in the dependence tree : dep1 & dep2 & (dep3 | dep4 | dep5)
 ynh_install_app_dependencies () {
     local dependencies=$@
+    local dependencies=${dependencies// /, }
+    local dependencies=${dependencies//|/ | }
     local manifest_path="../manifest.json"
     if [ ! -e "$manifest_path" ]; then
     	manifest_path="../settings/manifest.json"	# Into the restore script, the manifest is not at the same place
@@ -135,7 +148,7 @@ Section: misc
 Priority: optional
 Package: ${dep_app}-ynh-deps
 Version: ${version}
-Depends: ${dependencies// /, }
+Depends: ${dependencies}
 Architecture: all
 Description: Fake package for ${app} (YunoHost app) dependencies
  This meta-package is only responsible of installing its dependencies.

data/helpers.d/print

@@ -6,7 +6,11 @@ ynh_die() {
 }
 
 # Ignore the yunohost-cli log to prevent errors with conditionals commands
+#
+# [internal]
+#
 # usage: ynh_no_log COMMAND
+#
 # Simply duplicate the log, execute the yunohost command and replace the log without the result of this command
 # It's a very badly hack...
 ynh_no_log() {

data/helpers.d/psql

@@ -0,0 +1,148 @@
+# Create a master password and set up global settings
+# Please always call this script in install and restore scripts
+#
+# usage: ynh_psql_test_if_first_run
+ynh_psql_test_if_first_run() {
+	if [ -f /etc/yunohost/psql ];
+	then
+		echo "PostgreSQL is already installed, no need to create master password"
+	else
+		local pgsql="$(ynh_string_random)"
+		echo "$pgsql" > /etc/yunohost/psql
+
+		if [ -e /etc/postgresql/9.4/ ]
+		then
+			local pg_hba=/etc/postgresql/9.4/main/pg_hba.conf
+		elif [ -e /etc/postgresql/9.6/ ]
+		then
+			local pg_hba=/etc/postgresql/9.6/main/pg_hba.conf
+		else
+			ynh_die "postgresql shoud be 9.4 or 9.6"
+		fi
+
+		systemctl start postgresql
+		sudo --login --user=postgres psql -c"ALTER user postgres WITH PASSWORD '$pgsql'" postgres
+
+		# force all user to connect to local database using passwords
+		# https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html#EXAMPLE-PG-HBA.CONF
+		# Note: we can't use peer since YunoHost create users with nologin
+		#  See: https://github.com/YunoHost/yunohost/blob/unstable/data/helpers.d/user
+		sed -i '/local\s*all\s*all\s*peer/i \
+			local all all password' "$pg_hba"
+		systemctl enable postgresql
+		systemctl reload postgresql
+	fi
+}
+
+# Open a connection as a user
+#
+# example: ynh_psql_connect_as 'user' 'pass' <<< "UPDATE ...;"
+# example: ynh_psql_connect_as 'user' 'pass' < /path/to/file.sql
+#
+# usage: ynh_psql_connect_as user pwd [db]
+# | arg: user - the user name to connect as
+# | arg: pwd - the user password
+# | arg: db - the database to connect to
+ynh_psql_connect_as() {
+	local user="$1"
+	local pwd="$2"
+	local db="$3"
+	sudo --login --user=postgres PGUSER="$user" PGPASSWORD="$pwd" psql "$db"
+}
+
+# # Execute a command as root user
+#
+# usage: ynh_psql_execute_as_root sql [db]
+# | arg: sql - the SQL command to execute
+ynh_psql_execute_as_root () {
+	local sql="$1"
+	sudo --login --user=postgres psql <<< "$sql"
+}
+
+# Execute a command from a file as root user
+#
+# usage: ynh_psql_execute_file_as_root file [db]
+# | arg: file - the file containing SQL commands
+# | arg: db - the database to connect to
+ynh_psql_execute_file_as_root() {
+	local file="$1"
+	local db="$2"
+	sudo --login --user=postgres psql "$db" < "$file"
+}
+
+# Create a database, an user and its password. Then store the password in the app's config
+#
+# After executing this helper, the password of the created database will be available in $db_pwd
+# It will also be stored as "psqlpwd" into the app settings.
+#
+# usage: ynh_psql_setup_db user name [pwd]
+# | arg: user - Owner of the database
+# | arg: name - Name of the database
+# | arg: pwd - Password of the database. If not given, a password will be generated
+ynh_psql_setup_db () {
+	local db_user="$1"
+	local db_name="$2"
+	local new_db_pwd=$(ynh_string_random)	# Generate a random password
+	# If $3 is not given, use new_db_pwd instead for db_pwd.
+	local db_pwd="${3:-$new_db_pwd}"
+	ynh_psql_create_db "$db_name" "$db_user" "$db_pwd"	# Create the database
+	ynh_app_setting_set "$app" psqlpwd "$db_pwd"	# Store the password in the app's config
+}
+
+# Create a database and grant privilegies to a user
+#
+# usage: ynh_psql_create_db db [user [pwd]]
+# | arg: db - the database name to create
+# | arg: user - the user to grant privilegies
+# | arg: pwd  - the user password
+ynh_psql_create_db() {
+	local db="$1"
+	local user="$2"
+	local pwd="$3"
+	ynh_psql_create_user "$user" "$pwd"
+	sudo --login --user=postgres createdb --owner="$user" "$db"
+}
+
+# Drop a database
+#
+# usage: ynh_psql_drop_db db
+# | arg: db - the database name to drop
+# | arg: user - the user to drop
+ynh_psql_remove_db() {
+	local db="$1"
+	local user="$2"
+	sudo --login --user=postgres dropdb "$db"
+	ynh_psql_drop_user "$user"
+}
+
+# Dump a database
+#
+# example: ynh_psql_dump_db 'roundcube' > ./dump.sql
+#
+# usage: ynh_psql_dump_db db
+# | arg: db - the database name to dump
+# | ret: the psqldump output
+ynh_psql_dump_db() {
+	local db="$1"
+	sudo --login --user=postgres pg_dump "$db"
+}
+
+
+# Create a user
+#
+# usage: ynh_psql_create_user user pwd [host]
+# | arg: user - the user name to create
+ynh_psql_create_user() {
+	local user="$1"
+	local pwd="$2"
+	sudo --login --user=postgres psql -c"CREATE USER $user WITH PASSWORD '$pwd'" postgres
+}
+
+# Drop a user
+#
+# usage: ynh_psql_drop_user user
+# | arg: user - the user name to drop
+ynh_psql_drop_user() {
+	local user="$1"
+	sudo --login --user=postgres dropuser "$user"
+}

data/helpers.d/system

@@ -1,18 +1,19 @@
 # Manage a fail of the script
 #
-# Print a warning to inform that the script was failed
-# Execute the ynh_clean_setup function if used in the app script
+# [internal]
 #
-# usage of ynh_clean_setup function
-# This function provide a way to clean some residual of installation that not managed by remove script.
-# To use it, simply add in your script:
+# usage: 
+# ynh_exit_properly is used only by the helper ynh_abort_if_errors.
+# You should not use it directly.
+# Instead, add to your script:
 # ynh_clean_setup () {
 #        instructions...
 # }
-# This function is optionnal.
 #
-# Usage: ynh_exit_properly is used only by the helper ynh_abort_if_errors.
-# You must not use it directly.
+# This function provide a way to clean some residual of installation that not managed by remove script.
+#
+# It prints a warning to inform that the script was failed, and execute the ynh_clean_setup function if used in the app script
+#
 ynh_exit_properly () {
 	local exit_code=$?
 	if [ "$exit_code" -eq 0 ]; then
@@ -31,20 +32,24 @@ ynh_exit_properly () {
 	ynh_die	# Exit with error status
 }
 
-# Exit if an error occurs during the execution of the script.
+# Exits if an error occurs during the execution of the script.
 #
-# Stop immediatly the execution if an error occured or if a empty variable is used.
-# The execution of the script is derivate to ynh_exit_properly function before exit.
+# usage: ynh_abort_if_errors
+#
+# This configure the rest of the script execution such that, if an error occurs
+# or if an empty variable is used, the execution of the script stops
+# immediately and a call to `ynh_clean_setup` is triggered if it has been
+# defined by your script.
 #
-# Usage: ynh_abort_if_errors
 ynh_abort_if_errors () {
 	set -eu	# Exit if a command fail, and if a variable is used unset.
 	trap ynh_exit_properly EXIT	# Capturing exit signals on shell script
 }
 
-# Return the Debian release codename (i.e. jessie, stretch, etc.)
+# Fetch the Debian release codename
 #
 # usage: ynh_get_debian_release
+# | ret: The Debian release codename (i.e. jessie, stretch, ...)
 ynh_get_debian_release () {
 	echo $(lsb_release --codename --short)
-}
+}

data/helpers.d/utils

@@ -37,16 +37,23 @@ ynh_get_plain_key() {
 ynh_restore_upgradebackup () {
 	echo "Upgrade failed." >&2
 	local app_bck=${app//_/-}	# Replace all '_' by '-'
-	
-        # Check if an existing backup can be found before removing and restoring the application.
-	if sudo yunohost backup list | grep -q $app_bck-pre-upgrade$backup_number
-    	then
-		# Remove the application then restore it
-		sudo yunohost app remove $app
-		# Restore the backup
-		sudo yunohost backup restore --ignore-system $app_bck-pre-upgrade$backup_number --apps $app --force --verbose
-		ynh_die "The app was restored to the way it was before the failed upgrade."
-	fi
+
+  	NO_BACKUP_UPGRADE=${NO_BACKUP_UPGRADE:-0}
+
+	if [ "$NO_BACKUP_UPGRADE" -eq 0 ]
+	then	
+		# Check if an existing backup can be found before removing and restoring the application.
+		if sudo yunohost backup list | grep -q $app_bck-pre-upgrade$backup_number
+		then
+			# Remove the application then restore it
+			sudo yunohost app remove $app
+			# Restore the backup
+			sudo yunohost backup restore $app_bck-pre-upgrade$backup_number --apps $app --force
+			ynh_die "The app was restored to the way it was before the failed upgrade."
+		fi
+	else
+      		echo "\$NO_BACKUP_UPGRADE is set, that means there's no backup to restore. You have to fix this upgrade by yourself !" >&2
+  	fi
 }
 
 # Make a backup in case of failed upgrade
@@ -67,28 +74,34 @@ ynh_backup_before_upgrade () {
 	backup_number=1
 	local old_backup_number=2
 	local app_bck=${app//_/-}	# Replace all '_' by '-'
+	NO_BACKUP_UPGRADE=${NO_BACKUP_UPGRADE:-0}
 
-	# Check if a backup already exists with the prefix 1
-	if sudo yunohost backup list | grep -q $app_bck-pre-upgrade1
-	then
-		# Prefix becomes 2 to preserve the previous backup
-		backup_number=2
-		old_backup_number=1
-	fi
-
-	# Create backup
-	sudo yunohost backup create --ignore-system --apps $app --name $app_bck-pre-upgrade$backup_number --verbose
-	if [ "$?" -eq 0 ]
-	then
-		# If the backup succeeded, remove the previous backup
-		if sudo yunohost backup list | grep -q $app_bck-pre-upgrade$old_backup_number
+        if [ "$NO_BACKUP_UPGRADE" -eq 0 ]
+        then
+		# Check if a backup already exists with the prefix 1
+		if sudo yunohost backup list | grep -q $app_bck-pre-upgrade1
 		then
-			# Remove the previous backup only if it exists
-			sudo yunohost backup delete $app_bck-pre-upgrade$old_backup_number > /dev/null
+			# Prefix becomes 2 to preserve the previous backup
+			backup_number=2
+			old_backup_number=1
 		fi
-	else
-		ynh_die "Backup failed, the upgrade process was aborted."
-	fi
+
+		# Create backup
+		sudo BACKUP_CORE_ONLY=1 yunohost backup create --apps $app --name $app_bck-pre-upgrade$backup_number
+		if [ "$?" -eq 0 ]
+		then
+			# If the backup succeeded, remove the previous backup
+			if sudo yunohost backup list | grep -q $app_bck-pre-upgrade$old_backup_number
+			then
+				# Remove the previous backup only if it exists
+				sudo yunohost backup delete $app_bck-pre-upgrade$old_backup_number > /dev/null
+			fi
+		else
+			ynh_die "Backup failed, the upgrade process was aborted."
+		fi
+        else
+                echo "\$NO_BACKUP_UPGRADE is set, backup will be avoided. Be careful, this upgrade is going to be operated without a security backup"
+        fi
 }
 
 # Download, check integrity, uncompress and patch the source from app.src
@@ -109,6 +122,10 @@ ynh_backup_before_upgrade () {
 # # (Optionnal) Name of the local archive (offline setup support)
 # # default: ${src_id}.${src_format}
 # SOURCE_FILENAME=example.tar.gz 
+# # (Optional) If it set as false don't extract the source.
+# # (Useful to get a debian package or a python wheel.)
+# # default: true
+# SOURCE_EXTRACT=(true|false)
 #
 # Details:
 # This helper downloads sources from SOURCE_URL if there is no local source
@@ -137,6 +154,7 @@ ynh_setup_source () {
     local src_sum=$(grep 'SOURCE_SUM=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
     local src_sumprg=$(grep 'SOURCE_SUM_PRG=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
     local src_format=$(grep 'SOURCE_FORMAT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
+    local src_extract=$(grep 'SOURCE_EXTRACT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
     local src_in_subdir=$(grep 'SOURCE_IN_SUBDIR=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
     local src_filename=$(grep 'SOURCE_FILENAME=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-)
 
@@ -145,6 +163,7 @@ ynh_setup_source () {
     src_in_subdir=${src_in_subdir:-true}
     src_format=${src_format:-tar.gz}
     src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]')
+    src_extract=${src_extract:-true}
     if [ "$src_filename" = "" ] ; then
         src_filename="${src_id}.${src_format}"
     fi
@@ -163,7 +182,11 @@ ynh_setup_source () {
 
     # Extract source into the app dir
     mkdir -p "$dest_dir"
-    if [ "$src_format" = "zip" ]
+    
+    if ! "$src_extract"
+    then
+        mv $src_filename $dest_dir
+    elif [ "$src_format" = "zip" ]
     then 
         # Zip format
         # Using of a temp directory, because unzip doesn't manage --strip-components

data/hooks/conf_regen/01-yunohost

@@ -53,16 +53,25 @@ do_pre_regen() {
   else
       sudo cp services.yml /etc/yunohost/services.yml
   fi
+
+  mkdir -p "$pending_dir"/etc/etckeeper/
+  cp etckeeper.conf "$pending_dir"/etc/etckeeper/
 }
 
 _update_services() {
   sudo python2 - << EOF
 import yaml
+
+
 with open('services.yml') as f:
     new_services = yaml.load(f)
+
 with open('/etc/yunohost/services.yml') as f:
     services = yaml.load(f)
+
 updated = False
+
+
 for service, conf in new_services.items():
     # remove service with empty conf
     if conf is None:
@@ -70,20 +79,32 @@ for service, conf in new_services.items():
             print("removing '{0}' from services".format(service))
             del services[service]
             updated = True
+
     # add new service
     elif not services.get(service, None):
         print("adding '{0}' to services".format(service))
         services[service] = conf
         updated = True
+
     # update service conf
     else:
         conffiles = services[service].pop('conffiles', {})
+
+        # status need to be removed
+        if "status" not in conf and "status" in services[service]:
+            print("update '{0}' service status access".format(service))
+            del services[service]["status"]
+            updated = True
+
         if services[service] != conf:
             print("update '{0}' service".format(service))
             services[service].update(conf)
             updated = True
+
         if conffiles:
             services[service]['conffiles'] = conffiles
+
+
 if updated:
     with open('/etc/yunohost/services.yml-new', 'w') as f:
         yaml.safe_dump(services, f, default_flow_style=False)

data/hooks/conf_regen/02-ssl

@@ -10,6 +10,14 @@ do_init_regen() {
     exit 1
   fi
 
+  LOGFILE="/tmp/yunohost-ssl-init"
+
+  echo "Initializing a local SSL certification authority ..."
+  echo "(logs available in $LOGFILE)"
+
+  rm -f $LOGFILE
+  touch $LOGFILE
+
   # create certs and SSL directories
   mkdir -p "/etc/yunohost/certs/yunohost.org"
   mkdir -p "${ssl_dir}/"{ca,certs,crl,newcerts}
@@ -24,9 +32,10 @@ do_init_regen() {
 
   # create default certificates
   if [[ ! -f /etc/yunohost/certs/yunohost.org/ca.pem ]]; then
+      echo -e "\n# Creating the CA key (?)\n" >>$LOGFILE
       openssl req -x509 -new -config "$openssl_conf" \
         -days 3650 -out "${ssl_dir}/ca/cacert.pem" \
-        -keyout "${ssl_dir}/ca/cakey.pem" -nodes -batch 2>&1
+        -keyout "${ssl_dir}/ca/cakey.pem" -nodes -batch >>$LOGFILE 2>&1
       cp "${ssl_dir}/ca/cacert.pem" \
         /etc/yunohost/certs/yunohost.org/ca.pem
       ln -sf /etc/yunohost/certs/yunohost.org/ca.pem \
@@ -35,12 +44,13 @@ do_init_regen() {
   fi
 
   if [[ ! -f /etc/yunohost/certs/yunohost.org/crt.pem ]]; then
+      echo -e "\n# Creating initial key and certificate (?)\n" >>$LOGFILE
       openssl req -new -config "$openssl_conf" \
         -days 730 -out "${ssl_dir}/certs/yunohost_csr.pem" \
-        -keyout "${ssl_dir}/certs/yunohost_key.pem" -nodes -batch 2>&1
+        -keyout "${ssl_dir}/certs/yunohost_key.pem" -nodes -batch >>$LOGFILE 2>&1
       openssl ca -config "$openssl_conf" \
         -days 730 -in "${ssl_dir}/certs/yunohost_csr.pem" \
-        -out "${ssl_dir}/certs/yunohost_crt.pem" -batch 2>&1
+        -out "${ssl_dir}/certs/yunohost_crt.pem" -batch >>$LOGFILE 2>&1
 
       last_cert=$(ls $ssl_dir/newcerts/*.pem | sort -V | tail -n 1)
       chmod 640 "${ssl_dir}/certs/yunohost_key.pem"

data/hooks/conf_regen/06-slapd

@@ -46,7 +46,7 @@ do_pre_regen() {
   sudo rm -f "$tmp_backup_dir_file"
 
   # retrieve current and new backends
-  curr_backend=$(grep '^database' /etc/ldap/slapd.conf | awk '{print $2}')
+  curr_backend=$(grep '^database' /etc/ldap/slapd.conf 2>/dev/null | awk '{print $2}')
   new_backend=$(grep '^database' slapd.conf | awk '{print $2}')
 
   # save current database before any conf changes

data/hooks/conf_regen/28-rmilter

@@ -1,80 +0,0 @@
-#!/bin/bash
-
-set -e
-
-do_pre_regen() {
-  pending_dir=$1
-
-  cd /usr/share/yunohost/templates/rmilter
-
-  # Install main configuration
-  install -D -m 644 rmilter.conf \
-    "${pending_dir}/etc/rmilter.conf"
-
-  # Install DKIM specific configuration
-  install -D -m 644 ynh_dkim.conf \
-    "${pending_dir}/etc/rmilter.conf.d/ynh_dkim.conf"
-
-  # Remove old socket file (we stopped using it, since rspamd 1.3.1)
-  # Regen-conf system need an empty file to delete it
-  install -D -m 644 /dev/null \
-    "${pending_dir}/etc/systemd/system/rmilter.socket"
-}
-
-do_post_regen() {
-  regen_conf_files=$1
-
-  # retrieve variables
-  domain_list=$(sudo yunohost domain list --output-as plain --quiet)
-
-  # create DKIM directory with proper permission
-  sudo mkdir -p /etc/dkim
-  sudo chown _rmilter /etc/dkim
-
-  # create DKIM key for domains
-  for domain in $domain_list; do
-    domain_key="/etc/dkim/${domain}.mail.key"
-    [ ! -f $domain_key ] && {
-      sudo opendkim-genkey --domain="$domain" \
-          --selector=mail --directory=/etc/dkim
-      sudo mv /etc/dkim/mail.private "$domain_key"
-      sudo mv /etc/dkim/mail.txt "/etc/dkim/${domain}.mail.txt"
-    }
-  done
-
-  # fix DKIM keys permissions
-  sudo chown _rmilter /etc/dkim/*.mail.key
-  sudo chmod 400 /etc/dkim/*.mail.key
-
-  # fix rmilter socket permission (postfix is chrooted in /var/spool/postfix )
-  sudo mkdir -p /var/spool/postfix/run/rmilter
-  sudo chown -R postfix:_rmilter /var/spool/postfix/run/rmilter
-  sudo chmod g+w /var/spool/postfix/run/rmilter
-
-  [ -z "$regen_conf_files" ] && exit 0
-
-  # reload systemd daemon
-  sudo systemctl -q daemon-reload
-
-  # Restart rmilter due to the rspamd update
-  # https://rspamd.com/announce/2016/08/01/rspamd-1.3.1.html
-  sudo systemctl -q restart rmilter.service
-}
-
-FORCE=${2:-0}
-DRY_RUN=${3:-0}
-
-case "$1" in
-  pre)
-    do_pre_regen $4
-    ;;
-  post)
-    do_post_regen $4
-    ;;
-  *)
-    echo "hook called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-exit 0

data/hooks/conf_regen/31-rspamd

@@ -9,13 +9,43 @@ do_pre_regen() {
 
   install -D -m 644 metrics.local.conf \
       "${pending_dir}/etc/rspamd/local.d/metrics.conf"
+  install -D -m 644 dkim_signing.conf \
+      "${pending_dir}/etc/rspamd/local.d/dkim_signing.conf"
   install -D -m 644 rspamd.sieve \
       "${pending_dir}/etc/dovecot/global_script/rspamd.sieve"
 }
 
 do_post_regen() {
-  regen_conf_files=$1
 
+  ##
+  ## DKIM key generation
+  ##
+
+  # create DKIM directory with proper permission
+  sudo mkdir -p /etc/dkim
+  sudo chown _rspamd /etc/dkim
+
+  # retrieve domain list
+  domain_list=$(sudo yunohost domain list --output-as plain --quiet)
+
+  # create DKIM key for domains
+  for domain in $domain_list; do
+    domain_key="/etc/dkim/${domain}.mail.key"
+    [ ! -f "$domain_key" ] && {
+      # We use a 1024 bit size because nsupdate doesn't seem to be able to
+      # handle 2048...
+      sudo opendkim-genkey --domain="$domain" \
+          --selector=mail --directory=/etc/dkim -b 1024
+      sudo mv /etc/dkim/mail.private "$domain_key"
+      sudo mv /etc/dkim/mail.txt "/etc/dkim/${domain}.mail.txt"
+    }
+  done
+
+  # fix DKIM keys permissions
+  sudo chown _rspamd /etc/dkim/*.mail.key
+  sudo chmod 400 /etc/dkim/*.mail.key
+
+  regen_conf_files=$1
   [ -z "$regen_conf_files" ] && exit 0
 
   # compile sieve script

data/hooks/conf_regen/34-mysql

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+MYSQL_PKG="mariadb-server-10.1"
 
 do_pre_regen() {
   pending_dir=$1
@@ -31,19 +32,14 @@ do_post_regen() {
               "applications, and is going to reset the MySQL root password." \
               "You can find this new password in /etc/yunohost/mysql." >&2
 
-            # retrieve MySQL package provider
-            ynh_package_is_installed "mariadb-server-10.0" \
-              && mysql_pkg="mariadb-server-10.0" \
-              || mysql_pkg="mysql-server-5.5"
-
             # set new password with debconf
             sudo debconf-set-selections << EOF
-$mysql_pkg mysql-server/root_password password $mysql_password
-$mysql_pkg mysql-server/root_password_again password $mysql_password
+$MYSQL_PKG mysql-server/root_password password $mysql_password
+$MYSQL_PKG mysql-server/root_password_again password $mysql_password
 EOF
 
             # reconfigure Debian package
-            sudo dpkg-reconfigure -freadline -u "$mysql_pkg" 2>&1
+            sudo dpkg-reconfigure -freadline -u "$MYSQL_PKG" 2>&1
         else
             echo "It seems that you have already configured MySQL." \
               "YunoHost needs to have a root access to MySQL to runs its" \

data/hooks/conf_regen/46-nsswitch

@@ -14,7 +14,7 @@ do_post_regen() {
   regen_conf_files=$1
 
   [[ -z "$regen_conf_files" ]] \
-    || sudo service nscd restart
+    || sudo service unscd restart
 }
 
 FORCE=${2:-0}

data/hooks/conf_regen/52-fail2ban

@@ -9,9 +9,11 @@ do_pre_regen() {
 
   fail2ban_dir="${pending_dir}/etc/fail2ban"
   mkdir -p "${fail2ban_dir}/filter.d"
+  mkdir -p "${fail2ban_dir}/jail.d"
 
   cp yunohost.conf "${fail2ban_dir}/filter.d/yunohost.conf"
   cp jail.conf "${fail2ban_dir}/jail.conf"
+  cp yunohost-jails.conf "${fail2ban_dir}/jail.d/"
 }
 
 do_post_regen() {

data/hooks/restore/11-conf_ynh_mysql

@@ -1,4 +1,5 @@
 backup_dir="$1/conf/ynh/mysql"
+MYSQL_PKG="mariadb-server-10.1"
 
 # ensure that mysql is running
 service mysql status >/dev/null 2>&1 \
@@ -23,19 +24,14 @@ sudo mysqladmin -s -u root -p"$curr_pwd" password "$new_pwd" || {
     "applications, and is going to reset the MySQL root password." \
     "You can find this new password in /etc/yunohost/mysql." >&2
 
-  # retrieve MySQL package provider
-  ynh_package_is_installed "mariadb-server-10.0" \
-    && mysql_pkg="mariadb-server-10.0" \
-    || mysql_pkg="mysql-server-5.5"
-
   # set new password with debconf
   sudo debconf-set-selections << EOF
-$mysql_pkg mysql-server/root_password password $new_pwd
-$mysql_pkg mysql-server/root_password_again password $new_pwd
+$MYSQL_PKG mysql-server/root_password password $new_pwd
+$MYSQL_PKG mysql-server/root_password_again password $new_pwd
 EOF
 
   # reconfigure Debian package
-  sudo dpkg-reconfigure -freadline -u "$mysql_pkg" 2>&1
+  sudo dpkg-reconfigure -freadline -u "$MYSQL_PKG" 2>&1
 }
 
 # store new root password

data/other/yunoprompt.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=YunoHost boot prompt
+After=getty@tty2.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/yunoprompt
+StandardInput=tty
+TTYPath=/dev/tty2
+TTYReset=yes
+TTYVHangup=yes
+
+[Install]
+WantedBy=default.target

data/templates/dovecot/dovecot.conf

@@ -16,7 +16,7 @@ mail_plugins = $mail_plugins quota
 ssl = yes
 ssl_cert = </etc/yunohost/certs/{{ main_domain }}/crt.pem
 ssl_key = </etc/yunohost/certs/{{ main_domain }}/key.pem
-ssl_protocols = !SSLv2 !SSLv3
+ssl_protocols = !SSLv3
 
 passdb {
   args = /etc/dovecot/dovecot-ldap.conf

data/templates/fail2ban/yunohost-jails.conf

@@ -0,0 +1,32 @@
+[sshd]
+enabled = true
+
+[sshd-ddos]
+enabled = true
+
+[nginx-http-auth]
+enabled = true
+
+[postfix]
+enabled = true
+
+[dovecot]
+enabled = true
+
+[postfix-sasl]
+enabled = true
+
+[recidive]
+enabled = true
+
+[pam-generic]
+enabled = true
+
+[yunohost]
+enabled  = true
+port     = http,https
+protocol = tcp
+filter   = yunohost
+logpath  = /var/log/nginx/*error.log
+           /var/log/nginx/*access.log
+maxretry = 6

data/templates/fail2ban/yunohost.conf

@@ -14,8 +14,8 @@
 #          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
 # Values:  TEXT
 #
-failregex = helpers.lua:[1-9]+: authenticate\(\): Connection failed for: .*, client: <HOST>
-            ^<HOST> -.*\"POST /yunohost/api/login HTTP/1.1\" 401 22
+failregex = helpers.lua:[0-9]+: authenticate\(\): Connection failed for: .*, client: <HOST>
+            ^<HOST> -.*\"POST /yunohost/api/login HTTP/1.1\" 401
 
 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.

data/templates/nginx/plain/yunohost_admin.conf

@@ -12,6 +12,9 @@ server {
 }
 
 server {
+    # Disabling http2 for now as it's causing weird issues with curl
+    #listen 443 ssl http2 default_server;
+    #listen [::]:443 ssl http2 default_server;
     listen 443 ssl default_server;
     listen [::]:443 ssl default_server;
 
@@ -20,6 +23,13 @@ server {
     ssl_session_timeout 5m;
     ssl_session_cache shared:SSL:50m;
 
+    # As suggested by Mozilla : https://wiki.mozilla.org/Security/Server_Side_TLS and https://en.wikipedia.org/wiki/Curve25519
+    # (this doesn't work on jessie though ...?)
+    # ssl_ecdh_curve secp521r1:secp384r1:prime256v1;
+
+    # As suggested by https://cipherli.st/
+    ssl_ecdh_curve secp384r1;
+
     ssl_prefer_server_ciphers on;
 
     # Ciphers with intermediate compatibility
@@ -36,8 +46,18 @@ server {
     # Uncomment the following directive after DH generation
     # > openssl dhparam -out /etc/ssl/private/dh2048.pem -outform PEM -2 2048
     #ssl_dhparam /etc/ssl/private/dh2048.pem;
-
-    add_header Strict-Transport-Security "max-age=31536000;";
+    
+    # Follows the Web Security Directives from the Mozilla Dev Lab and the Mozilla Obervatory + Partners
+    # https://wiki.mozilla.org/Security/Guidelines/Web_Security
+    # https://observatory.mozilla.org/ 
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"; 
+    add_header 'Referrer-Policy' 'same-origin';
+    add_header Content-Security-Policy "upgrade-insecure-requests; object-src 'none'; script-src https: 'unsafe-eval'";
+    add_header X-Content-Type-Options nosniff;
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Download-Options noopen;
+    add_header X-Permitted-Cross-Domain-Policies none;
+    add_header X-Frame-Options "SAMEORIGIN";
 
     location / {
         return 302 https://$http_host/yunohost/admin;

data/templates/nginx/server.tpl.conf

@@ -16,6 +16,9 @@ server {
 }
 
 server {
+    # Disabling http2 for now as it's causing weird issues with curl
+    #listen 443 ssl http2;
+    #listen [::]:443 ssl http2;
     listen 443 ssl;
     listen [::]:443 ssl;
     server_name {{ domain }};
@@ -25,6 +28,13 @@ server {
     ssl_session_timeout 5m;
     ssl_session_cache shared:SSL:50m;
 
+    # As suggested by Mozilla : https://wiki.mozilla.org/Security/Server_Side_TLS and https://en.wikipedia.org/wiki/Curve25519
+    # (this doesn't work on jessie though ...?)
+    # ssl_ecdh_curve secp521r1:secp384r1:prime256v1;
+
+    # As suggested by https://cipherli.st/
+    ssl_ecdh_curve secp384r1;
+
     ssl_prefer_server_ciphers on;
 
     # Ciphers with intermediate compatibility
@@ -42,7 +52,17 @@ server {
     # > openssl dhparam -out /etc/ssl/private/dh2048.pem -outform PEM -2 2048
     #ssl_dhparam /etc/ssl/private/dh2048.pem;
 
-    add_header Strict-Transport-Security "max-age=31536000;";
+    # Follows the Web Security Directives from the Mozilla Dev Lab and the Mozilla Obervatory + Partners
+    # https://wiki.mozilla.org/Security/Guidelines/Web_Security
+    # https://observatory.mozilla.org/ 
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"; 
+    add_header Content-Security-Policy "upgrade-insecure-requests";
+    add_header Content-Security-Policy-Report-Only "default-src https: data: 'unsafe-inline' 'unsafe-eval'";
+    add_header X-Content-Type-Options nosniff;
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Download-Options noopen;
+    add_header X-Permitted-Cross-Domain-Policies none;
+    add_header X-Frame-Options "SAMEORIGIN";
 
     access_by_lua_file /usr/share/ssowat/access.lua;
 

data/templates/postfix/main.cf

@@ -45,6 +45,11 @@ smtp_tls_exclude_ciphers = $smtpd_tls_exclude_ciphers
 smtp_tls_mandatory_ciphers= $smtpd_tls_mandatory_ciphers
 smtp_tls_loglevel=1
 
+# Configure Root CA certificates
+# (for example, avoids getting "Untrusted TLS connection established to" messages in logs)
+smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
+smtp_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
+
 # See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
 # information on enabling SSL in the smtp client.
 
@@ -143,7 +148,7 @@ smtp_reply_filter = pcre:/etc/postfix/smtp_reply_filter
 # Rmilter
 milter_mail_macros =  i {mail_addr} {client_addr} {client_name} {auth_authen}
 milter_protocol = 6
-smtpd_milters = unix:/run/rmilter/rmilter.sock
+smtpd_milters = inet:localhost:11332
 
 # Skip email without checking if milter has died
 milter_default_action = accept

data/templates/postfix/plain/master.cf

@@ -1,53 +1,67 @@
 #
 # Postfix master process configuration file.  For details on the format
-# of the file, see the master(5) manual page (command: "man 5 master").
+# of the file, see the master(5) manual page (command: "man 5 master" or
+# on-line: http://www.postfix.org/master.5.html).
 #
 # Do not forget to execute "postfix reload" after editing this file.
 #
 # ==========================================================================
 # service type  private unpriv  chroot  wakeup  maxproc command + args
-#               (yes)   (yes)   (yes)   (never) (100)
+#               (yes)   (yes)   (no)    (never) (100)
 # ==========================================================================
-smtp      inet  n       -       -       -       -       smtpd
-submission inet n       -       -       -       -       smtpd
+smtp      inet  n       -       y       -       -       smtpd
+#smtp      inet  n       -       y       -       1       postscreen
+#smtpd     pass  -       -       y       -       -       smtpd
+#dnsblog   unix  -       -       y       -       0       dnsblog
+#tlsproxy  unix  -       -       y       -       0       tlsproxy
+submission inet n       -       y       -       -       smtpd
+  -o syslog_name=postfix/submission
   -o smtpd_tls_security_level=encrypt
   -o smtpd_sasl_auth_enable=yes
-  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+#  -o smtpd_reject_unlisted_recipient=no
+#  -o smtpd_client_restrictions=$mua_client_restrictions
+#  -o smtpd_helo_restrictions=$mua_helo_restrictions
+#  -o smtpd_sender_restrictions=$mua_sender_restrictions
+#  -o smtpd_recipient_restrictions=
+#  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
 #  -o milter_macro_daemon_name=ORIGINATING
-smtps     inet  n       -       -       -       -       smtpd
-  -o header_checks=pcre:/etc/postfix/header_checks
-  -o smtpd_tls_wrappermode=yes
-  -o smtpd_sasl_auth_enable=yes
-#  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+#smtps     inet  n       -       y       -       -       smtpd
+#  -o syslog_name=postfix/smtps
+#  -o smtpd_tls_wrappermode=yes
+#  -o smtpd_sasl_auth_enable=yes
+#  -o smtpd_reject_unlisted_recipient=no
+#  -o smtpd_client_restrictions=$mua_client_restrictions
+#  -o smtpd_helo_restrictions=$mua_helo_restrictions
+#  -o smtpd_sender_restrictions=$mua_sender_restrictions
+#  -o smtpd_recipient_restrictions=
+#  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
 #  -o milter_macro_daemon_name=ORIGINATING
-#628       inet  n       -       -       -       -       qmqpd
-pickup    fifo  n       -       -       60      1       pickup
-cleanup   unix  n       -       -       -       0       cleanup
-qmgr      fifo  n       -       n       300     1       qmgr
-#qmgr     fifo  n       -       -       300     1       oqmgr
-tlsmgr    unix  -       -       -       1000?   1       tlsmgr
-rewrite   unix  -       -       -       -       -       trivial-rewrite
-bounce    unix  -       -       -       -       0       bounce
-defer     unix  -       -       -       -       0       bounce
-trace     unix  -       -       -       -       0       bounce
-verify    unix  -       -       -       -       1       verify
-flush     unix  n       -       -       1000?   0       flush
+#628       inet  n       -       y       -       -       qmqpd
+pickup    unix  n       -       y       60      1       pickup
+cleanup   unix  n       -       y       -       0       cleanup
+qmgr      unix  n       -       n       300     1       qmgr
+#qmgr     unix  n       -       n       300     1       oqmgr
+tlsmgr    unix  -       -       y       1000?   1       tlsmgr
+rewrite   unix  -       -       y       -       -       trivial-rewrite
+bounce    unix  -       -       y       -       0       bounce
+defer     unix  -       -       y       -       0       bounce
+trace     unix  -       -       y       -       0       bounce
+verify    unix  -       -       y       -       1       verify
+flush     unix  n       -       y       1000?   0       flush
 proxymap  unix  -       -       n       -       -       proxymap
 proxywrite unix -       -       n       -       1       proxymap
-smtp      unix  -       -       -       -       -       smtp
-# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
-relay     unix  -       -       -       -       -       smtp
-	-o smtp_fallback_relay=
+smtp      unix  -       -       y       -       -       smtp
+relay     unix  -       -       y       -       -       smtp
 #       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
-showq     unix  n       -       -       -       -       showq
-error     unix  -       -       -       -       -       error
-retry     unix  -       -       -       -       -       error
-discard   unix  -       -       -       -       -       discard
+showq     unix  n       -       y       -       -       showq
+error     unix  -       -       y       -       -       error
+retry     unix  -       -       y       -       -       error
+discard   unix  -       -       y       -       -       discard
 local     unix  -       n       n       -       -       local
 virtual   unix  -       n       n       -       -       virtual
-lmtp      unix  -       -       -       -       -       lmtp
-anvil     unix  -       -       -       -       1       anvil
-scache    unix  -       -       -       -       1       scache
+lmtp      unix  -       -       y       -       -       lmtp
+anvil     unix  -       -       y       -       1       anvil
+scache    unix  -       -       y       -       1       scache
 #
 # ====================================================================
 # Interfaces to non-Postfix software. Be sure to examine the manual
@@ -111,8 +125,3 @@ mailman   unix  -       n       n       -       -       pipe
 # Dovecot LDA 
 dovecot    unix  -       n       n       -       -       pipe 
     flags=DRhu user=vmail:mail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -m ${extension}
-# ==========================================================================
-# service type  private unpriv  chroot  wakeup  maxproc command + args
-#               (yes)   (yes)   (yes)   (never) (100)
-# ==========================================================================
-# Added using postfix-add-filter script:

data/templates/rmilter/rmilter.conf

@@ -1,28 +0,0 @@
-# systemd-specific settings for rmilter
-
-# DKIM signing
-# Defined before including /etc/rmilter.conf.common because rmilter seems to be
-# unable to override dkim{} settings, even if it's already defined in
-# /etc/rmilter.conf.d/ynh_dkim.conf
-dkim {
-    enable = true;
-    domain {
-        key = /etc/dkim;
-        domain = "*";
-        selector = "mail";
-    };
-    header_canon = relaxed;
-    body_canon = relaxed;
-    sign_alg = sha256;
-};
-
-.include /etc/rmilter.conf.common
-
-# pidfile - path to pid file
-pidfile = /run/rmilter/rmilter.pid;
-
-bind_socket = unix:/var/spool/postfix/run/rmilter/rmilter.sock;
-
-# include user's configuration
-.try_include /etc/rmilter.conf.local
-.try_include /etc/rmilter.conf.d/*.conf

data/templates/rmilter/ynh_dkim.conf

@@ -1,14 +0,0 @@
-# DKIM signing
-# Note that DKIM signing should be done by rspamd in the near future
-# See https://github.com/vstakhov/rmilter/issues/174
-dkim {
-    enable = true;
-    domain {
-        key = /etc/dkim;
-        domain = "*";
-        selector = "mail";
-    };
-    header_canon = relaxed;
-    body_canon = relaxed;
-    sign_alg = sha256;
-};

data/templates/rspamd/dkim_signing.conf

@@ -0,0 +1,16 @@
+allow_envfrom_empty = true;
+allow_hdrfrom_mismatch = false;
+allow_hdrfrom_multiple = false;
+allow_username_mismatch = true;
+
+auth_only = true;
+path = "/etc/dkim/$domain.$selector.key";
+selector = "mail";
+sign_local = true;
+symbol = "DKIM_SIGNED";
+try_fallback = true;
+use_domain = "header";
+use_esld = false;
+use_redis = false;
+key_prefix = "DKIM_KEYS";
+

data/templates/rspamd/milter_headers.conf

@@ -0,0 +1,9 @@
+use = ["spam-header"];
+
+routines {
+  spam-header {
+    header = "X-Spam";
+    value = "Yes";
+    remove = 1;
+  }
+}

data/templates/yunohost/etckeeper.conf

@@ -0,0 +1,43 @@
+# The VCS to use.
+#VCS="hg"
+VCS="git"
+#VCS="bzr"
+#VCS="darcs"
+
+# Options passed to git commit when run by etckeeper.
+GIT_COMMIT_OPTIONS="--quiet"
+
+# Options passed to hg commit when run by etckeeper.
+HG_COMMIT_OPTIONS=""
+
+# Options passed to bzr commit when run by etckeeper.
+BZR_COMMIT_OPTIONS=""
+
+# Options passed to darcs record when run by etckeeper.
+DARCS_COMMIT_OPTIONS="-a"
+
+# Uncomment to avoid etckeeper committing existing changes
+# to /etc automatically once per day.
+#AVOID_DAILY_AUTOCOMMITS=1
+
+# Uncomment the following to avoid special file warning
+# (the option is enabled automatically by cronjob regardless).
+#AVOID_SPECIAL_FILE_WARNING=1
+
+# Uncomment to avoid etckeeper committing existing changes to 
+# /etc before installation. It will cancel the installation,
+# so you can commit the changes by hand.
+#AVOID_COMMIT_BEFORE_INSTALL=1
+
+# The high-level package manager that's being used.
+# (apt, pacman-g2, yum, zypper etc)
+HIGHLEVEL_PACKAGE_MANAGER=apt
+
+# The low-level package manager that's being used.
+# (dpkg, rpm, pacman, pacman-g2, etc)
+LOWLEVEL_PACKAGE_MANAGER=dpkg
+
+# To push each commit to a remote, put the name of the remote here.
+# (eg, "origin" for git). Space-separated lists of multiple remotes
+# also work (eg, "origin gitlab github" for git).
+PUSH_REMOTE=""

data/templates/yunohost/firewall.yml

@@ -1,10 +1,10 @@
 uPnP:
     enabled: false
-    TCP: [22, 25, 80, 443, 465, 587, 993, 5222, 5269]
+    TCP: [22, 25, 80, 443, 587, 993, 5222, 5269]
     UDP: []
 ipv4:
-    TCP: [22, 25, 53, 80, 443, 465, 587, 993, 5222, 5269]
+    TCP: [22, 25, 53, 80, 443, 587, 993, 5222, 5269]
     UDP: [53, 5353]
 ipv6:
-    TCP: [22, 25, 53, 80, 443, 465, 587, 993, 5222, 5269]
+    TCP: [22, 25, 53, 80, 443, 587, 993, 5222, 5269]
     UDP: [53, 5353]

data/templates/yunohost/services.yml

@@ -1,57 +1,43 @@
 nginx:
-   status: service
-   log: /var/log/nginx
+  log: /var/log/nginx
 avahi-daemon:
-   status: service
-   log: /var/log/daemon.log
+  log: /var/log/daemon.log
 dnsmasq:
-   status: service
-   log: /var/log/daemon.log
+  log: /var/log/daemon.log
 fail2ban:
-    status: service
-    log: /var/log/fail2ban.log
+  log: /var/log/fail2ban.log
 dovecot:
-   status: service
-   log: [/var/log/mail.log,/var/log/mail.err]
+  log: [/var/log/mail.log,/var/log/mail.err]
 postfix:
-   status: service
-   log: [/var/log/mail.log,/var/log/mail.err]
-rmilter:
-   status: systemctl status rmilter.service
-   log: /var/log/mail.log
+  log: [/var/log/mail.log,/var/log/mail.err]
 rspamd:
-   status: systemctl status rspamd.service
-   log: /var/log/mail.log
+  log: /var/log/rspamd/rspamd.log
 redis-server:
-   status: service
-   log: /var/log/redis/redis-server.log
+  log: /var/log/redis/redis-server.log
 mysql:
-   status: service
-   log: [/var/log/mysql.log,/var/log/mysql.err]
-glances:
-   status: service
+  log: [/var/log/mysql.log,/var/log/mysql.err]
+  alternates: ['mariadb']
+glances: {}
 ssh:
-   status: service
-   log: /var/log/auth.log
+  log: /var/log/auth.log
+ssl:
+  status: null
 metronome:
-   status: metronomectl status
-   log: [/var/log/metronome/metronome.log,/var/log/metronome/metronome.err]
+  log: [/var/log/metronome/metronome.log,/var/log/metronome/metronome.err]
 slapd:
-   status: service
-   log: /var/log/syslog
-php5-fpm:
-   status: service
-   log: /var/log/php5-fpm.log
+  log: /var/log/syslog
+php7.0-fpm:
+  log: /var/log/php7.0-fpm.log
 yunohost-api:
-   status: service
-   log: /var/log/yunohost/yunohost-api.log
+  log: /var/log/yunohost/yunohost-api.log
 yunohost-firewall:
-   status: service
-   need_lock: true
+  need_lock: true
 nslcd:
-   status: service
-   log: /var/log/syslog
-nsswitch: {}
+  log: /var/log/syslog
+nsswitch:
+  status: null
+yunohost:
+  status: null
 bind9: null
 tahoe-lafs: null
 memcached: null
@@ -60,3 +46,5 @@ udisk-glue: null
 amavis: null
 postgrey: null
 spamassassin: null
+rmilter: null
+php5-fpm: null

debian/changelog

@@ -1,8 +1,219 @@
+yunohost (3.0.0.1) stable; urgency=low
+
+  * Fix remaining use of --verbose and --ignore-system during backup/restore
+    of app upgrades
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Mon, 18 Jun 2018 18:31:00 +0000
+
+yunohost (3.0.0) stable; urgency=low
+
+  * Merge with jessie's branches
+  * Release as stable
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Sun, 17 Jun 2018 03:25:00 +0000
+
+yunohost (3.0.0~beta1.7) testing; urgency=low
+
+  * Merge with jessie's branches
+  * Set verbose by default
+  * Remove archivemount stuff
+  * Correctly patch php5/php7 stuff when doing a backup restore
+  * Fix counter-intuitive backup API
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Sat, 16 Jun 2018 16:20:00 +0000
+
+yunohost (3.0.0~beta1.6) testing; urgency=low
+
+  * [fix] Service description for php7.0-fpm
+  * [fix] Remove old logrotate for php5-fpm during migration
+  * [fix] Explicitly enable php7.0-fpm and disable php5-fpm during migration
+  * [fix] Don't open the old SMTP port anymore (465)
+  * [enh] Check space available before running the postgresql migration
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Tue, 12 Jun 2018 01:00:00 +0000
+
+yunohost (3.0.0~beta1.5) testing; urgency=low
+
+  * (c.f. 2.7.13.4)
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Mon, 02 Jun 2018 00:14:00 +0000
+
+yunohost (3.0.0~beta1.4) testing; urgency=low
+
+  * Merge with jessie's branches
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Mon, 28 May 2018 02:30:00 +0000
+
+yunohost (3.0.0~beta1.3) testing; urgency=low
+
+  * Use mariadb 10.1 now
+  * Convert old php comment starting with # for php5->7 migration
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Sat, 12 May 2018 19:26:00 +0000
+
+yunohost (3.0.0~beta1.2) testing; urgency=low
+
+  Removing http2 also from yunohost_admin.conf since there still are some
+  issues with wordpress ?
+ 
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Tue, 08 May 2018 05:52:00 +0000
+
+yunohost (3.0.0~beta1.1) testing; urgency=low
+
+  Fixes in the postgresql migration
+ 
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Sun, 06 May 2018 03:06:00 +0000
+
+yunohost (3.0.0~beta1) testing; urgency=low
+
+  Beta release for Stretch
+ 
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Thu, 03 May 2018 03:04:45 +0000
+
+yunohost (2.7.14) stable; urgency=low
+
+  * Last minute fix : install php7.0-acpu to hopefully make stretch still work after the upgrade
+  * Improve Occitan, French, Portuguese, Arabic translations
+  * [fix] local variables and various fix on psql helpers
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Sun, 17 Jun 2018 01:16:13 +0000
+
+yunohost (2.7.13.6) testing; urgency=low
+
+  * Misc fixes
+  * [stretch-migration] Disable predictable network interface names
+
+  Fixes by Bram and Aleks
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Fri, 15 Jun 2018 16:20:00 +0000
+
+yunohost (2.7.13.5) testing; urgency=low
+
+  * [fix] a bug when log to be fetched is empty
+  * [fix] a bug when computing diff in regen_conf
+  * [stretch-migration] Tell postgresql-common to not send an email about 9.4->9.6 migration
+  * [stretch-migration] Close port 465 / open port 587 during migration according to SMTP port change in postfix
+  * [stretch-migration] Rely on /etc/os-release to get debian release number
+
+  Fixes by Bram and Aleks
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Tue, 12 Jun 2018 01:00:00 +0000
+
+yunohost (2.7.13.4) testing; urgency=low
+
+  * Fix a bug for services with alternate names (mysql<->mariadb)
+  * Fix a bug in regen conf when computing diff with files that don't exists
+  * Increase backup filename length
+
+  (Fixes by Bram <3)
+ 
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Tue, 05 Jun 2018 18:22:00 +0000
+
+yunohost (2.7.13.3) testing; urgency=low
+
+  * [enh] Add postgresql helpers (#238)
+  * [enh] Bring back the bootprompt (#363)
+  * [enh] Allow to disable the backup during the upgrade (#431)
+  * [fix] Remove warning from equivs (#439)
+  * [enh] Add SOURCE_EXTRACT (true/false) in ynh_setup_source (#460)
+  * [enh] More debug output in services.py (#468)
+  * [enh] Be able to use more variables in template for nginx conf (#462)
+  * [enh] Upgrade Meltdown / Spectre diagnosis (#464)
+  * [enh] Check services status via dbus (#469, #478, #479)
+  * [mod] Cleaning in services.py code (#470, #472)
+  * [enh] Improvate and translate service descriptions (#476)
+  * [fix] Fix "untrusted TLS connection" in mail logs (#471)
+  * [fix] Make apt-get helper not quiet so we can debug (#475)
+  * [i18n] Improve Occitan, Portuguese, Arabic, French translations
+
+  Contributors : ljf, Maniack, Josue, Aleks, Bram, Quent-in, itxtoledo, ButterflyOfFire, Jibec, ariasuni, Haelwenn
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Mon, 28 May 2018 02:23:00 +0000
+
+yunohost (2.7.13.2) testing; urgency=low
+
+  * [fix] Fix an error with services marked as None (#466)
+  * [fix] Issue with nginx not upgrading correctly /etc/nginx/nginx.conf if it was manually modified
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Fri, 11 May 2018 02:06:42 +0000
+
+yunohost (2.7.13.1) testing; urgency=low
+
+  * [fix] Misc fixes on stretch migration following feedback
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Wed, 09 May 2018 00:44:50 +0000
+
+yunohost (2.7.13) testing; urgency=low
+
+  * [enh] Add 'manual migration' mechanism to the migration framework (#429)
+  * [enh] Add Stretch migration (#433)
+  * [enh] Use recommended ECDH curves (#454)
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Sun, 06 May 2018 23:10:13 +0000
+
+yunohost (2.7.12) stable; urgency=low
+
+  * [i18n] Improve translation for Portuguese
+  * Bump version number for stable release
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Sun, 06 May 2018 16:40:11 +0000
+
+yunohost (2.7.11.1) testing; urgency=low
+
+  * [fix] Nginx Regression typo (#459)
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Wed, 02 May 2018 12:12:45 +0000
+
+yunohost (2.7.11) testing; urgency=low
+
+  Important changes / fixes
+  -------------------------
+
+  * [enh] Add commands to manage user ssh accesses and keys (#403, #445)
+  * [fix] Fix Lets Encrypt install when an app is installed at root (#428)
+  * [enh] Improve performances by lazy-loading some modules (#451)
+  * [enh] Use Mozilla's recommended headers in nginx conf (#399, #456)
+  * [fix] Fix path traversal issues in yunohost admin nginx conf (#420)
+  * [helpers] Add nodejs helpers (#441, #446)
+
+  Other changes
+  -------------
+
+  * [enh] Enable gzip compression for common text mimetypes in nginx (#356)
+  * [enh] Add 'post' hooks on app management operations (#360)
+  * [fix] Fix an issue with custom backup methods and crons (#421)
+  * [mod] Simplify the way we fetch and test global ip (#424)
+  * [enh] Manage etckeeper.conf to make etckeeper quiet (#426)
+  * [fix] Be able to access conf folder in change_url scripts (#427)
+  * [enh] Verbosify backup/restores that are performed during app upgrades (#432)
+  * [enh] Display debug information on cert-install/renew failure (#447)
+  * [fix] Add mailutils and wget as a dependencies
+  * [mod] Misc tweaks to display more info when some commands fail
+  * [helpers] More explicit depreciation warning for 'app checkurl'
+  * [helpers] Fix an issue in ynh_restore_file if destination already exists (#384)
+  * [helpers] Update php-fpm helpers to handle stretch/php7 and a smooth migration (#373)
+  * [helpers] Add helper 'ynh_get_debian_release' (#373)
+  * [helpers] Trigger an error when failing to install dependencies (#381)
+  * [helpers] Allow for 'or' in dependencies (#381)
+  * [helpers] Tweak the usage of BACKUP_CORE_ONLY (#398)
+  * [helpers] Tweak systemd config helpers (optional service name and template name) (#425)
+  * [i18n] Improve translations for Arabic, French, German, Occitan, Spanish 
+
+  Thanks to all contributors (ariasuni, ljf, JimboJoe, frju365, Maniack, J-B Lescher, Josue, Aleks, Bram, jibec) and the several translators (ButterflyOfFire, Eric G., Cedric, J. Keerl, beyercenter, P. Gatzka, Quenti, bjarkan) <3 !
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Tue, 01 May 2018 22:04:40 +0000
+
+yunohost (2.7.10) stable; urgency=low
+
+  * [fix] Fail2ban conf/filter was not matching failed login attempts...
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Wed, 07 Mar 2018 12:43:35 +0000
+
 yunohost (2.7.9) stable; urgency=low
 
   (Bumping version number for stable release)
 
- -- Alexandre Aubin <alex.aubin.mailoo.org>  Tue, 30 Jan 2018 17:42:00 +0000
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Tue, 30 Jan 2018 17:42:00 +0000
 
 yunohost (2.7.8) testing; urgency=low
 

debian/control

@@ -12,28 +12,28 @@ Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
  , moulinette (>= 2.7.1), ssowat (>= 2.7.1)
  , python-psutil, python-requests, python-dnspython, python-openssl
- , python-apt, python-miniupnpc
+ , python-apt, python-miniupnpc, python-dbus
  , glances
- , dnsutils, bind9utils, unzip, git, curl, cron
+ , dnsutils, bind9utils, unzip, git, curl, cron, wget
  , ca-certificates, netcat-openbsd, iproute
- , mariadb-server | mysql-server, php5-mysql | php5-mysqlnd
- , slapd, ldap-utils, sudo-ldap, libnss-ldapd, nscd
- , postfix-ldap, postfix-policyd-spf-perl, postfix-pcre, procmail
+ , mariadb-server, php-mysql | php-mysqlnd
+ , slapd, ldap-utils, sudo-ldap, libnss-ldapd, unscd
+ , postfix-ldap, postfix-policyd-spf-perl, postfix-pcre, procmail, mailutils
  , dovecot-ldap, dovecot-lmtpd, dovecot-managesieved
  , dovecot-antispam, fail2ban
- , nginx-extras (>=1.6.2), php5-fpm, php5-ldap, php5-intl
+ , nginx-extras (>=1.6.2), php-fpm, php-ldap, php-intl
  , dnsmasq, openssl, avahi-daemon, libnss-mdns, resolvconf, libnss-myhostname
  , metronome
- , rspamd (>= 1.2.0), rmilter (>=1.7.0), redis-server, opendkim-tools
+ , rspamd (>= 1.6.0), redis-server, opendkim-tools
  , haveged
 Recommends: yunohost-admin
  , openssh-server, ntp, inetutils-ping | iputils-ping
  , bash-completion, rsyslog, etckeeper
- , php5-gd, php5-curl, php-gettext, php5-mcrypt
+ , php-gd, php-curl, php-gettext, php-mcrypt
  , python-pip
  , unattended-upgrades
  , libdbd-ldap-perl, libnet-dns-perl
-Suggests: htop, vim, rsync, acpi-support-base, udisks2, archivemount
+Suggests: htop, vim, rsync, acpi-support-base, udisks2
 Conflicts: iptables-persistent
  , moulinette-yunohost, yunohost-config
  , yunohost-config-others, yunohost-config-postfix

debian/install

@@ -3,6 +3,7 @@ sbin/* /usr/sbin/
 data/bash-completion.d/yunohost /etc/bash_completion.d/
 data/actionsmap/* /usr/share/moulinette/actionsmap/
 data/hooks/* /usr/share/yunohost/hooks/
+data/other/yunoprompt.service /etc/systemd/system/
 data/other/* /usr/share/yunohost/yunohost-config/moulinette/
 data/templates/* /usr/share/yunohost/templates/
 data/helpers /usr/share/yunohost/

debian/postinst

@@ -15,7 +15,7 @@ do_configure() {
       yunohost service regen-conf --output-as none
 
       echo "Launching migrations.."
-      yunohost tools migrations migrate
+      yunohost tools migrations migrate --auto
 
       # restart yunohost-firewall if it's running
       service yunohost-firewall status >/dev/null \
@@ -24,6 +24,9 @@ do_configure() {
             "consider to start it by doing 'service yunohost-firewall start'."
   fi
 
+  # Yunoprompt
+  systemctl enable yunoprompt.service
+
   # remove old PAM config and update it
   [[ ! -f /usr/share/pam-configs/my_mkhomedir ]] \
     || rm /usr/share/pam-configs/my_mkhomedir

debian/postrm

@@ -1,11 +1,20 @@
 #!/bin/bash
 
+# See https://manpages.debian.org/testing/dpkg-dev/deb-postrm.5.en.html
+# to understand when / how this script is called...
+
 set -e
 
 if [ "$1" = "purge" ]; then
    update-rc.d yunohost-firewall remove >/dev/null
+   rm -f /etc/yunohost/installed
 fi
 
+if [ "$1" = "remove" ]; then
+   rm -f /etc/yunohost/installed
+fi
+
+
 #DEBHELPER#
 
 exit 0

locales/ar.json

@@ -1,2 +1,384 @@
 {
+    "action_invalid": "إجراء غير صالح '{action:s}'",
+    "admin_password": "كلمة السر الإدارية",
+    "admin_password_change_failed": "تعذرت عملية تعديل كلمة السر",
+    "admin_password_changed": "تم تعديل الكلمة السرية الإدارية",
+    "app_already_installed": "{app:s} تم تنصيبه مِن قبل",
+    "app_already_installed_cant_change_url": "",
+    "app_already_up_to_date": "{app:s} تم تحديثه مِن قَبل",
+    "app_argument_choice_invalid": "",
+    "app_argument_invalid": "",
+    "app_argument_required": "",
+    "app_change_no_change_url_script": "",
+    "app_change_url_failed_nginx_reload": "",
+    "app_change_url_identical_domains": "The old and new domain/url_path are identical ('{domain:s}{path:s}'), nothing to do.",
+    "app_change_url_no_script": "This application '{app_name:s}' doesn't support url modification yet. Maybe you should upgrade the application.",
+    "app_change_url_success": "Successfully changed {app:s} url to {domain:s}{path:s}",
+    "app_extraction_failed": "تعذر فك الضغط عن ملفات التنصيب",
+    "app_id_invalid": "Invalid app id",
+    "app_incompatible": "إن التطبيق {app} غير متوافق مع إصدار واي يونوهوست YunoHost الخاص بك",
+    "app_install_files_invalid": "ملفات التنصيب خاطئة",
+    "app_location_already_used": "The app '{app}' is already installed on that location ({path})",
+    "app_make_default_location_already_used": "Can't make the app '{app}' the default on the domain {domain} is already used by the other app '{other_app}'",
+    "app_location_install_failed": "Unable to install the app in this location because it conflit with the app '{other_app}' already installed on '{other_path}'",
+    "app_location_unavailable": "This url is not available or conflicts with an already installed app",
+    "app_manifest_invalid": "Invalid app manifest: {error}",
+    "app_no_upgrade": "البرمجيات لا تحتاج إلى تحديث",
+    "app_not_correctly_installed": "يبدو أن التطبيق {app:s} لم يتم تنصيبه بشكل صحيح",
+    "app_not_installed": "إنّ التطبيق {app:s} غير مُنصَّب",
+    "app_not_properly_removed": "لم يتم حذف تطبيق {app:s} بشكلٍ جيّد",
+    "app_package_need_update": "The app {app} package needs to be updated to follow YunoHost changes",
+    "app_removed": "تمت إزالة تطبيق {app:s}",
+    "app_requirements_checking": "جار فحص الحزم اللازمة لـ {app} ...",
+    "app_requirements_failed": "Unable to meet requirements for {app}: {error}",
+    "app_requirements_unmeet": "Requirements are not met for {app}, the package {pkgname} ({version}) must be {spec}",
+    "app_sources_fetch_failed": "تعذرت عملية جلب مصادر الملفات",
+    "app_unknown": "برنامج مجهول",
+    "app_unsupported_remote_type": "Unsupported remote type used for the app",
+    "app_upgrade_app_name": "جارٍ تحديث برنامج {app}...",
+    "app_upgrade_failed": "تعذرت عملية ترقية {app:s}",
+    "app_upgrade_some_app_failed": "تعذرت عملية ترقية بعض البرمجيات",
+    "app_upgraded": "تم تحديث التطبيق {app:s}",
+    "appslist_corrupted_json": "Could not load the application lists. It looks like {filename:s} is corrupted.",
+    "appslist_could_not_migrate": "Could not migrate app list {appslist:s} ! Unable to parse the url... The old cron job has been kept in {bkp_file:s}.",
+    "appslist_fetched": "تم جلب قائمة تطبيقات {appslist:s}",
+    "appslist_migrating": "Migrating application list {appslist:s} ...",
+    "appslist_name_already_tracked": "There is already a registered application list with name {name:s}.",
+    "appslist_removed": "تم حذف قائمة البرمجيات {appslist:s}",
+    "appslist_retrieve_bad_format": "Retrieved file for application list {appslist:s} is not valid",
+    "appslist_retrieve_error": "Unable to retrieve the remote application list {appslist:s}: {error:s}",
+    "appslist_unknown": "قائمة البرمجيات {appslist:s} مجهولة.",
+    "appslist_url_already_tracked": "There is already a registered application list with url {url:s}.",
+    "ask_current_admin_password": "كلمة السر الإدارية الحالية",
+    "ask_email": "عنوان البريد الإلكتروني",
+    "ask_firstname": "الإسم",
+    "ask_lastname": "اللقب",
+    "ask_list_to_remove": "القائمة المختارة للحذف",
+    "ask_main_domain": "النطاق الرئيسي",
+    "ask_new_admin_password": "كلمة السر الإدارية الجديدة",
+    "ask_password": "كلمة السر",
+    "ask_path": "المسار",
+    "backup_abstract_method": "This backup method hasn't yet been implemented",
+    "backup_action_required": "You must specify something to save",
+    "backup_app_failed": "Unable to back up the app '{app:s}'",
+    "backup_applying_method_borg": "Sending all files to backup into borg-backup repository...",
+    "backup_applying_method_copy": "جارٍ نسخ كافة الملفات إلى النسخة الإحتياطية …",
+    "backup_applying_method_custom": "Calling the custom backup method '{method:s}'...",
+    "backup_applying_method_tar": "Creating the backup tar archive...",
+    "backup_archive_app_not_found": "App '{app:s}' not found in the backup archive",
+    "backup_archive_broken_link": "Unable to access backup archive (broken link to {path:s})",
+    "backup_archive_mount_failed": "Mounting the backup archive failed",
+    "backup_archive_name_exists": "The backup's archive name already exists",
+    "backup_archive_name_unknown": "Unknown local backup archive named '{name:s}'",
+    "backup_archive_open_failed": "Unable to open the backup archive",
+    "backup_archive_system_part_not_available": "System part '{part:s}' not available in this backup",
+    "backup_archive_writing_error": "Unable to add files to backup into the compressed archive",
+    "backup_ask_for_copying_if_needed": "Some files couldn't be prepared to be backuped using the method that avoid to temporarily waste space on the system. To perform the backup, {size:s}MB should be used temporarily. Do you agree?",
+    "backup_borg_not_implemented": "Borg backup method is not yet implemented",
+    "backup_cant_mount_uncompress_archive": "Unable to mount in readonly mode the uncompress archive directory",
+    "backup_cleaning_failed": "Unable to clean-up the temporary backup directory",
+    "backup_copying_to_organize_the_archive": "Copying {size:s}MB to organize the archive",
+    "backup_couldnt_bind": "Couldn't bind {src:s} to {dest:s}.",
+    "backup_created": "تم إنشاء النسخة الإحتياطية",
+    "backup_creating_archive": "Creating the backup archive...",
+    "backup_creation_failed": "Backup creation failed",
+    "backup_csv_addition_failed": "Unable to add files to backup into the CSV file",
+    "backup_csv_creation_failed": "Unable to create the CSV file needed for future restore operations",
+    "backup_custom_backup_error": "Custom backup method failure on 'backup' step",
+    "backup_custom_mount_error": "Custom backup method failure on 'mount' step",
+    "backup_custom_need_mount_error": "Custom backup method failure on 'need_mount' step",
+    "backup_delete_error": "Unable to delete '{path:s}'",
+    "backup_deleted": "The backup has been deleted",
+    "backup_extracting_archive": "Extracting the backup archive...",
+    "backup_hook_unknown": "Backup hook '{hook:s}' unknown",
+    "backup_invalid_archive": "نسخة إحتياطية غير صالحة",
+    "backup_method_borg_finished": "Backup into borg finished",
+    "backup_method_copy_finished": "إنتهت عملية النسخ الإحتياطي",
+    "backup_method_custom_finished": "Custom backup method '{method:s}' finished",
+    "backup_method_tar_finished": "Backup tar archive created",
+    "backup_no_uncompress_archive_dir": "Uncompress archive directory doesn't exist",
+    "backup_nothings_done": "ليس هناك أي شيء للحفظ",
+    "backup_output_directory_forbidden": "Forbidden output directory. Backups can't be created in /bin, /boot, /dev, /etc, /lib, /root, /run, /sbin, /sys, /usr, /var or /home/yunohost.backup/archives sub-folders",
+    "backup_output_directory_not_empty": "The output directory is not empty",
+    "backup_output_directory_required": "يتوجب عليك تحديد مجلد لتلقي النسخ الإحتياطية",
+    "backup_output_symlink_dir_broken": "You have a broken symlink instead of your archives directory '{path:s}'. You may have a specific setup to backup your data on an other filesystem, in this case you probably forgot to remount or plug your hard dirve or usb key.",
+    "backup_running_app_script": "Running backup script of app '{app:s}'...",
+    "backup_running_hooks": "Running backup hooks...",
+    "backup_system_part_failed": "Unable to backup the '{part:s}' system part",
+    "backup_unable_to_organize_files": "Unable to organize files in the archive with the quick method",
+    "backup_with_no_backup_script_for_app": "App {app:s} has no backup script. Ignoring.",
+    "backup_with_no_restore_script_for_app": "App {app:s} has no restore script, you won't be able to automatically restore the backup of this app.",
+    "certmanager_acme_not_configured_for_domain": "Certificate for domain {domain:s} does not appear to be correctly installed. Please run cert-install for this domain first.",
+    "certmanager_attempt_to_renew_nonLE_cert": "The certificate for domain {domain:s} is not issued by Let's Encrypt. Cannot renew it automatically!",
+    "certmanager_attempt_to_renew_valid_cert": "The certificate for domain {domain:s} is not about to expire! Use --force to bypass",
+    "certmanager_attempt_to_replace_valid_cert": "You are attempting to overwrite a good and valid certificate for domain {domain:s}! (Use --force to bypass)",
+    "certmanager_cannot_read_cert": "Something wrong happened when trying to open current certificate for domain {domain:s} (file: {file:s}), reason: {reason:s}",
+    "certmanager_cert_install_success": "تمت عملية تنصيب شهادة Let's Encrypt  بنجاح على النطاق  {domain:s} !",
+    "certmanager_cert_install_success_selfsigned": "Successfully installed a self-signed certificate for domain {domain:s}!",
+    "certmanager_cert_renew_success": "نجحت عملية تجديد شهادة Let's Encrypt الخاصة باسم النطاق {domain:s} !",
+    "certmanager_cert_signing_failed": "فشل إجراء توقيع الشهادة الجديدة",
+    "certmanager_certificate_fetching_or_enabling_failed": "Sounds like enabling the new certificate for {domain:s} failed somehow...",
+    "certmanager_conflicting_nginx_file": "Unable to prepare domain for ACME challenge: the nginx configuration file {filepath:s} is conflicting and should be removed first",
+    "certmanager_couldnt_fetch_intermediate_cert": "Timed out when trying to fetch intermediate certificate from Let's Encrypt. Certificate installation/renewal aborted - please try again later.",
+    "certmanager_domain_cert_not_selfsigned": "The certificate for domain {domain:s} is not self-signed. Are you sure you want to replace it? (Use --force)",
+    "certmanager_domain_dns_ip_differs_from_public_ip": "The DNS 'A' record for domain {domain:s} is different from this server IP. If you recently modified your A record, please wait for it to propagate (some DNS propagation checkers are available online). (If you know what you are doing, use --no-checks to disable those checks.)",
+    "certmanager_domain_http_not_working": "It seems that the domain {domain:s} cannot be accessed through HTTP. Please check your DNS and nginx configuration is okay",
+    "certmanager_domain_not_resolved_locally": "The domain {domain:s} cannot be resolved from inside your Yunohost server. This might happen if you recently modified your DNS record. If so, please wait a few hours for it to propagate. If the issue persists, consider adding {domain:s} to /etc/hosts. (If you know what you are doing, use --no-checks to disable those checks.)",
+    "certmanager_domain_unknown": "النطاق مجهول {domain:s}",
+    "certmanager_error_no_A_record": "No DNS 'A' record found for {domain:s}. You need to make your domain name point to your machine to be able to install a Let's Encrypt certificate! (If you know what you are doing, use --no-checks to disable those checks.)",
+    "certmanager_hit_rate_limit": "Too many certificates already issued for exact set of domains {domain:s} recently. Please try again later. See https://letsencrypt.org/docs/rate-limits/ for more details",
+    "certmanager_http_check_timeout": "Timed out when server tried to contact itself through HTTP using public IP address (domain {domain:s} with ip {ip:s}). You may be experiencing hairpinning issue or the firewall/router ahead of your server is misconfigured.",
+    "certmanager_no_cert_file": "تعذرت عملية قراءة شهادة نطاق {domain:s} (الملف : {file:s})",
+    "certmanager_old_letsencrypt_app_detected": "",
+    "certmanager_self_ca_conf_file_not_found": "Configuration file not found for self-signing authority (file: {file:s})",
+    "certmanager_unable_to_parse_self_CA_name": "Unable to parse name of self-signing authority (file: {file: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": "لم نتمكن من العثور على إصدار ديبيان : {error}",
+    "diagnosis_kernel_version_error": "Can't retrieve kernel version: {error}",
+    "diagnosis_monitor_disk_error": "Can't monitor disks: {error}",
+    "diagnosis_monitor_network_error": "Can't monitor network: {error}",
+    "diagnosis_monitor_system_error": "Can't monitor system: {error}",
+    "diagnosis_no_apps": "لم تقم بتنصيب أية تطبيقات بعد",
+    "dnsmasq_isnt_installed": "dnsmasq does not seem to be installed, please run 'apt-get remove bind9 && apt-get install dnsmasq'",
+    "domain_cannot_remove_main": "Cannot remove main domain. Set a new main domain first",
+    "domain_cert_gen_failed": "Unable to generate certificate",
+    "domain_created": "تم إنشاء النطاق",
+    "domain_creation_failed": "تعذرت عملية إنشاء النطاق",
+    "domain_deleted": "تم حذف النطاق",
+    "domain_deletion_failed": "Unable to delete domain",
+    "domain_dns_conf_is_just_a_recommendation": "This command shows you what is 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've already subscribed to a DynDNS domain",
+    "domain_dyndns_dynette_is_unreachable": "Unable to reach YunoHost dynette, either your YunoHost is not correctly connected to the internet or the dynette server is down. Error: {error}",
+    "domain_dyndns_invalid": "Invalid domain to use with DynDNS",
+    "domain_dyndns_root_unknown": "Unknown DynDNS root domain",
+    "domain_exists": "Domain already exists",
+    "domain_hostname_failed": "Failed to set new hostname",
+    "domain_uninstall_app_first": "One or more apps are installed on this domain. Please uninstall them before proceeding to domain removal",
+    "domain_unknown": "النطاق مجهول",
+    "domain_zone_exists": "DNS zone file already exists",
+    "domain_zone_not_found": "DNS zone file not found for domain {:s}",
+    "domains_available": "النطاقات المتوفرة :",
+    "done": "تم",
+    "downloading": "عملية التنزيل جارية …",
+    "dyndns_could_not_check_provide": "Could not check if {provider:s} can provide {domain:s}.",
+    "dyndns_cron_installed": "The DynDNS cron job has been installed",
+    "dyndns_cron_remove_failed": "Unable to remove the DynDNS cron job",
+    "dyndns_cron_removed": "The DynDNS cron job has been removed",
+    "dyndns_ip_update_failed": "Unable to update IP address on DynDNS",
+    "dyndns_ip_updated": "Your IP address has been updated on DynDNS",
+    "dyndns_key_generating": "DNS key is being generated, it may take a while...",
+    "dyndns_key_not_found": "DNS key not found for the domain",
+    "dyndns_no_domain_registered": "No domain has been registered with DynDNS",
+    "dyndns_registered": "The DynDNS domain has been registered",
+    "dyndns_registration_failed": "Unable to register DynDNS domain: {error:s}",
+    "dyndns_domain_not_provided": "Dyndns provider {provider:s} cannot provide domain {domain:s}.",
+    "dyndns_unavailable": "Domain {domain:s} is not available.",
+    "executing_command": "Executing command '{command:s}'...",
+    "executing_script": "Executing script '{script:s}'...",
+    "extracting": "عملية فك الضغط جارية …",
+    "field_invalid": "Invalid field '{:s}'",
+    "firewall_reload_failed": "Unable to reload the firewall",
+    "firewall_reloaded": "The firewall has been reloaded",
+    "firewall_rules_cmd_failed": "Some firewall rules commands have failed. For more information, see the log.",
+    "format_datetime_short": "%m/%d/%Y %I:%M %p",
+    "global_settings_bad_choice_for_enum": "Bad value for setting {setting:s}, received {received_type:s}, except {expected_type:s}",
+    "global_settings_bad_type_for_setting": "Bad type for setting {setting:s}, received {received_type:s}, except {expected_type:s}",
+    "global_settings_cant_open_settings": "Failed to open settings file, reason: {reason:s}",
+    "global_settings_cant_serialize_settings": "Failed to serialize settings data, reason: {reason:s}",
+    "global_settings_cant_write_settings": "Failed to write settings file, reason: {reason:s}",
+    "global_settings_key_doesnt_exists": "The key '{settings_key:s}' doesn't exists in the global settings, you can see all the available keys by doing 'yunohost settings list'",
+    "global_settings_reset_success": "Success. Your previous settings have been backuped in {path:s}",
+    "global_settings_setting_example_bool": "Example boolean option",
+    "global_settings_setting_example_enum": "Example enum option",
+    "global_settings_setting_example_int": "Example int option",
+    "global_settings_setting_example_string": "Example string option",
+    "global_settings_unknown_setting_from_settings_file": "Unknown key in settings: '{setting_key:s}', discarding it and save it in /etc/yunohost/unkown_settings.json",
+    "global_settings_unknown_type": "Unexpected situation, the setting {setting:s} appears to have the type {unknown_type:s} but it's not a type supported by the system.",
+    "hook_exec_failed": "Script execution failed: {path:s}",
+    "hook_exec_not_terminated": "Script execution hasn’t terminated: {path:s}",
+    "hook_list_by_invalid": "Invalid property to list hook by",
+    "hook_name_unknown": "Unknown hook name '{name:s}'",
+    "installation_complete": "إكتملت عملية التنصيب",
+    "installation_failed": "Installation failed",
+    "invalid_url_format": "Invalid URL format",
+    "ip6tables_unavailable": "You cannot play with ip6tables here. You are either in a container or your kernel does not support it",
+    "iptables_unavailable": "You cannot play with iptables here. You are either in a container or your kernel does not support it",
+    "ldap_init_failed_to_create_admin": "LDAP initialization failed to create admin user",
+    "ldap_initialized": "LDAP has been initialized",
+    "license_undefined": "undefined",
+    "mail_alias_remove_failed": "Unable to remove mail alias '{mail:s}'",
+    "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",
+    "maindomain_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",
+    "migrate_tsig_wait": "Let's wait 3min for the dyndns server to take the new key into account...",
+    "migrate_tsig_wait_2": "دقيقتين …",
+    "migrate_tsig_wait_3": "دقيقة واحدة …",
+    "migrate_tsig_wait_4": "30 ثانية …",
+    "migrate_tsig_not_needed": "You do not appear to use a dyndns domain, so no migration is needed !",
+    "migrations_backward": "Migrating backward.",
+    "migrations_bad_value_for_target": "Invalid number for target argument, available migrations numbers are 0 or {}",
+    "migrations_cant_reach_migration_file": "Can't access migrations files at path %s",
+    "migrations_current_target": "Migration target is {}",
+    "migrations_error_failed_to_load_migration": "ERROR: failed to load migration {number} {name}",
+    "migrations_forward": "Migrating forward",
+    "migrations_loading_migration": "Loading migration {number} {name}...",
+    "migrations_migration_has_failed": "Migration {number} {name} has failed with exception {exception}, aborting",
+    "migrations_no_migrations_to_run": "No migrations to run",
+    "migrations_show_currently_running_migration": "Running migration {number} {name}...",
+    "migrations_show_last_migration": "Last ran migration is {}",
+    "migrations_skip_migration": "Skipping migration {number} {name}...",
+    "monitor_disabled": "The server monitoring has been disabled",
+    "monitor_enabled": "The server monitoring has been enabled",
+    "monitor_glances_con_failed": "Unable to connect to Glances server",
+    "monitor_not_enabled": "Server monitoring is not enabled",
+    "monitor_period_invalid": "Invalid time period",
+    "monitor_stats_file_not_found": "Statistics file not found",
+    "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": "MySQL database creation failed",
+    "mysql_db_init_failed": "MySQL database init failed",
+    "mysql_db_initialized": "The MySQL database has been initialized",
+    "network_check_mx_ko": "DNS MX record is not set",
+    "network_check_smtp_ko": "Outbound mail (SMTP port 25) seems to be blocked by your network",
+    "network_check_smtp_ok": "Outbound mail (SMTP port 25) is not blocked",
+    "new_domain_required": "You must provide the new main domain",
+    "no_appslist_found": "No app list found",
+    "no_internet_connection": "Server is not connected to the Internet",
+    "no_ipv6_connectivity": "IPv6 connectivity is not available",
+    "no_restore_script": "No restore script found for the app '{app:s}'",
+    "not_enough_disk_space": "Not enough free disk space on '{path:s}'",
+    "package_not_installed": "Package '{pkgname}' is not installed",
+    "package_unexpected_error": "An unexpected error occurred processing the package '{pkgname}'",
+    "package_unknown": "Unknown package '{pkgname}'",
+    "packages_no_upgrade": "لا يوجد هناك أية حزمة بحاجة إلى تحديث",
+    "packages_upgrade_critical_later": "Critical packages ({packages:s}) will be upgraded later",
+    "packages_upgrade_failed": "Unable to upgrade all of the packages",
+    "path_removal_failed": "Unable to remove path {:s}",
+    "pattern_backup_archive_name": "Must be a valid filename with max 30 characters, and alphanumeric and -_. characters only",
+    "pattern_domain": "يتوجب أن يكون إسم نطاق صالح (مثل my-domain.org)",
+    "pattern_email": "يتوجب أن يكون عنوان بريد إلكتروني صالح (مثل someone@domain.org)",
+    "pattern_firstname": "Must be a valid first name",
+    "pattern_lastname": "Must be a valid last name",
+    "pattern_listname": "Must be alphanumeric and underscore characters only",
+    "pattern_mailbox_quota": "Must be a size with b/k/M/G/T suffix or 0 to disable the quota",
+    "pattern_password": "يتوجب أن تكون مكونة من 3 حروف على الأقل",
+    "pattern_port": "يجب أن يكون رقم منفذ صالح (مثال 0-65535)",
+    "pattern_port_or_range": "Must be a valid port number (i.e. 0-65535) or range of ports (e.g. 100:200)",
+    "pattern_positive_number": "يجب أن يكون عددا إيجابيا",
+    "pattern_username": "Must be lower-case alphanumeric and underscore characters only",
+    "port_already_closed": "Port {port:d} is already closed for {ip_version:s} connections",
+    "port_already_opened": "Port {port:d} is already opened for {ip_version:s} connections",
+    "port_available": "المنفذ {port:d} متوفر",
+    "port_unavailable": "Port {port:d} is not available",
+    "restore_action_required": "You must specify something to restore",
+    "restore_already_installed_app": "An app is already installed with the id '{app:s}'",
+    "restore_app_failed": "Unable to restore the app '{app:s}'",
+    "restore_cleaning_failed": "Unable to clean-up the temporary restoration directory",
+    "restore_complete": "Restore complete",
+    "restore_confirm_yunohost_installed": "Do you really want to restore an already installed system? [{answers:s}]",
+    "restore_extracting": "فك الضغط عن الملفات التي نحتاجها من النسخة الإحتياطية ...",
+    "restore_failed": "Unable to restore the system",
+    "restore_hook_unavailable": "Restoration script for '{part:s}' not available on your system and not in the archive either",
+    "restore_may_be_not_enough_disk_space": "Your system seems not to have enough disk space (freespace: {free_space:d} B, needed space: {needed_space:d} B, security margin: {margin:d} B)",
+    "restore_mounting_archive": "تنصيب النسخة الإحتياطية على المسار '{path:s}'",
+    "restore_not_enough_disk_space": "Not enough disk space (freespace: {free_space:d} B, needed space: {needed_space:d} B, security margin: {margin:d} B)",
+    "restore_nothings_done": "Nothing has been restored",
+    "restore_removing_tmp_dir_failed": "Unable to remove an old temporary directory",
+    "restore_running_app_script": "Running restore script of app '{app:s}'...",
+    "restore_running_hooks": "Running restoration hooks...",
+    "restore_system_part_failed": "Unable to restore the '{part:s}' system part",
+    "server_shutdown": "سوف ينطفئ الخادوم",
+    "server_shutdown_confirm": "سوف ينطفئ الخادوم حالا. متأكد ؟ [{answers:s}]",
+    "server_reboot": "The server will reboot",
+    "server_reboot_confirm": "The server will reboot immediatly, are you sure? [{answers:s}]",
+    "service_add_failed": "تعذرت إضافة خدمة '{service:s}'",
+    "service_added": "The service '{service:s}' has been added",
+    "service_already_started": "Service '{service:s}' has already been started",
+    "service_already_stopped": "Service '{service:s}' has already been stopped",
+    "service_cmd_exec_failed": "Unable to execute command '{command:s}'",
+    "service_conf_file_backed_up": "The configuration file '{conf}' has been backed up to '{backup}'",
+    "service_conf_file_copy_failed": "Unable to copy the new configuration file '{new}' to '{conf}'",
+    "service_conf_file_kept_back": "The configuration file '{conf}' is expected to be deleted by service {service} but has been kept back.",
+    "service_conf_file_manually_modified": "The configuration file '{conf}' has been manually modified and will not be updated",
+    "service_conf_file_manually_removed": "The configuration file '{conf}' has been manually removed and will not be created",
+    "service_conf_file_remove_failed": "Unable to remove the configuration file '{conf}'",
+    "service_conf_file_removed": "The configuration file '{conf}' has been removed",
+    "service_conf_file_updated": "The configuration file '{conf}' has been updated",
+    "service_conf_new_managed_file": "The configuration file '{conf}' is now managed by the service {service}.",
+    "service_conf_up_to_date": "The configuration is already up-to-date for service '{service}'",
+    "service_conf_updated": "The configuration has been updated for service '{service}'",
+    "service_conf_would_be_updated": "The configuration would have been updated for service '{service}'",
+    "service_disable_failed": "",
+    "service_disabled": "The service '{service:s}' has been disabled",
+    "service_enable_failed": "",
+    "service_enabled": "تم تنشيط خدمة '{service:s}'",
+    "service_no_log": "ليس لخدمة '{service:s}' أي سِجلّ للعرض",
+    "service_regenconf_dry_pending_applying": "Checking pending configuration which would have been applied for service '{service}'...",
+    "service_regenconf_failed": "Unable to regenerate the configuration for service(s): {services}",
+    "service_regenconf_pending_applying": "Applying pending configuration for service '{service}'...",
+    "service_remove_failed": "Unable to remove service '{service:s}'",
+    "service_removed": "تمت إزالة خدمة '{service:s}'",
+    "service_start_failed": "",
+    "service_started": "تم إطلاق تشغيل خدمة  '{service:s}'",
+    "service_status_failed": "Unable to determine status of service '{service:s}'",
+    "service_stop_failed": "",
+    "service_stopped": "The service '{service:s}' has been stopped",
+    "service_unknown": "Unknown service '{service:s}'",
+    "ssowat_conf_generated": "The SSOwat configuration has been generated",
+    "ssowat_conf_updated": "The SSOwat configuration has been updated",
+    "ssowat_persistent_conf_read_error": "Error while reading SSOwat persistent configuration: {error:s}. Edit /etc/ssowat/conf.json.persistent file to fix the JSON syntax",
+    "ssowat_persistent_conf_write_error": "Error while saving SSOwat persistent configuration: {error:s}. Edit /etc/ssowat/conf.json.persistent file to fix the JSON syntax",
+    "system_upgraded": "تمت عملية ترقية النظام",
+    "system_username_exists": "Username already exists in the system users",
+    "unbackup_app": "App '{app:s}' will not be saved",
+    "unexpected_error": "An unexpected error occured",
+    "unit_unknown": "Unknown unit '{unit:s}'",
+    "unlimit": "دون تحديد الحصة",
+    "unrestore_app": "App '{app:s}' will not be restored",
+    "update_cache_failed": "Unable to update APT cache",
+    "updating_apt_cache": "جارٍ تحديث قائمة الحُزم المتوفرة …",
+    "upgrade_complete": "إكتملت عملية الترقية و التحديث",
+    "upgrading_packages": "عملية ترقية الحُزم جارية …",
+    "upnp_dev_not_found": "No UPnP device found",
+    "upnp_disabled": "UPnP has been disabled",
+    "upnp_enabled": "UPnP has been enabled",
+    "upnp_port_open_failed": "Unable to open UPnP ports",
+    "user_created": "تم إنشاء المستخدم",
+    "user_creation_failed": "Unable to create user",
+    "user_deleted": "تم حذف المستخدم",
+    "user_deletion_failed": "لا يمكن حذف المستخدم",
+    "user_home_creation_failed": "Unable to create user home folder",
+    "user_info_failed": "Unable to retrieve user information",
+    "user_unknown": "المستخدم {user:s} مجهول",
+    "user_update_failed": "لا يمكن تحديث المستخدم",
+    "user_updated": "تم تحديث المستخدم",
+    "yunohost_already_installed": "YunoHost is already installed",
+    "yunohost_ca_creation_failed": "تعذرت عملية إنشاء هيئة الشهادات",
+    "yunohost_ca_creation_success": "تم إنشاء هيئة الشهادات المحلية.",
+    "yunohost_configured": "YunoHost has been configured",
+    "yunohost_installing": "عملية تنصيب يونوهوست جارية …",
+    "yunohost_not_installed": "إنَّ واي يونوهوست ليس مُنَصَّب أو هو مثبت حاليا بشكل خاطئ. قم بتنفيذ الأمر 'yunohost tools postinstall'",
+    "migration_description_0003_migrate_to_stretch": "تحديث النظام إلى ديبيان ستريتش و واي يونوهوست 3.0",
+    "migration_0003_patching_sources_list": "عملية تعديل ملف المصادر sources.lists جارية ...",
+    "migration_0003_main_upgrade": "بداية عملية التحديث الأساسية ...",
+    "migration_0003_fail2ban_upgrade": "بداية عملية تحديث fail2ban ...",
+    "migration_0003_not_jessie": "إن توزيعة ديبيان الحالية تختلف عن جيسي !",
+    "migration_description_0002_migrate_to_tsig_sha256": "يقوم بتحسين أمان TSIG لنظام أسماء النطاقات الديناميكة باستخدام SHA512 بدلًا مِن MD5",
+    "migration_0003_backward_impossible": "لا يُمكن إلغاء عملية الإنتقال إلى ستريتش.",
+    "migration_0003_system_not_fully_up_to_date": "إنّ نظامك غير مُحدَّث بعدُ لذا يرجى القيام بتحديث عادي أولا قبل إطلاق إجراء الإنتقال إلى نظام ستريتش.",
+    "migrations_list_conflict_pending_done": "لا يمكنك استخدام --previous و --done معًا على نفس سطر الأوامر.",
+    "service_description_avahi-daemon": "يسمح لك بالنفاذ إلى خادومك عبر الشبكة المحلية باستخدام yunohost.local",
+    "service_description_glances": "يقوم بمراقبة معلومات النظام على خادومك",
+    "service_description_metronome": "يُدير حسابات الدردشة الفورية XMPP",
+    "service_description_nginx": "يقوم بتوفير النفاذ و السماح بالوصول إلى كافة مواقع الويب المستضافة على خادومك",
+    "service_description_php5-fpm": "يقوم بتشغيل تطبيقات الـ PHP مع خادوم الويب nginx",
+    "service_description_postfix": "يقوم بإرسال و تلقي الرسائل البريدية الإلكترونية",
+    "service_description_yunohost-api": "يقوم بإدارة التفاعلات ما بين واجهة الويب لواي يونوهوست و النظام"
 }

locales/de.json

@@ -2,7 +2,7 @@
     "action_invalid": "Ungültige Aktion '{action:s}'",
     "admin_password": "Administrator-Passwort",
     "admin_password_change_failed": "Passwort kann nicht geändert werden",
-    "admin_password_changed": "Das Administrator-Passwort wurde erfolgreich geändert",
+    "admin_password_changed": "Das Administrator-Kennwort wurde erfolgreich geändert",
     "app_already_installed": "{app:s} ist schon installiert",
     "app_argument_choice_invalid": "Ungültige Auswahl für Argument '{name:s}'. Es muss einer der folgenden Werte sein {choices:s}",
     "app_argument_invalid": "Das Argument '{name:s}' hat einen falschen Wert: {error:s}",
@@ -10,8 +10,8 @@
     "app_extraction_failed": "Installationsdateien konnten nicht entpackt werden",
     "app_id_invalid": "Falsche App-ID",
     "app_install_files_invalid": "Ungültige Installationsdateien",
-    "app_location_already_used": "Eine andere App ist bereits an diesem Ort installiert",
-    "app_location_install_failed": "Die App kann nicht an diesem Ort installiert werden",
+    "app_location_already_used": "Eine andere App ({app}) ist bereits an diesem Ort ({path}) installiert",
+    "app_location_install_failed": "Die App kann nicht an diesem Ort installiert werden, da es mit der App {other_app} die bereits in diesem Pfad ({other_path}) installiert ist Probleme geben würde",
     "app_manifest_invalid": "Ungültiges App-Manifest",
     "app_no_upgrade": "Keine Aktualisierungen für Apps verfügbar",
     "app_not_installed": "{app:s} ist nicht installiert",
@@ -62,7 +62,7 @@
     "domain_creation_failed": "Konnte Domain nicht erzeugen",
     "domain_deleted": "Die Domain wurde gelöscht",
     "domain_deletion_failed": "Konnte Domain nicht löschen",
-    "domain_dyndns_already_subscribed": "Du hast bereits eine DynDNS-Domain abonniert",
+    "domain_dyndns_already_subscribed": "Du hast dich schon für eine DynDNS-Domain angemeldet",
     "domain_dyndns_invalid": "Domain nicht mittels DynDNS nutzbar",
     "domain_dyndns_root_unknown": "Unbekannte DynDNS Hauptdomain",
     "domain_exists": "Die Domain existiert bereits",
@@ -219,11 +219,11 @@
     "pattern_positive_number": "Muss eine positive Zahl sein",
     "diagnosis_kernel_version_error": "Kann Kernelversion nicht abrufen: {error}",
     "package_unexpected_error": "Ein unerwarteter Fehler trat bei der Verarbeitung des Pakets '{pkgname}' auf",
-    "app_incompatible": "Die Anwendung ist nicht mit deiner YunoHost-Version kompatibel",
-    "app_not_correctly_installed": "{app:s} scheint nicht richtig installiert worden zu sein",
-    "app_requirements_checking": "Überprüfe notwendige Pakete...",
-    "app_requirements_failed": "Anforderungen werden nicht erfüllt: {error}",
-    "app_requirements_unmeet": "Anforderungen werden nicht erfüllt, das Paket {pkgname} ({version}) muss {spec} sein",
+    "app_incompatible": "Die Anwendung {app} ist nicht mit deiner YunoHost-Version kompatibel",
+    "app_not_correctly_installed": "{app:s} scheint nicht korrekt installiert zu sein",
+    "app_requirements_checking": "Überprüfe notwendige Pakete für {app}...",
+    "app_requirements_failed": "Anforderungen für {app} werden nicht erfüllt: {error}",
+    "app_requirements_unmeet": "Anforderungen für {app} werden nicht erfüllt, das Paket {pkgname} ({version}) muss {spec} sein",
     "app_unsupported_remote_type": "Für die App wurde ein nicht unterstützer Steuerungstyp verwendet",
     "backup_archive_broken_link": "Auf das Backup-Archiv konnte nicht zugegriffen werden (ungültiger Link zu {path:s})",
     "diagnosis_debian_version_error": "Debian Version konnte nicht abgerufen werden: {error}",
@@ -272,7 +272,7 @@
     "certmanager_self_ca_conf_file_not_found": "Die Konfigurationsdatei der Zertifizierungsstelle für selbstsignierte Zertifikate wurde nicht gefunden (Datei {file:s})",
     "certmanager_acme_not_configured_for_domain": "Das Zertifikat für die Domain {domain:s} scheint nicht richtig installiert zu sein. Bitte führe den Befehl cert-install für diese Domain nochmals aus.",
     "certmanager_unable_to_parse_self_CA_name": "Der Name der Zertifizierungsstelle für selbstsignierte Zertifikate konnte nicht analysiert werden (Datei: {file:s})",
-    "app_package_need_update": "Es ist notwendig das Paket zu aktualisieren, um Aktualisierungen für YunoHost zu erhalten",
+    "app_package_need_update": "Es ist notwendig das Paket {app} zu aktualisieren, um Aktualisierungen für YunoHost zu erhalten",
     "service_regenconf_dry_pending_applying": "Überprüfe ausstehende Konfigurationen, die für den Server {service} notwendig sind...",
     "service_regenconf_pending_applying": "Überprüfe ausstehende Konfigurationen, die für den Server '{service}' notwendig sind...",
     "certmanager_http_check_timeout": "Eine Zeitüberschreitung ist aufgetreten als der Server versuchte sich selbst über HTTP mit der öffentlichen IP (Domain {domain:s} mit der IP {ip:s}) zu erreichen. Möglicherweise ist dafür hairpinning oder eine falsch konfigurierte Firewall/Router deines Servers dafür verantwortlich.",
@@ -299,5 +299,7 @@
     "backup_archive_system_part_not_available": "Der System-Teil '{part:s}' ist in diesem Backup nicht enthalten",
     "backup_archive_mount_failed": "Das Einbinden des Backup-Archives ist fehlgeschlagen",
     "backup_archive_writing_error": "Die Dateien konnten nicht in der komprimierte Archiv-Backup hinzugefügt werden",
-    "app_change_url_success": "Erfolgreiche Änderung der URL von {app:s} zu {domain:s}{path:s}"
+    "app_change_url_success": "Erfolgreiche Änderung der URL von {app:s} zu {domain:s}{path:s}",
+    "backup_applying_method_borg": "Sende alle Dateien zur Sicherung ins borg-backup repository...",
+    "invalid_url_format": "ungültiges URL Format"
 }

locales/en.json

@@ -103,6 +103,7 @@
     "backup_output_directory_not_empty": "The output directory is not empty",
     "backup_output_directory_required": "You must provide an output directory for the backup",
     "backup_output_symlink_dir_broken": "You have a broken symlink instead of your archives directory '{path:s}'. You may have a specific setup to backup your data on an other filesystem, in this case you probably forgot to remount or plug your hard dirve or usb key.",
+    "backup_php5_to_php7_migration_may_fail": "Could not convert your archive to support php7, your php apps may fail to restore (reason: {error:s})",
     "backup_running_app_script": "Running backup script of app '{app:s}'...",
     "backup_running_hooks": "Running backup hooks...",
     "backup_system_part_failed": "Unable to backup the '{part:s}' system part",
@@ -264,18 +265,42 @@
     "migrate_tsig_wait_3": "1min...",
     "migrate_tsig_wait_4": "30 secondes...",
     "migrate_tsig_not_needed": "You do not appear to use a dyndns domain, so no migration is needed !",
+    "migration_description_0001_change_cert_group_to_sslcert": "Change certificates group permissions from 'metronome' to 'ssl-cert'",
+    "migration_description_0002_migrate_to_tsig_sha256": "Improve security of dyndns TSIG by using SHA512 instead of MD5",
+    "migration_description_0003_migrate_to_stretch": "Upgrade the system to Debian Stretch and YunoHost 3.0",
+    "migration_description_0004_php5_to_php7_pools": "Reconfigure the PHP pools to use PHP 7 instead of 5",
+    "migration_description_0005_postgresql_9p4_to_9p6": "Migrate databases from postgresql 9.4 to 9.6",
+    "migration_0003_backward_impossible": "The stretch migration cannot be reverted.",
+    "migration_0003_start": "Starting migration to Stretch. The logs will be available in {logfile}.",
+    "migration_0003_patching_sources_list": "Patching the sources.lists ...",
+    "migration_0003_main_upgrade": "Starting main upgrade ...",
+    "migration_0003_fail2ban_upgrade": "Starting the fail2ban upgrade ...",
+    "migration_0003_restoring_origin_nginx_conf": "Your file /etc/nginx/nginx.conf was edited somehow. The migration is going to reset back to its original state first... The previous file will be available as {backup_dest}.",
+    "migration_0003_yunohost_upgrade": "Starting the yunohost package upgrade ... The migration will end, but the actual upgrade will happen right after. After the operation is complete, you might have to re-log on the webadmin.",
+    "migration_0003_not_jessie": "The current debian distribution is not Jessie !",
+    "migration_0003_system_not_fully_up_to_date": "Your system is not fully up to date. Please perform a regular upgrade before running the migration to stretch.",
+    "migration_0003_still_on_jessie_after_main_upgrade": "Something wrong happened during the main upgrade : system is still on Jessie !? To investigate the issue, please look at {log} :s ...",
+    "migration_0003_general_warning": "Please note that this migration is a delicate operation. While the YunoHost team did its best to review and test it, the migration might still break parts of the system or apps.\n\nTherefore, we recommend you to :\n    - Perform a backup of any critical data or app. More infos on https://yunohost.org/backup ;\n    - Be patient after launching the migration : depending on your internet connection and hardware, it might take up to a few hours for everything to upgrade.\n\nAdditionally, the port for SMTP, used by external email clients (like Thunderbird or K9-Mail) was changed from 465 (SSL/TLS) to 587 (STARTTLS). The old port 465 will automatically be closed and the new port 587 will be opened in the firewall. You and your users *will* have to adapt the configuration of your email clients accordingly!",
+    "migration_0003_problematic_apps_warning": "Please note that the following possibly problematic installed apps were detected. It looks like those were not installed from an applist or are not flagged as 'working'. Consequently, we cannot guarantee that they will still work after the upgrade : {problematic_apps}",
+    "migration_0003_modified_files": "Please note that the following files were found to be manually modified and might be overwritten at the end of the upgrade : {manually_modified_files}",
+    "migration_0005_postgresql_94_not_installed": "Postgresql was not installed on your system. Nothing to do!",
+    "migration_0005_postgresql_96_not_installed": "Postgresql 9.4 has been found to be installed, but not postgresql 9.6 !? Something weird might have happened on your system :( ...",
+    "migration_0005_not_enough_space": "Not enough space is available in {path} to run the migration right now :(.",
     "migrations_backward": "Migrating backward.",
-    "migrations_bad_value_for_target": "Invalide number for target argument, available migrations numbers are 0 or {}",
+    "migrations_bad_value_for_target": "Invalid number for target argument, available migrations numbers are 0 or {}",
     "migrations_cant_reach_migration_file": "Can't access migrations files at path %s",
     "migrations_current_target": "Migration target is {}",
     "migrations_error_failed_to_load_migration": "ERROR: failed to load migration {number} {name}",
     "migrations_forward": "Migrating forward",
+    "migrations_list_conflict_pending_done": "You cannot use both --previous and --done at the same time.",
     "migrations_loading_migration": "Loading migration {number} {name}...",
     "migrations_migration_has_failed": "Migration {number} {name} has failed with exception {exception}, aborting",
     "migrations_no_migrations_to_run": "No migrations to run",
     "migrations_show_currently_running_migration": "Running migration {number} {name}...",
     "migrations_show_last_migration": "Last ran migration is {}",
     "migrations_skip_migration": "Skipping migration {number} {name}...",
+    "migrations_to_be_ran_manually":  "Migration {number} {name} has to be ran manually. Please go to Tools > Migrations on the webadmin, or run `yunohost tools migrations migrate`.",
+    "migrations_need_to_accept_disclaimer": "To run the migration {number} {name}, your must accept the following disclaimer:\n---\n{disclaimer}\n---\nIf you accept to run the migration, please re-run the command with the option --accept-disclaimer.",
     "monitor_disabled": "The server monitoring has been disabled",
     "monitor_enabled": "The server monitoring has been enabled",
     "monitor_glances_con_failed": "Unable to connect to Glances server",
@@ -358,9 +383,27 @@
     "service_conf_up_to_date": "The configuration is already up-to-date for service '{service}'",
     "service_conf_updated": "The configuration has been updated for service '{service}'",
     "service_conf_would_be_updated": "The configuration would have been updated for service '{service}'",
-    "service_disable_failed": "Unable to disable service '{service:s}'",
+    "service_description_avahi-daemon": "allows to reach your server using yunohost.local on your local network",
+    "service_description_dnsmasq": "handles domain name resolution (DNS)",
+    "service_description_dovecot": "allows e-mail client to access/fetch email (via IMAP and POP3)",
+    "service_description_fail2ban": "protects against bruteforce and other kind of attacks from the Internet",
+    "service_description_glances": "monitors system information on your server",
+    "service_description_metronome": "manage XMPP instant messaging accounts",
+    "service_description_mysql": "stores applications data (SQL database)",
+    "service_description_nginx": "serves or provides access to all the websites hosted on your server",
+    "service_description_nslcd": "handles YunoHost user shell connection",
+    "service_description_php7.0-fpm": "runs applications written in PHP with nginx",
+    "service_description_postfix": "used to send and receive emails",
+    "service_description_redis-server": "a specialized database used for rapid data access, task queue and communication between programs",
+    "service_description_rmilter": "checks various parameters in emails",
+    "service_description_rspamd": "filters spam, and other email-related features",
+    "service_description_slapd": "stores users, domains and related information",
+    "service_description_ssh": "allows you to connect remotely to your server via a terminal (SSH protocol)",
+    "service_description_yunohost-api": "manages interactions between the YunoHost web interface and the system",
+    "service_description_yunohost-firewall": "manages open and close connexion ports to services",
+    "service_disable_failed": "Unable to disable service '{service:s}'\n\nRecent service logs:{logs:s}",
     "service_disabled": "The service '{service:s}' has been disabled",
-    "service_enable_failed": "Unable to enable service '{service:s}'",
+    "service_enable_failed": "Unable to enable service '{service:s}'\n\nRecent service logs:{logs:s}",
     "service_enabled": "The service '{service:s}' has been enabled",
     "service_no_log": "No log to display for service '{service:s}'",
     "service_regenconf_dry_pending_applying": "Checking pending configuration which would have been applied for service '{service}'...",
@@ -368,10 +411,10 @@
     "service_regenconf_pending_applying": "Applying pending configuration for service '{service}'...",
     "service_remove_failed": "Unable to remove service '{service:s}'",
     "service_removed": "The service '{service:s}' has been removed",
-    "service_start_failed": "Unable to start service '{service:s}'",
+    "service_start_failed": "Unable to start service '{service:s}'\n\nRecent service logs:{logs:s}",
     "service_started": "The service '{service:s}' has been started",
     "service_status_failed": "Unable to determine status of service '{service:s}'",
-    "service_stop_failed": "Unable to stop service '{service:s}'",
+    "service_stop_failed": "Unable to stop service '{service:s}'\n\nRecent service logs:{logs:s}",
     "service_stopped": "The service '{service:s}' has been stopped",
     "service_unknown": "Unknown service '{service:s}'",
     "ssowat_conf_generated": "The SSOwat configuration has been generated",

locales/es.json

@@ -9,21 +9,21 @@
     "app_argument_required": "Se requiere el argumento '{name:s} 7'",
     "app_extraction_failed": "No se pudieron extraer los archivos de instalación",
     "app_id_invalid": "Id de la aplicación no válida",
-    "app_incompatible": "La aplicación no es compatible con su versión de YunoHost",
+    "app_incompatible": "La aplicación {app} no es compatible con su versión de YunoHost",
     "app_install_files_invalid": "Los archivos de instalación no son válidos",
-    "app_location_already_used": "Una aplicación ya está instalada en esta localización",
-    "app_location_install_failed": "No se puede instalar la aplicación en esta localización",
+    "app_location_already_used": "La aplicación {app} ya está instalada en esta localización ({path})",
+    "app_location_install_failed": "No se puede instalar la aplicación en esta localización porque entra en conflicto con la aplicación '{other_app}' ya instalada en '{other_path}'",
     "app_manifest_invalid": "El manifiesto de la aplicación no es válido: {error}",
     "app_no_upgrade": "No hay aplicaciones para actualizar",
     "app_not_correctly_installed": "La aplicación {app:s} 8 parece estar incorrectamente instalada",
     "app_not_installed": "{app:s} 9 no está instalada",
     "app_not_properly_removed": "La {app:s} 0 no ha sido desinstalada correctamente",
-    "app_package_need_update": "Es necesario actualizar el paquete de la aplicación debido a los cambios en YunoHost",
+    "app_package_need_update": "El paquete de la aplicación {app} necesita ser actualizada debido a los cambios en YunoHost",
     "app_recent_version_required": "{:s}  requiere una versión más reciente de moulinette ",
     "app_removed": "{app:s} ha sido eliminada",
-    "app_requirements_checking": "Comprobando los paquetes requeridos...",
-    "app_requirements_failed": "No se cumplen los requisitos: {error}",
-    "app_requirements_unmeet": "No se cumplen los requisitos, el paquete {pkgname} ({version}) debe ser {spec}",
+    "app_requirements_checking": "Comprobando los paquetes requeridos por {app}...",
+    "app_requirements_failed": "No se cumplen los requisitos para {app}: {error}",
+    "app_requirements_unmeet": "No se cumplen los requisitos para {app}, el paquete {pkgname} ({version}) debe ser {spec}",
     "app_sources_fetch_failed": "No se pudieron descargar los archivos del código fuente",
     "app_unknown": "Aplicación desconocida",
     "app_unsupported_remote_type": "Tipo remoto no soportado por la aplicación",
@@ -31,8 +31,8 @@
     "app_upgraded": "{app:s} ha sido actualizada",
     "appslist_fetched": "La lista de aplicaciones {appslist:s} ha sido descargada",
     "appslist_removed": "La lista de aplicaciones {appslist:s} ha sido eliminada",
-    "appslist_retrieve_error": "No se pudo recuperar la lista remota de aplicaciones {appslist:s} : {error}",
-    "appslist_unknown": "Lista de aplicaciones desconocida",
+    "appslist_retrieve_error": "No se pudo recuperar la lista remota de aplicaciones {appslist:s} : {error:s}",
+    "appslist_unknown": "Lista de aplicaciones {appslist:s} desconocida.",
     "ask_current_admin_password": "Contraseña administrativa actual",
     "ask_email": "Dirección de correo electrónico",
     "ask_firstname": "Nombre",
@@ -151,7 +151,7 @@
     "packages_upgrade_critical_later": "Los paquetes críticos ({packages:s}) serán actualizados más tarde",
     "packages_upgrade_failed": "No se pudieron actualizar todos los paquetes",
     "path_removal_failed": "No se pudo eliminar la ruta {:s}",
-    "pattern_backup_archive_name": "Debe ser un nombre de archivo válido, solo se admiten caracteres alfanuméricos, los guiones -_ y el punto.",
+    "pattern_backup_archive_name": "Debe ser un nombre de archivo válido con un máximo de 30 caracteres, solo se admiten caracteres alfanuméricos, los guiones -_ y el punto",
     "pattern_domain": "El nombre de dominio debe ser válido (por ejemplo mi-dominio.org)",
     "pattern_email": "Debe ser una dirección de correo electrónico válida (por ejemplo, alguien@dominio.org)",
     "pattern_firstname": "Debe ser un nombre válido",
@@ -277,17 +277,35 @@
     "yunohost_ca_creation_success": "Se ha creado la autoridad de certificación local.",
     "app_already_installed_cant_change_url": "Esta aplicación ya está instalada. No se puede cambiar el URL únicamente mediante esta función. Compruebe si está disponible la opción 'app changeurl'.",
     "app_change_no_change_url_script": "La aplicacion {app_name:s} aún no permite cambiar su URL, es posible que deba actualizarla.",
-    "app_change_url_failed_nginx_reload": "No se pudo recargar nginx. Compruebe la salida de 'nginx -t':\n{nginx_error:s}",
-    "app_change_url_identical_domains": "El antiguo y nuevo dominio/url_path son idénticos ('{domain: s}  {path: s}'), no se realizarán cambios.",
+    "app_change_url_failed_nginx_reload": "No se pudo recargar nginx. Compruebe la salida de 'nginx -t':\n{nginx_errors:s}",
+    "app_change_url_identical_domains": "El antiguo y nuevo dominio/url_path son idénticos ('{domain:s}  {path:s}'), no se realizarán cambios.",
     "app_change_url_no_script": "Esta aplicación '{app_name:s}' aún no permite modificar su URL. Quizás debería actualizar la aplicación.",
     "app_change_url_success": "El URL de la aplicación {app:s} ha sido cambiado correctamente a {domain:s} {path:s}",
-    "app_location_unavailable": "Este URL no está disponible o está en conflicto con otra aplicación instalada.",
+    "app_location_unavailable": "Este URL no está disponible o está en conflicto con otra aplicación instalada",
     "app_already_up_to_date": "La aplicación {app:s} ya está actualizada",
     "appslist_name_already_tracked": "Ya existe una lista de aplicaciones registrada con el nombre {name:s}.",
     "appslist_url_already_tracked": "Ya existe una lista de aplicaciones registrada con el URL {url:s}.",
-    "appslist_migrating": "Migrando la lista de aplicaciones {applist:s} ...",
+    "appslist_migrating": "Migrando la lista de aplicaciones {appslist:s} ...",
     "appslist_could_not_migrate": "No se pudo migrar la lista de aplicaciones {appslist:s}! No se pudo analizar el URL ... El antiguo cronjob se ha mantenido en {bkp_file:s}.",
-    "appslist_corrupted_json": "No se pudieron cargar las listas de aplicaciones. Parece que {filename: s} está dañado.",
+    "appslist_corrupted_json": "No se pudieron cargar las listas de aplicaciones. Parece que {filename:s} está dañado.",
     "invalid_url_format": "Formato de URL no válido",
-    "app_upgrade_some_app_failed": "No se pudieron actualizar algunas aplicaciones"
+    "app_upgrade_some_app_failed": "No se pudieron actualizar algunas aplicaciones",
+    "app_make_default_location_already_used": "No puede hacer la aplicación '{app}' por defecto en el dominio {domain} dado que está siendo usado por otra aplicación '{other_app}'",
+    "app_upgrade_app_name": "Actualizando la aplicación {app}...",
+    "ask_path": "Camino",
+    "backup_abstract_method": "Este método de backup no ha sido implementado aún",
+    "backup_applying_method_borg": "Enviando todos los ficheros al backup en el repositorio borg-backup...",
+    "backup_applying_method_copy": "Copiado todos los ficheros al backup...",
+    "backup_applying_method_custom": "Llamando el método de backup {method:s} ...",
+    "backup_applying_method_tar": "Creando el archivo tar de backup...",
+    "backup_archive_mount_failed": "Fallo en el montado del archivo de backup",
+    "backup_archive_system_part_not_available": "La parte del sistema {part:s} no está disponible en este backup",
+    "backup_archive_writing_error": "No se pueden añadir archivos de backup en el archivo comprimido",
+    "backup_ask_for_copying_if_needed": "Algunos ficheros no pudieron ser preparados para hacer backup usando el método que evita el gasto de espacio temporal en el sistema. Para hacer el backup, {size:s} MB deberían ser usados temporalmente. ¿Está de acuerdo?",
+    "backup_borg_not_implemented": "Método de backup Borg no está implementado aún",
+    "backup_cant_mount_uncompress_archive": "No se puede montar en modo solo lectura el directorio del archivo descomprimido",
+    "backup_copying_to_organize_the_archive": "Copiando {size:s}MB para organizar el archivo",
+    "backup_couldnt_bind": "No puede enlazar {src:s} con {dest:s}",
+    "backup_csv_addition_failed": "No puede añadir archivos al backup en el archivo CSV",
+    "backup_csv_creation_failed": "No se puede crear el archivo CSV necesario para futuras operaciones de restauración"
 }

locales/fr.json

@@ -135,7 +135,7 @@
     "mountpoint_unknown": "Point de montage inconnu",
     "mysql_db_creation_failed": "Impossible de créer la base de données MySQL",
     "mysql_db_init_failed": "Impossible d'initialiser la base de données MySQL",
-    "mysql_db_initialized": "La base de donnée MySQL a été initialisée",
+    "mysql_db_initialized": "La base de données MySQL a été initialisée",
     "network_check_mx_ko": "L'enregistrement DNS MX n'est pas précisé",
     "network_check_smtp_ko": "Le trafic courriel sortant (port 25 SMTP) semble bloqué par votre réseau",
     "network_check_smtp_ok": "Le trafic courriel sortant (port 25 SMTP) n'est pas bloqué",
@@ -200,9 +200,9 @@
     "service_configuration_conflict": "Le fichier {file:s} a été modifié depuis sa dernière génération. Veuillez y appliquer les modifications manuellement ou utiliser l’option --force (ce qui écrasera toutes les modifications effectuées sur le fichier).",
     "service_configured": "La configuration du service « {service:s} » a été générée avec succès",
     "service_configured_all": "La configuration de tous les services a été générée avec succès",
-    "service_disable_failed": "Impossible de désactiver le service « {service:s} »",
+    "service_disable_failed": "Impossible de désactiver le service « {service:s} »\n\nJournaux récents : {logs:s}",
     "service_disabled": "Le service « {service:s} » a été désactivé",
-    "service_enable_failed": "Impossible d'activer le service « {service:s} »",
+    "service_enable_failed": "Impossible d’activer le service « {service:s} »\n\nJournaux récents : {logs:s}",
     "service_enabled": "Le service « {service:s} » a été activé",
     "service_no_log": "Aucun journal à afficher pour le service « {service:s} »",
     "service_regenconf_dry_pending_applying": "Vérification des configurations en attentes qui pourraient être appliquées pour le service « {service} »…",
@@ -210,10 +210,10 @@
     "service_regenconf_pending_applying": "Application des configurations en attentes pour le service « {service} »…",
     "service_remove_failed": "Impossible d'enlever le service « {service:s} »",
     "service_removed": "Le service « {service:s} » a été enlevé",
-    "service_start_failed": "Impossible de démarrer le service « {service:s} »",
+    "service_start_failed": "Impossible de démarrer le service « {service:s} »\n\nJournaux récents : {logs:s}",
     "service_started": "Le service « {service:s} » a été démarré",
     "service_status_failed": "Impossible de déterminer le statut du service « {service:s} »",
-    "service_stop_failed": "Impossible d'arrêter le service « {service:s} »",
+    "service_stop_failed": "Impossible d’arrêter le service « {service:s} »\n\nJournaux récents : {logs:s}",
     "service_stopped": "Le service « {service:s} » a été arrêté",
     "service_unknown": "Service « {service:s} » inconnu",
     "services_configured": "La configuration a été générée avec succès",
@@ -320,7 +320,7 @@
     "backup_archive_system_part_not_available": "La partie « {part:s} » du système n’est pas disponible dans cette sauvegarde",
     "backup_archive_mount_failed": "Le montage de l’archive de sauvegarde a échoué",
     "backup_archive_writing_error": "Impossible d’ajouter les fichiers à la sauvegarde dans l’archive compressée",
-    "backup_ask_for_copying_if_needed": "Certains fichiers n’ont pas pu être préparés pour être sauvegardée en utilisant la méthode qui évite de temporairement gaspiller de l’espace sur le système. Pour mener la sauvegarde, {size:s} Mio doivent être temporairement utilisés. Acceptez-vous ?",
+    "backup_ask_for_copying_if_needed": "Certains fichiers n’ont pas pu être préparés pour être sauvegardés en utilisant la méthode qui évite temporairement de gaspiller de l’espace sur le système. Pour mener la sauvegarde, {size:s} Mo doivent être temporairement utilisés. Acceptez-vous ?",
     "backup_borg_not_implemented": "La méthode de sauvegarde Bord n’est pas encore implémentée",
     "backup_cant_mount_uncompress_archive": "Impossible de monter en lecture seule le dossier de l’archive décompressée",
     "backup_copying_to_organize_the_archive": "Copie de {size:s} Mio pour organiser l’archive",
@@ -378,5 +378,43 @@
     "migrate_tsig_wait_2": "2 minutes…",
     "migrate_tsig_wait_3": "1 minute…",
     "migrate_tsig_wait_4": "30 secondes…",
-    "migrate_tsig_not_needed": "Il ne semble pas que vous utilisez un domaine dyndns, donc aucune migration n’est nécessaire !"
+    "migrate_tsig_not_needed": "Il ne semble pas que vous utilisez un domaine dyndns, donc aucune migration n’est nécessaire !",
+    "app_checkurl_is_deprecated": "Packagers /!\\  'app checkurl' est obsolète ! Utilisez 'app register-url' en remplacement !",
+    "migration_description_0001_change_cert_group_to_sslcert": "Change les permissions de groupe des certificats de « metronome » à « ssl-cert »",
+    "migration_description_0002_migrate_to_tsig_sha256": "Améliore la sécurité de DynDNDS TSIG en utilisant SHA512 au lieu de MD5",
+    "migration_description_0003_migrate_to_stretch": "Mise à niveau du système vers Debian Stretch et YunoHost 3.0",
+    "migration_0003_backward_impossible": "La migration Stretch n’est pas réversible.",
+    "migration_0003_start": "Démarrage de la migration vers Stretch. Les journaux seront disponibles dans {logfile}.",
+    "migration_0003_patching_sources_list": "Modification de sources.lists…",
+    "migration_0003_main_upgrade": "Démarrage de la mise à niveau principale…",
+    "migration_0003_fail2ban_upgrade": "Démarrage de la mise à niveau de fail2ban…",
+    "migration_0003_restoring_origin_nginx_conf": "Votre fichier /etc/nginx/nginx.conf a été modifié d’une manière ou d’une autre. La migration va d’abords le réinitialiser à son état initial… Le fichier précédent sera disponible en tant que {backup_dest}.",
+    "migration_0003_yunohost_upgrade": "Démarrage de la mise à niveau du paquet YunoHost… La migration terminera, mais la mise à jour réelle aura lieu immédiatement après. Après cette opération terminée, vous pourriez avoir à vous reconnecter à l’administration web.",
+    "migration_0003_not_jessie": "La distribution Debian actuelle n’est pas Jessie !",
+    "migration_0003_system_not_fully_up_to_date": "Votre système n’est pas complètement à jour. Veuillez mener une mise à jour classique avant de lancer à migration à Stretch.",
+    "migration_0003_still_on_jessie_after_main_upgrade": "Quelque chose s’est ma passé pendant la mise à niveau principale : le système est toujours sur Jessie ?!? Pour investiguer le problème, veuillez regarder {log} 🙁…",
+    "migration_0003_general_warning": "Veuillez noter que cette migration est une opération délicate. Si l’équipe YunoHost a fait de son mieux pour la relire et la tester, la migration pourrait tout de même casser des parties de votre système ou de vos applications.\n\nEn conséquence, nous vous recommandons :\n    - de lancer une sauvegarde de vos données ou applications critiques. Plus d’informations sur https://yunohost.org/backup ;\n    - d’être patient après avoir lancé la migration : selon votre connexion internet et matériel, cela pourrait prendre jusqu'à quelques heures pour que tout soit à niveau.\n\nDe plus, le port SMTP utilisé par les clients de messagerie externes comme (Thunderbird ou K9-Mail) a été changé de 465 (SSL/TLS) à 587 (STARTTLS). L’ancien port 465 sera automatiquement fermé et le nouveau port 587 sera ouvert dans le pare-feu. Vous et vos utilisateurs *devront* adapter la configuration de vos clients de messagerie en conséquence !",
+    "migration_0003_problematic_apps_warning": "Veuillez noter que les applications suivantes, éventuellement problématiques, ont été détectées. Il semble qu’elles n’aient pas été installées depuis une liste d’application ou qu’elles ne soit pas marquées «working ». En conséquence, nous ne pouvons pas garantir qu’elles fonctionneront après la mise à niveau : {problematic_apps}",
+    "migration_0003_modified_files": "Veuillez noter que les fichiers suivants ont été détectés comme modifiés manuellement et pourraient être écrasés à la fin de la mise à niveau : {manually_modified_files}",
+    "migrations_list_conflict_pending_done": "Vous ne pouvez pas utiliser --previous et --done simultanément.",
+    "migrations_to_be_ran_manually": "La migration {number} {name} doit être lancée manuellement. Veuillez aller dans Outils > Migration dans l’interface admin, ou lancer `yunohost tools migrations migrate`.",
+    "migrations_need_to_accept_disclaimer": "Pour lancer la migration {number} {name}, vous devez accepter cette clause de non-responsabilité :\n---\n{disclaimer}\n---\nSi vous acceptez de lancer la migration, veuillez relancer la commande avec l’option --accept-disclaimer.",
+    "service_description_avahi-daemon": "permet d’atteindre votre serveur via yunohost.local sur votre réseau local",
+    "service_description_dnsmasq": "assure la résolution des noms de domaine (DNS)",
+    "service_description_dovecot": "permet aux clients de messagerie d’accéder/récupérer les courriels (via IMAP et POP3)",
+    "service_description_fail2ban": "protège contre les attaques brute-force et autres types d’attaques venant d’Internet",
+    "service_description_glances": "surveille les informations système de votre serveur",
+    "service_description_metronome": "gère les comptes de messagerie instantanée XMPP",
+    "service_description_mysql": "stocke les données des applications (bases de données SQL)",
+    "service_description_nginx": "sert ou permet l’accès à tous les sites web hébergés sur votre serveur",
+    "service_description_nslcd": "gère la connexion en ligne de commande des utilisateurs YunoHost",
+    "service_description_php5-fpm": "exécute des applications écrites en PHP avec nginx",
+    "service_description_postfix": "utilisé pour envoyer et recevoir des courriels",
+    "service_description_redis-server": "une base de donnée spécialisée utilisée pour l’accès rapide aux données, les files d’attentes et la communication inter-programmes",
+    "service_description_rmilter": "vérifie divers paramètres dans les courriels",
+    "service_description_rspamd": "filtre le pourriel, et d’autres fonctionnalités liées au courriel",
+    "service_description_slapd": "stocke les utilisateurs, domaines et leurs informations liées",
+    "service_description_ssh": "vous permet de vous connecter à distance à votre serveur via un terminal (protocole SSH)",
+    "service_description_yunohost-api": "permet les interactions entre l’interface web de YunoHost et le système",
+    "service_description_yunohost-firewall": "gère les ports de connexion ouverts et fermés aux services"
 }

locales/oc.json

@@ -0,0 +1,406 @@
+{
+    "admin_password": "Senhal d’administracion",
+    "admin_password_change_failed": "Impossible de cambiar lo senhal",
+    "admin_password_changed": "Lo senhal d’administracion es ben estat cambiat",
+    "app_already_installed": "{app:s} es ja installat",
+    "app_already_up_to_date": "{app:s} es ja a jorn",
+    "installation_complete": "Installacion acabada",
+    "app_id_invalid": "Id d’aplicacion incorrècte",
+    "app_install_files_invalid": "Fichièrs d’installacion incorrèctes",
+    "app_no_upgrade": "Pas cap d’aplicacion de metre a jorn",
+    "app_not_correctly_installed": "{app:s} sembla pas ben installat",
+    "app_not_installed": "{app:s} es pas installat",
+    "app_not_properly_removed": "{app:s} es pas estat corrèctament suprimit",
+    "app_removed": "{app:s} es estat suprimit",
+    "app_unknown": "Aplicacion desconeguda",
+    "app_upgrade_app_name": "Mesa a jorn de l’aplicacion {app}...",
+    "app_upgrade_failed": "Impossible de metre a jorn {app:s}",
+    "app_upgrade_some_app_failed": "D’aplicacions se pòdon pas metre a jorn",
+    "app_upgraded": "{app:s} es estat mes a jorn",
+    "appslist_fetched": "Recuperacion de la lista d’aplicacions {appslist:s} corrèctament realizada",
+    "appslist_migrating": "Migracion de la lista d’aplicacion{appslist:s}…",
+    "appslist_name_already_tracked": "I a ja una lista d’aplicacion enregistrada amb lo nom {name:s}.",
+    "appslist_removed": "Supression de la lista d’aplicacions {appslist:s} corrèctament realizada",
+    "appslist_retrieve_bad_format": "Lo fichièr recuperat per la lista d’aplicacions {appslist:s} es pas valid",
+    "appslist_unknown": "La lista d’aplicacions {appslist:s} es desconeguda.",
+    "appslist_url_already_tracked": "I a ja una lista d’aplicacions enregistrada amb l’URL {url:s}.",
+    "ask_current_admin_password": "Senhal administrator actual",
+    "ask_email": "Adreça de corrièl",
+    "ask_firstname": "Prenom",
+    "ask_lastname": "Nom",
+    "ask_list_to_remove": "Lista de suprimir",
+    "ask_main_domain": "Domeni màger",
+    "ask_new_admin_password": "Nòu senhal administrator",
+    "ask_password": "Senhal",
+    "ask_path": "Camin",
+    "backup_action_required": "Devètz precisar çò que cal salvagardar",
+    "backup_app_failed": "Impossible de salvagardar l’aplicacion « {app:s} »",
+    "backup_applying_method_copy": "Còpia de totes los fichièrs dins la salvagarda…",
+    "backup_applying_method_tar": "Creacion de l’archiu tar de la salvagarda…",
+    "backup_archive_name_exists": "Un archiu de salvagarda amb aquesta nom existís ja",
+    "backup_archive_name_unknown": "L’archiu local de salvagarda apelat  « {name:s} » es desconegut",
+    "action_invalid": "Accion « {action:s} » incorrècta",
+    "app_argument_choice_invalid": "Causida invalida pel paramètre  « {name:s} », cal que siá un de {choices:s}",
+    "app_argument_invalid": "Valor invalida pel paramètre  « {name:s} » : {error:s}",
+    "app_argument_required": "Lo paramètre « {name:s} » es requesit",
+    "app_change_url_failed_nginx_reload": "La reaviada de nginx a fracassat. Vaquí la sortida de « nginx -t » :\n{nginx_errors:s}",
+    "app_change_url_identical_domains": "L’ancian e lo novèl coble domeni/camin son identics per {domain:s}{path:s}, pas res a far.",
+    "app_change_url_success": "L’URL de l’aplicacion {app:s} a cambiat per {domain:s}{path:s}",
+    "app_checkurl_is_deprecated": "Packagers /!\\  ’app checkurl’ es obsolèt ! Utilizatz ’app register-url’ a la plaça !",
+    "app_extraction_failed": "Extraccion dels fichièrs d’installacion impossibla",
+    "app_incompatible": "L’aplicacion {app} es pas compatibla amb vòstra version de YunoHost",
+    "app_location_already_used": "L’aplicacion « {app} » es ja installada a aqueste emplaçament ({path})",
+    "app_manifest_invalid": "Manifest d’aplicacion incorrècte : {error}",
+    "app_package_need_update": "Lo paquet de l’aplicacion {app} deu èsser mes a jorn per seguir los cambiaments de YunoHost",
+    "app_requirements_checking": "Verificacion dels paquets requesida per {app}...",
+    "app_sources_fetch_failed": "Recuperacion dels fichièrs fonts impossibla",
+    "app_unsupported_remote_type": "Lo tipe alonhat utilizat per l’aplicacion es pas suportat",
+    "appslist_retrieve_error": "Impossible de recuperar la lista d’aplicacions alonhadas {appslist:s} : {error:s}",
+    "backup_archive_app_not_found": "L’aplicacion « {app:s} » es pas estada trobada dins l’archiu de la salvagarda",
+    "backup_archive_broken_link": "Impossible d‘accedir a l’archiu de salvagarda (ligam invalid cap a {path:s})",
+    "backup_archive_mount_failed": "Lo montatge de l’archiu de salvagarda a fracassat",
+    "backup_archive_open_failed": "Impossible de dobrir l’archiu de salvagarda",
+    "backup_archive_system_part_not_available": "La part « {part:s} » del sistèma es pas disponibla dins aquesta salvagarda",
+    "backup_cleaning_failed": "Impossible de netejar lo repertòri temporari de salvagarda",
+    "backup_copying_to_organize_the_archive": "Còpia de {size:s} Mio per organizar l’archiu",
+    "backup_created": "Salvagarda acabada",
+    "backup_creating_archive": "Creacion de l’archiu de salvagarda...",
+    "backup_creation_failed": "Impossible de crear la salvagarda",
+    "app_already_installed_cant_change_url": "Aquesta aplicacion es ja installada. Aquesta foncion pòt pas simplament cambiar l’URL. Agachatz « app changeurl » s’es disponible.",
+    "app_change_no_change_url_script": "L’aplicacion {app_name:s} pren pas en compte lo cambiament d’URL, poiretz aver de la metre a jorn.",
+    "app_change_url_no_script": "L’aplicacion {app_name:s} pren pas en compte lo cambiament d’URL, benlèu que vos cal la metre a jorn.",
+    "app_make_default_location_already_used": "Impossible de configurar l’aplicacion « {app} » per defaut pel domeni {domain} perque es ja utilizat per l’aplicacion {other_app}",
+    "app_location_install_failed": "Impossible d’installar l’aplicacion a aqueste emplaçament per causa de conflicte amb l’aplicacion {other_app} qu’es ja installada sus {other_path}",
+    "app_location_unavailable": "Aquesta URL es pas disponibla o en conflicte amb una aplicacion existenta",
+    "appslist_corrupted_json": "Cargament impossible de la lista d’aplicacion. Sembla que {filename:s} siá gastat.",
+    "backup_delete_error": "Impossible de suprimir « {path:s} »",
+    "backup_deleted": "La salvagarda es estada suprimida",
+    "backup_hook_unknown": "Script de salvagarda « {hook:s} » desconegut",
+    "backup_invalid_archive": "Archiu de salvagarda incorrècte",
+    "backup_method_borg_finished": "La salvagarda dins Borg es acabada",
+    "backup_method_copy_finished": "La còpia de salvagarda es acabada",
+    "backup_method_tar_finished": "L’archiu tar de la salvagarda es estat creat",
+    "backup_output_directory_not_empty": "Lo dorsièr de sortida es pas void",
+    "backup_output_directory_required": "Vos cal especificar un dorsièr de sortida per la salvagarda",
+    "backup_running_app_script": "Lançament de l’escript de salvagarda de l’aplicacion « {app:s} »...",
+    "backup_running_hooks": "Execucion dels scripts de salvagarda...",
+    "backup_system_part_failed": "Impossible de salvagardar la part « {part:s} » del sistèma",
+    "app_requirements_failed": "Impossible de complir las condicions requesidas per {app} : {error}",
+    "app_requirements_unmeet": "Las condicions requesidas per {app} son pas complidas, lo paquet {pkgname} ({version}) deu èsser {spec}",
+    "appslist_could_not_migrate": "Migracion de la lista impossibla {appslist:s} ! Impossible d’analizar l’URL… L’anciana tasca cron es estada servada dins {bkp_file:s}.",
+    "backup_abstract_method": "Aqueste metòde de salvagarda es pas encara implementat",
+    "backup_applying_method_custom": "Crida lo metòde de salvagarda personalizat  « {method:s} »…",
+    "backup_borg_not_implemented": "Lo metòde de salvagarda Bord es pas encara implementat",
+    "backup_couldnt_bind": "Impossible de ligar {src:s} amb {dest:s}.",
+    "backup_csv_addition_failed": "Impossible d’ajustar de fichièrs a la salvagarda dins lo fichièr CSV",
+    "backup_custom_backup_error": "Fracàs del metòde de salvagarda personalizat a l’etapa « backup »",
+    "backup_custom_mount_error": "Fracàs del metòde de salvagarda personalizat a l’etapa « mount »",
+    "backup_custom_need_mount_error": "Fracàs del metòde de salvagarda personalizat a l’etapa « need_mount »",
+    "backup_method_custom_finished": "Lo metòde de salvagarda personalizat « {method:s} » es acabat",
+    "backup_nothings_done": "I a pas res de salvagardar",
+    "backup_unable_to_organize_files": "Impossible d’organizar los fichièrs dins l’archiu amb lo metòde rapid",
+    "service_status_failed": "Impossible de determinar l’estat del servici « {service:s} »",
+    "service_stopped": "Lo servici « {service:s} » es estat arrestat",
+    "service_unknown": "Servici « {service:s} » desconegut",
+    "unbackup_app": "L’aplicacion « {app:s} » serà pas salvagardada",
+    "unit_unknown": "Unitat « {unit:s} » desconeguda",
+    "unlimit": "Cap de quòta",
+    "unrestore_app": "L’aplicacion « {app:s} » serà pas restaurada",
+    "upnp_dev_not_found": "Cap de periferic compatible UPnP pas trobat",
+    "upnp_disabled": "UPnP es desactivat",
+    "upnp_enabled": "UPnP es activat",
+    "upnp_port_open_failed": "Impossible de dobrir los pòrts amb UPnP",
+    "yunohost_already_installed": "YunoHost es ja installat",
+    "yunohost_configured": "YunoHost es estat configurat",
+    "yunohost_installing": "Installacion de YunoHost...",
+    "backup_applying_method_borg": "Mandadís de totes los fichièrs a la salvagarda dins lo repertòri borg-backup…",
+    "backup_csv_creation_failed": "Creacion impossibla del fichièr CSV necessari a las operacions futuras de restauracion",
+    "backup_extracting_archive": "Extraccion de l’archiu de salvagarda…",
+    "backup_output_symlink_dir_broken": "Avètz un ligam simbolic copat allòc de vòstre repertòri d’archiu  « {path:s} ». Poiriatz aver una configuracion personalizada per salvagardar vòstras donadas sus un autre sistèma de fichièrs, en aquel cas, saique oblidèretz de montar o de connectar lo disc o la clau USB.",
+    "backup_with_no_backup_script_for_app": "L’aplicacion {app:s} a pas cap de script de salvagarda. I fasèm pas cas.",
+    "backup_with_no_restore_script_for_app": "L’aplicacion {app:s} a pas cap de script de restauracion, poiretz pas restaurar automaticament la salvagarda d’aquesta aplicacion.",
+    "certmanager_acme_not_configured_for_domain": "Lo certificat del domeni {domain:s} sembla pas corrèctament installat. Mercés de lançar d’en primièr cert-install per aqueste domeni.",
+    "certmanager_attempt_to_renew_nonLE_cert": "Lo certificat pel domeni {domain:s} es pas provesit per Let’s Encrypt. Impossible de lo renovar automaticament !",
+    "certmanager_attempt_to_renew_valid_cert": "Lo certificat pel domeni {domain:s} es a man d’expirar ! Utilizatz --force per cortcircuitar",
+    "certmanager_cannot_read_cert": "Quicòm a trucat en ensajar de dobrir lo certificat actual pel domeni {domain:s} (fichièr : {file:s}), rason : {reason:s}",
+    "certmanager_cert_install_success": "Installacion capitada del certificat Let’s Encrypt pel domeni {domain:s} !",
+    "certmanager_cert_install_success_selfsigned": "Installacion capitada del certificat auto-signat pel domeni {domain:s} !",
+    "certmanager_cert_signing_failed": "Fracàs de la signatura del nòu certificat",
+    "certmanager_domain_cert_not_selfsigned": "Lo certificat del domeni {domain:s} es pas auto-signat. Volètz vertadièrament lo remplaçar ? (Utiliatz --force)",
+    "certmanager_domain_dns_ip_differs_from_public_ip": "L’enregistrament DNS « A » del domeni {domain:s} es diferent de l’adreça IP d’aqueste servidor. Se fa pauc qu’avètz modificat l’enregistrament  « A », mercés d’esperar l’espandiment (qualques verificadors d’espandiment son disponibles en linha). (Se sabètz çò que fasèm, utilizatz --no-checks per desactivar aqueles contraròtles)",
+    "certmanager_domain_http_not_working": "Sembla que lo domeni {domain:s} es pas accessible via HTTP. Mercés de verificar que las configuracions DNS e nginx son corrèctas",
+    "certmanager_domain_unknown": "Domeni desconegut {domain:s}",
+    "certmanager_no_cert_file": "Lectura impossibla del fichièr del certificat pel domeni {domain:s} (fichièr : {file:s})",
+    "certmanager_self_ca_conf_file_not_found": "Lo fichièr de configuracion per l’autoritat del certificat auto-signat es introbabla (fichièr : {file:s})",
+    "certmanager_unable_to_parse_self_CA_name": "Analisi impossible lo nom de l’autoritat del certificat auto-signat (fichièr : {file:s})",
+    "custom_app_url_required": "Cal que donetz una URL per actualizar vòstra aplicacion personalizada {app:s}",
+    "custom_appslist_name_required": "Cal que nomenetz vòstra lista d’aplicacions personalizadas",
+    "diagnosis_debian_version_error": "Impossible de determinar la version de Debian : {error}",
+    "diagnosis_kernel_version_error": "Impossible de recuperar la version del nuclèu : {error}",
+    "diagnosis_no_apps": "Pas cap d’aplicacion installada",
+    "dnsmasq_isnt_installed": "dnsmasq sembla pas èsser installat, mercés de lançar « apt-get remove bind9 && apt-get install dnsmasq »",
+    "domain_cannot_remove_main": "Impossible de levar lo domeni màger. Definissètz un novèl domeni màger d’en primièr",
+    "domain_cert_gen_failed": "Generacion del certificat impossibla",
+    "domain_created": "Lo domeni es creat",
+    "domain_creation_failed": "Creacion del certificat impossibla",
+    "domain_deleted": "Lo domeni es suprimit",
+    "domain_deletion_failed": "Supression impossibla del domeni",
+    "domain_dyndns_invalid": "Domeni incorrècte per una utilizacion amb DynDNS",
+    "domain_dyndns_root_unknown": "Domeni DynDNS màger desconegut",
+    "domain_exists": "Lo domeni existís ja",
+    "domain_hostname_failed": "Fracàs de la creacion d’un nòu nom d’òst",
+    "domain_unknown": "Domeni desconegut",
+    "domain_zone_exists": "Lo fichièr zòna DNS existís ja",
+    "domain_zone_not_found": "Fichèr de zòna DNS introbable pel domeni {:s}",
+    "domains_available": "Domenis disponibles :",
+    "done": "Acabat",
+    "downloading": "Telecargament…",
+    "dyndns_could_not_check_provide": "Impossible de verificar se {provider:s} pòt provesir {domain:s}.",
+    "dyndns_cron_installed": "La tasca cron pel domeni DynDNS es installada",
+    "dyndns_cron_remove_failed": "Impossible de levar la tasca cron pel domeni DynDNS",
+    "dyndns_cron_removed": "La tasca cron pel domeni DynDNS es levada",
+    "dyndns_ip_update_failed": "Impossible d’actualizar l’adreça IP sul domeni DynDNS",
+    "dyndns_ip_updated": "Vòstra adreça IP es estada actualizada pel domeni DynDNS",
+    "dyndns_key_generating": "La clau DNS es a se generar, pòt trigar una estona...",
+    "dyndns_key_not_found": "Clau DNS introbabla pel domeni",
+    "dyndns_no_domain_registered": "Cap de domeni pas enregistrat amb DynDNS",
+    "dyndns_registered": "Lo domeni DynDNS es enregistrat",
+    "dyndns_registration_failed": "Enregistrament del domeni DynDNS impossibla : {error:s}",
+    "dyndns_domain_not_provided": "Lo provesidor DynDNS {provider:s} pòt pas fornir lo domeni {domain:s}.",
+    "dyndns_unavailable": "Lo domeni {domain:s} es pas disponible.",
+    "extracting": "Extraccion…",
+    "field_invalid": "Camp incorrècte : « {:s} »",
+    "format_datetime_short": "%d/%m/%Y %H:%M",
+    "global_settings_cant_open_settings": "Fracàs de la dobertura del fichièr de configuracion, rason : {reason:s}",
+    "global_settings_key_doesnt_exists": "La clau « {settings_key:s} » existís pas dins las configuracions globalas, podètz veire totas las claus disponiblas en picant « yunohost settings list »",
+    "global_settings_reset_success": "Capitada ! Vòstra configuracion precedenta es estada salvagarda dins {path:s}",
+    "global_settings_setting_example_bool": "Exemple d’opcion booleana",
+    "global_settings_unknown_setting_from_settings_file": "Clau desconeguda dins los paramètres : {setting_key:s}, apartada e salvagardada dins /etc/yunohost/unkown_settings.json",
+    "installation_failed": "Fracàs de l’installacion",
+    "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",
+    "maindomain_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…",
+    "migrate_tsig_wait_4": "30 segondas…",
+    "migration_description_0002_migrate_to_tsig_sha256": "Melhora la seguretat de DynDNS TSIG en utilizar SHA512 allòc de MD5",
+    "migration_description_0003_migrate_to_stretch": "Mesa a nivèl del sistèma cap a Debian Stretch e YunoHost 3.0",
+    "migration_0003_backward_impossible": "La migracion Stretch es pas reversibla.",
+    "migration_0003_start": "Aviada de la migracion cap a Stretech. Los jornals seràn disponibles dins {logfile}.",
+    "migration_0003_patching_sources_list": "Petaçatge de sources.lists…",
+    "migration_0003_main_upgrade": "Aviada de la mesa a nivèl màger…",
+    "migration_0003_fail2ban_upgrade": "Aviada de la mesa a nivèl de fail2ban…",
+    "migration_0003_not_jessie": "La distribucion Debian actuala es pas Jessie !",
+    "migrations_cant_reach_migration_file": "Impossible d’accedir als fichièrs de migracion amb lo camin %s",
+    "migrations_current_target": "La cibla de migracion est {}",
+    "migrations_error_failed_to_load_migration": "ERROR : fracàs del cargament de la migracion {number} {name}",
+    "migrations_list_conflict_pending_done": "Podètz pas utilizar --previous e --done a l’encòp.",
+    "migrations_loading_migration": "Cargament de la migracion{number} {name}…",
+    "migrations_no_migrations_to_run": "Cap de migracion de lançar",
+    "migrations_show_currently_running_migration": "Realizacion de la migracion {number} {name}…",
+    "migrations_show_last_migration": "La darrièra migracion realizada es {}",
+    "monitor_glances_con_failed": "Connexion impossibla al servidor Glances",
+    "monitor_not_enabled": "Lo seguiment de l’estat del servidor es pas activat",
+    "monitor_stats_no_update": "Cap de donadas d’estat del servidor d’actualizar",
+    "mountpoint_unknown": "Ponch de montatge desconegut",
+    "mysql_db_creation_failed": "Creacion de la basa de donadas MySQL impossibla",
+    "no_appslist_found": "Cap de lista d’aplicacions pas trobada",
+    "no_internet_connection": "Lo servidor es pas connectat a Internet",
+    "package_not_installed": "Lo paquet « {pkgname} » es pas installat",
+    "package_unknown": "Paquet « {pkgname} » desconegut",
+    "packages_no_upgrade": "I a pas cap de paquet d’actualizar",
+    "packages_upgrade_failed": "Actualizacion de totes los paquets impossibla",
+    "path_removal_failed": "Impossible de suprimir lo camin {:s}",
+    "pattern_domain": "Deu èsser un nom de domeni valid (ex : mon-domeni.org)",
+    "pattern_email": "Deu èsser una adreça electronica valida (ex : escais@domeni.org)",
+    "pattern_firstname": "Deu èsser un pichon nom valid",
+    "pattern_lastname": "Deu èsser un nom valid",
+    "pattern_password": "Deu conténer almens 3 caractèrs",
+    "pattern_port": "Deu èsser un numèro de pòrt valid (ex : 0-65535)",
+    "pattern_port_or_range": "Deu èsser un numèro de pòrt valid (ex : 0-65535) o un interval de pòrt (ex : 100:200)",
+    "pattern_positive_number": "Deu èsser un nombre positiu",
+    "port_already_closed": "Lo pòrt {port:d} es ja tampat per las connexions {ip_version:s}",
+    "port_already_opened": "Lo pòrt {port:d} es ja dubèrt per las connexions {ip_version:s}",
+    "port_available": "Lo pòrt {port:d} es disponible",
+    "port_unavailable": "Lo pòrt {port:d} es pas disponible",
+    "restore_already_installed_app": "Una aplicacion es ja installada amb l’id « {app:s} »",
+    "restore_app_failed": "Impossible de restaurar l’aplicacion « {app:s} »",
+    "backup_ask_for_copying_if_needed": "D’unes fichièrs an pas pogut èsser preparatz per la salvagarda en utilizar lo metòde qu’evita de gastar d’espaci sul sistèma de manièra temporària. Per lançar la salvagarda, cal utilizar temporàriament {size:s} Mo. Acceptatz ?",
+    "yunohost_not_installed": "YunoHost es pas installat o corrèctament installat. Mercés d’executar « yunohost tools postinstall »",
+    "backup_output_directory_forbidden": "Repertòri de destinacion defendut. Las salvagardas pòdon pas se realizar dins los repertòris bin, /boot, /dev, /etc, /lib, /root, /run, /sbin, /sys, /usr, /var ou /home/yunohost.backup/archives",
+    "certmanager_attempt_to_replace_valid_cert": "Sètz a remplaçar un certificat corrècte e valid pel domeni {domain:s} ! (Utilizatz --force per cortcircuitar)",
+    "certmanager_cert_renew_success": "Renovèlament capitat d’un certificat Let’s Encrypt pel domeni {domain:s} !",
+    "certmanager_certificate_fetching_or_enabling_failed": "Sembla d’aver fracassat l’activacion d’un nòu certificat per {domain:s}…",
+    "certmanager_conflicting_nginx_file": "Impossible de preparar lo domeni pel desfís ACME : lo fichièr de configuracion  nginx  {filepath:s} es en conflicte e deu èsser levat d’en primièr",
+    "certmanager_couldnt_fetch_intermediate_cert": "Expiracion del relambi  pendent l’ensag de recuperacion del certificat intermediari dins de Let’s Encrypt. L’installacion / lo renovèlament es estat interromput - tornatz ensajar mai tard.",
+    "certmanager_domain_not_resolved_locally": "Lo domeni {domain:s} pòt pas èsser determinat dins de vòstre servidor YunoHost. Pòt arribar s’avètz recentament modificat vòstre enregistrament DNS. Dins aqueste cas, mercés d’esperar unas oras per l’espandiment. Se lo problèma dura, consideratz ajustar {domain:s} a /etc/hosts. (Se sabètz çò que fasètz, utilizatz --no-checks per desactivar las verificacions.)",
+    "certmanager_error_no_A_record": "Cap d’enregistrament DNS « A » pas trobat per {domain:s}. Vos cal indicar que lo nom de domeni mene a vòstra maquina per poder installar un certificat Let’S Encrypt ! (Se sabètz çò que fasètz, utilizatz --no-checks per desactivar las verificacions.)",
+    "certmanager_hit_rate_limit": "Tròp de certificats son ja estats demandats recentament per aqueste ensem de domeni {domain:s}. Mercés de tornar ensajar mai tard. Legissètz https://letsencrypt.org/docs/rate-limits/ per mai detalhs",
+    "certmanager_http_check_timeout": "Expiracion del relambi d’ensag del servidor de se contactar via HTTP amb son adreça IP publica {domain:s} amb l’adreça {ip:s}. Coneissètz benlèu de problèmas d’hairpinning o lo parafuòc/router amont de vòstre servidor es mal configurat.",
+    "domain_dns_conf_is_just_a_recommendation": "Aqueste pagina mòstra la configuracion *recomandada*. Non configura *pas* lo DNS per vos. Sètz responsable de la configuracion de vòstra zòna DNS en çò de vòstre registrar DNS amb aquesta recomandacion.",
+    "domain_dyndns_already_subscribed": "Avètz ja soscrich a un domeni DynDNS",
+    "domain_dyndns_dynette_is_unreachable": "Impossible de contactar la dynette YunoHost, siá YunoHost pas es pas corrèctament connectat a Internet, siá lo servidor de la dynett es arrestat. Error : {error}",
+    "domain_uninstall_app_first": "Una o mantuna aplicacions son installadas sus aqueste domeni. Mercés de las desinstallar d’en primièr abans de suprimir aqueste domeni",
+    "firewall_reload_failed": "Impossible de recargar lo parafuòc",
+    "firewall_reloaded": "Lo parafuòc es estat recargat",
+    "firewall_rules_cmd_failed": "Unas règlas del parafuòc an fracassat. Per mai informacions, consultatz lo jornal.",
+    "global_settings_bad_choice_for_enum": "La valor del paramètre {setting:s} es incorrècta. Recebut : {received_type:s}, esperat {expected_type:s}",
+    "global_settings_bad_type_for_setting": "Lo tipe del paramètre {setting:s} es incorrècte. Recebut : {received_type:s}, esperat {expected_type:s}",
+    "global_settings_cant_write_settings": "Fracàs de l’escritura del fichièr de configuracion, rason : {reason:s}",
+    "global_settings_setting_example_enum": "Exemple d’opcion de tipe enumeracion",
+    "global_settings_setting_example_int": "Exemple d’opcion de tipe entièr",
+    "global_settings_setting_example_string": "Exemple d’opcion de tipe cadena",
+    "global_settings_unknown_type": "Situacion inesperada, la configuracion {setting:s} sembla d’aver lo tipe {unknown_type:s} mas es pas un tipe pres en carga pel sistèma.",
+    "hook_exec_failed": "Fracàs de l’execucion del script « {path:s} »",
+    "hook_exec_not_terminated": "L’execucion del escript « {path:s} » es pas acabada",
+    "hook_list_by_invalid": "La proprietat de tria de las accions es invalida",
+    "hook_name_unknown": "Nom de script « {name:s} » desconegut",
+    "ldap_init_failed_to_create_admin": "L’inicializacion de LDAP a pas pogut crear l’utilizaire admin",
+    "mail_domain_unknown": "Lo domeni de corrièl « {domain:s} » es desconegut",
+    "mailbox_used_space_dovecot_down": "Lo servici corrièl Dovecot deu èsser aviat, se volètz conéisser l’espaci ocupat per la messatjariá",
+    "migrate_tsig_failed": "La migracion del domeni dyndns {domain} cap a hmac-sha512 a pas capitat, anullacion de las modificacions. Error : {error_code} - {error}",
+    "migrate_tsig_wait": "Esperem 3 minutas que lo servidor dyndns prenga en compte la novèla clau…",
+    "migrate_tsig_not_needed": "Sembla qu’utilizatz pas un domeni dyndns, donc cap de migracion es pas necessària !",
+    "migration_0003_yunohost_upgrade": "Aviada de la mesa a nivèl del paquet YunoHost… La migracion acabarà, mas la mesa a jorn reala se realizarà tot bèl aprèp. Un còp acabada, poiretz vos reconnectar a l’administracion web.",
+    "migration_0003_system_not_fully_up_to_date": "Lo sistèma es pas complètament a jorn. Mercés de lançar una mesa a jorn classica abans de començar la migracion per Stretch.",
+    "migration_0003_modified_files": "Mercés de notar que los fichièrs seguents son estats detectats coma modificats manualament e poiràn èsser escafats a la fin de la mesa a nivèl : {manually_modified_files}",
+    "monitor_period_invalid": "Lo periòde de temps es incorrècte",
+    "monitor_stats_file_not_found": "Lo fichièr d’estatisticas es introbable",
+    "monitor_stats_period_unavailable": "Cap d’estatisticas son pas disponiblas pel periòde",
+    "mysql_db_init_failed": "Impossible d’inicializar la basa de donadas MySQL",
+    "service_disable_failed": "Impossible de desactivar lo servici « {service:s} »↵\n↵\nJornals recents : {logs:s}",
+    "service_disabled": "Lo servici « {service:s} » es desactivat",
+    "service_enable_failed": "Impossible d’activar lo servici « {service:s} »↵\n↵\nJornals recents : {logs:s}",
+    "service_enabled": "Lo servici « {service:s} » es activat",
+    "service_no_log": "Cap de jornal de far veire pel servici « {service:s} »",
+    "service_regenconf_dry_pending_applying": "Verificacion de las configuracions en espèra que poirián èsser aplicadas pel servici « {service} »…",
+    "service_regenconf_failed": "Regeneracion impossibla de la configuracion pels servicis : {services}",
+    "service_regenconf_pending_applying": "Aplicacion de las configuracions en espèra pel servici « {service} »…",
+    "service_remove_failed": "Impossible de levar lo servici « {service:s} »",
+    "service_removed": "Lo servici « {service:s} » es estat levat",
+    "service_start_failed": "Impossible d’aviar lo servici « {service:s} »↵\n↵\nJornals recents : {logs:s}",
+    "service_started": "Lo servici « {service:s} » es aviat",
+    "service_stop_failed": "Impossible d’arrestar lo servici « {service:s} »↵\n\nJornals recents : {logs:s}",
+    "ssowat_conf_generated": "La configuracion SSowat es generada",
+    "ssowat_conf_updated": "La configuracion SSOwat es estada actualizada",
+    "system_upgraded": "Lo sistèma es estat actualizat",
+    "system_username_exists": "Lo nom d’utilizaire existís ja dins los utilizaires sistèma",
+    "unexpected_error": "Una error inesperada s’es producha",
+    "upgrade_complete": "Actualizacion acabada",
+    "upgrading_packages": "Actualizacion dels paquets…",
+    "user_created": "L’utilizaire es creat",
+    "user_creation_failed": "Creacion de l’utilizaire impossibla",
+    "user_deleted": "L’utilizaire es suprimit",
+    "user_deletion_failed": "Supression impossibla de l’utilizaire",
+    "user_home_creation_failed": "Creacion impossibla del repertòri personal a l’utilizaire",
+    "user_info_failed": "Recuperacion impossibla de las informacions tocant l’utilizaire",
+    "user_unknown": "Utilizaire « {user:s} » desconegut",
+    "user_update_failed": "Modificacion impossibla de l’utilizaire",
+    "user_updated": "L’utilizaire es estat modificat",
+    "yunohost_ca_creation_failed": "Creacion impossibla de l’autoritat de certificacion",
+    "yunohost_ca_creation_success": "L’autoritat de certificacion locala es creada.",
+    "service_conf_file_kept_back": "Lo fichièr de configuracion « {conf} » deuriá èsser suprimit pel servici {service} mas es estat servat.",
+    "service_conf_file_manually_modified": "Lo fichièr de configuracion « {conf} » es estat modificat manualament e serà pas actualizat",
+    "service_conf_file_manually_removed": "Lo fichièr de configuracion « {conf} » es suprimit manualament e serà pas creat",
+    "service_conf_file_remove_failed": "Supression impossibla del fichièr de configuracion « {conf} »",
+    "service_conf_file_removed": "Lo fichièr de configuracion « {conf} » es suprimit",
+    "service_conf_file_updated": "Lo fichièr de configuracion « {conf} » es actualizat",
+    "service_conf_new_managed_file": "Lo servici {service} gerís ara lo fichièr de configuracion « {conf} ».",
+    "service_conf_up_to_date": "La configuracion del servici « {service} » es ja actualizada",
+    "service_conf_would_be_updated": "La configuracion del servici « {service} » seriá estada actualizada",
+    "service_description_avahi-daemon": "permet d’aténher vòstre servidor via yunohost.local sus vòstre ret local",
+    "service_description_dnsmasq": "gerís la resolucion dels noms de domeni (DNS)",
+    "updating_apt_cache": "Actualizacion de la lista dels paquets disponibles...",
+    "service_conf_file_backed_up": "Lo fichièr de configuracion « {conf} » es salvagardat dins « {backup} »",
+    "service_conf_file_copy_failed": "Còpia impossibla del nòu fichièr de configuracion « {new} » cap a « {conf} »",
+    "server_reboot_confirm": "Lo servidor es per reaviar sul pic, o volètz vertadièrament ? {answers:s}",
+    "service_add_failed": "Apondon impossible del servici « {service:s} »",
+    "service_added": "Lo servici « {service:s} » es ajustat",
+    "service_already_started": "Lo servici « {service:s} » es ja aviat",
+    "service_already_stopped": "Lo servici « {service:s} » es ja arrestat",
+    "restore_cleaning_failed": "Impossible de netejar lo repertòri temporari de restauracion",
+    "restore_complete": "Restauracion acabada",
+    "restore_confirm_yunohost_installed": "Volètz vertadièrament restaurar un sistèma ja installat ? {answers:s}",
+    "restore_extracting": "Extraccions dels fichièrs necessaris dins de l’archiu…",
+    "restore_failed": "Impossible de restaurar lo sistèma",
+    "restore_hook_unavailable": "Lo script de restauracion « {part:s} » es pas disponible sus vòstre sistèma e es pas tanpauc dins l’archiu",
+    "restore_may_be_not_enough_disk_space": "Lo sistèma sembla d’aver pas pro d’espaci disponible (liure : {free_space:d} octets, necessari : {needed_space:d} octets, marge de seguretat : {margin:d} octets)",
+    "restore_mounting_archive": "Montatge de l’archiu dins « {path:s} »",
+    "restore_not_enough_disk_space": "Espaci disponible insufisent (liure : {free_space:d} octets, necessari : {needed_space:d} octets, marge de seguretat : {margin:d} octets)",
+    "restore_nothings_done": "Res es pas estat restaurat",
+    "restore_removing_tmp_dir_failed": "Impossible de levar u ancian repertòri temporari",
+    "restore_running_app_script": "Lançament del script de restauracion per l’aplicacion  « {app:s} »…",
+    "restore_running_hooks": "Execucion dels scripts de restauracion…",
+    "restore_system_part_failed": "Restauracion impossibla de la part « {part:s} » del sistèma",
+    "server_shutdown": "Lo servidor serà atudat",
+    "server_shutdown_confirm": "Lo servidor es per s’atudar sul pic, o volètz vertadièrament ? {answers:s}",
+    "server_reboot": "Lo servidor es per reaviar",
+    "network_check_mx_ko": "L’enregistrament DNS MX es pas especificat",
+    "new_domain_required": "Vos cal especificar lo domeni màger",
+    "no_ipv6_connectivity": "La connectivitat IPv6 es pas disponibla",
+    "not_enough_disk_space": "Espaci disc insufisent sus « {path:s} »",
+    "package_unexpected_error": "Una error inesperada es apareguda amb lo paquet « {pkgname} »",
+    "packages_upgrade_critical_later": "Los paquets critics {packages:s} seràn actualizats mai tard",
+    "restore_action_required": "Devètz precisar çò que cal restaurar",
+    "service_cmd_exec_failed": "Impossible d’executar la comanda « {command:s} »",
+    "service_conf_updated": "La configuracion es estada actualizada pel servici « {service} »",
+    "service_description_mysql": "garda las donadas de las aplicacions (base de donadas SQL)",
+    "service_description_php5-fpm": "executa d’aplicacions escrichas en PHP amb nginx",
+    "service_description_postfix": "emplegat per enviar e recebre de corrièls",
+    "service_description_rmilter": "verifica mantun paramètres dels corrièls",
+    "service_description_slapd": "garda los utilizaires, domenis e lors informacions ligadas",
+    "service_description_ssh": "vos permet de vos connectar a distància a vòstre servidor via un teminal (protocòl SSH)",
+    "service_description_yunohost-api": "permet las interaccions entre l’interfàcia web de YunoHost e le sistèma",
+    "service_description_yunohost-firewall": "gerís los pòrts de connexion dobèrts e tampats als servicis",
+    "ssowat_persistent_conf_read_error": "Error en legir la configuracion duradissa de SSOwat : {error:s}. Modificatz lo fichièr /etc/ssowat/conf.json.persistent per reparar la sintaxi JSON",
+    "ssowat_persistent_conf_write_error": "Error en salvagardar la configuracion duradissa de SSOwat : {error:s}. Modificatz lo fichièr /etc/ssowat/conf.json.persistent per reparar la sintaxi JSON",
+    "certmanager_old_letsencrypt_app_detected": "\nYunohost a detectat que l’aplicacion ’letsencrypt’ es installada, aquò es en conflicte amb las novèlas foncionalitats integradas de gestion dels certificats de Yunohost. Se volètz utilizar aquelas foncionalitats integradas, mercés de lançar las comandas seguentas per migrar vòstra installacion :\n\n    yunohost app remove letsencrypt\n    yunohost domain cert-install\n\nN.B. : aquò provarà de tornar installar los certificats de totes los domenis amb un certificat Let’s Encrypt o las auto-signats",
+    "diagnosis_monitor_disk_error": "Impossible de supervisar los disques : {error}",
+    "diagnosis_monitor_network_error": "Impossible de supervisar la ret : {error}",
+    "diagnosis_monitor_system_error": "Impossible de supervisar lo sistèma : {error}",
+    "executing_command": "Execucion de la comanda « {command:s} »…",
+    "executing_script": "Execucion del script « {script:s} »…",
+    "global_settings_cant_serialize_settings": "Fracàs de la serializacion de las donadas de parametratge, rason : {reason:s}",
+    "ip6tables_unavailable": "Podètz pas jogar amb ip6tables aquí. Siá sèts dins un contenedor, siá vòstre nuclèu es pas compatible amb aquela opcion",
+    "iptables_unavailable": "Podètz pas jogar amb iptables aquí. Siá sèts dins un contenedor, siá vòstre nuclèu es pas compatible amb aquela opcion",
+    "update_cache_failed": "Impossible d’actualizar lo cache de l’APT",
+    "mail_alias_remove_failed": "Supression impossibla de l’alias de corrièl « {mail:s} »",
+    "mail_forward_remove_failed": "Supression impossibla del corrièl de transferiment « {mail:s} »",
+    "migrate_tsig_start": "L’algorisme de generacion de claus es pas pro securizat per la signatura TSIG del domeni « {domain} », lançament de la migracion cap a hmac-sha512 que’s mai securizat",
+    "migration_description_0001_change_cert_group_to_sslcert": "Càmbia las permissions de grop dels certificats de « metronome » per « ssl-cert »",
+    "migration_0003_restoring_origin_nginx_conf": "Vòstre fichièr /etc/nginx/nginx.conf es estat modificat manualament. La migracion reïnicializarà d’en primièr son estat origina… Lo fichièr precedent serà disponible coma {backup_dest}.",
+    "migration_0003_still_on_jessie_after_main_upgrade": "Quicòm a trucat pendent la mesa a nivèl màger : lo sistèma es encara jos Jessie ?!? Per trobar lo problèma, agachatz {log} …",
+    "migration_0003_general_warning": "Notatz qu’aquesta migracion es una operacion delicata. Encara que la còla YunoHost aguèsse fach çò melhor per la tornar legir e provar, la migracion poiriá copar de parts del sistèma o de las aplicacions.\n\nEn consequéncia, vos recomandam :\n· · · · -  de lançar una salvagarda de vòstras donadas o aplicacions criticas. Mai d’informacions a https://yunohost.org/backup ;\n· · · · - d’èsser pacient aprèp aver lançat la migracion : segon vòstra connexion Internet e material, pòt trigar qualques oras per que tot siá mes al nivèl.\n\nEn mai, lo pòrt per SMTP, utilizat pels clients de corrièls extèrns (coma Thunderbird o K9-Mail per exemple) foguèt cambiat de 465 (SSL/TLS) per 587 (STARTTLS). L’ancian pòrt 465 serà automaticament tampat e lo nòu pòrt 587 serà dobèrt dins lo parafuòc. Vosautres e vòstres utilizaires *auretz* d’adaptar la configuracion de vòstre client de corrièl segon aqueles cambiaments !",
+    "migration_0003_problematic_apps_warning": "Notatz que las aplicacions seguentas, saique problematicas, son estadas desactivadas. Semblan d’aver estadas installadas d’una lista d’aplicacions o que son pas marcadas coma «working ».  En consequéncia, podèm pas assegurar que tendràn de foncionar aprèp la mesa a nivèl : {problematic_apps}",
+    "migrations_bad_value_for_target": "Nombre invalid pel paramètre « target », los numèros de migracion son 0 o {}",
+    "migrations_migration_has_failed": "La migracion {number} {name} a pas capitat amb l’excepcion {exception}, anullacion",
+    "migrations_skip_migration": "Passatge de la migracion {number} {name}…",
+    "migrations_to_be_ran_manually": "La migracion {number} {name} deu èsser lançada manualament. Mercés d’anar a Aisinas > Migracion dins l’interfàcia admin, o lançar « yunohost tools migrations migrate ».",
+    "migrations_need_to_accept_disclaimer": "Per lançar la migracion {number} {name} , avètz d’acceptar aquesta clausa de non-responsabilitat :\n---\n{disclaimer}\n---\nS’acceptatz de lançar la migracion, mercés de tornar executar la comanda amb l’opcion accept-disclaimer.",
+    "monitor_disabled": "La supervision del servidor es desactivada",
+    "monitor_enabled": "La supervision del servidor es activada",
+    "mysql_db_initialized": "La basa de donadas MySQL es estada inicializada",
+    "no_restore_script": "Lo script de salvagarda es pas estat trobat per l’aplicacion « {app:s} »",
+    "pattern_backup_archive_name": "Deu èsser un nom de fichièr valid compausat de 30 caractèrs alfanumerics al maximum e  « -_. »",
+    "pattern_listname": "Deu èsser compausat solament de caractèrs alfanumerics e de tirets basses",
+    "service_description_dovecot": "permet als clients de messatjariá d’accedir/recuperar los corrièls (via IMAP e POP3)",
+    "service_description_fail2ban": "protegís contra los atacs brute-force e d’autres atacs venents d’Internet",
+    "service_description_glances": "susvelha las informacions sistèma de vòstre servidor",
+    "service_description_metronome": "gerís los comptes de messatjariás instantanèas  XMPP",
+    "service_description_nginx": "fornís o permet l’accès a totes los sites web albergats sus vòstre servidor",
+    "service_description_nslcd": "gerís la connexion en linha de comanda dels utilizaires YunoHost",
+    "service_description_redis-server": "una basa de donadas especializada per un accès rapid a las donadas, las filas d’espèra e la comunicacion entre programas",
+    "service_description_rspamd": "filtra lo corrièl pas desirat e mai foncionalitats ligadas al corrièl",
+    "migrations_backward": "Migracion en darrièr.",
+    "migrations_forward": "Migracion en avant",
+    "network_check_smtp_ko": "Lo trafic de corrièl sortent (pòrt 25 SMTP) sembla blocat per vòstra ret",
+    "network_check_smtp_ok": "Lo trafic de corrièl sortent (pòrt 25 SMTP) es pas blocat",
+    "pattern_mailbox_quota": "Deu èsser una talha amb lo sufixe b/k/M/G/T o 0 per desactivar la quòta",
+    "backup_archive_writing_error": "Impossible d’ajustar los fichièrs a la salvagarda dins l’archiu comprimit",
+    "backup_cant_mount_uncompress_archive": "Impossible de montar en lectura sola lo repertòri de l’archiu descomprimit",
+    "backup_no_uncompress_archive_dir": "Lo repertòri de l’archiu descomprimit existís pas",
+    "pattern_username": "Deu èsser compausat solament de caractèrs alfanumerics en letras minusculas e de tirets basses"
+}

locales/pt.json

@@ -2,33 +2,33 @@
     "action_invalid": "Acção Inválida '{action:s}'",
     "admin_password": "Senha de administração",
     "admin_password_change_failed": "Não foi possível alterar a senha",
-    "admin_password_changed": "Senha de administração alterada com êxito",
+    "admin_password_changed": "A palavra-passe de administração foi alterada com sucesso",
     "app_already_installed": "{app:s} já está instalada",
     "app_extraction_failed": "Não foi possível extrair os ficheiros para instalação",
     "app_id_invalid": "A ID da aplicação é inválida",
     "app_install_files_invalid": "Ficheiros para instalação corrompidos",
-    "app_location_already_used": "Já existe uma aplicação instalada neste diretório",
-    "app_location_install_failed": "Não é possível instalar a aplicação neste diretório",
-    "app_manifest_invalid": "Manifesto da aplicação inválido",
+    "app_location_already_used": "A aplicação {app} Já está instalada nesta localização ({path})",
+    "app_location_install_failed": "Não é possível instalar a aplicação neste diretório porque está em conflito com a aplicação '{other_app}', que já está instalada no diretório '{other_path}'",
+    "app_manifest_invalid": "Manifesto da aplicação inválido: {error}",
     "app_no_upgrade": "Não existem aplicações para atualizar",
     "app_not_installed": "{app:s} não está instalada",
     "app_recent_version_required": "{:s} requer uma versão mais recente da moulinette",
     "app_removed": "{app:s} removida com êxito",
-    "app_sources_fetch_failed": "Impossível obter os ficheiros fonte",
+    "app_sources_fetch_failed": "Incapaz obter os ficheiros fonte",
     "app_unknown": "Aplicação desconhecida",
-    "app_upgrade_failed": "Impossível atualizar {app:s}",
+    "app_upgrade_failed": "Não foi possível atualizar {app:s}",
     "app_upgraded": "{app:s} atualizada com sucesso",
-    "appslist_fetched": "Lista de aplicações processada com sucesso",
-    "appslist_removed": "Lista de aplicações removida com sucesso",
-    "appslist_retrieve_error": "Não foi possível obter a lista de aplicações remotas",
-    "appslist_unknown": "Lista de aplicaçoes desconhecida",
-    "ask_current_admin_password": "Senha de administração atual",
-    "ask_email": "Correio eletrónico",
+    "appslist_fetched": "A lista de aplicações, {appslist:s}, foi trazida com sucesso",
+    "appslist_removed": "A Lista de aplicações {appslist:s} foi removida",
+    "appslist_retrieve_error": "Não foi possível obter a lista de aplicações remotas {appslist:s}: {error:s}",
+    "appslist_unknown": "Desconhece-se a lista de aplicaçoes {appslist:s}.",
+    "ask_current_admin_password": "Senha atual da administração",
+    "ask_email": "Endereço de Email",
     "ask_firstname": "Primeiro nome",
     "ask_lastname": "Último nome",
     "ask_list_to_remove": "Lista para remover",
     "ask_main_domain": "Domínio principal",
-    "ask_new_admin_password": "Senha de administração nova",
+    "ask_new_admin_password": "Nova senha de administração",
     "ask_password": "Senha",
     "backup_created": "Backup completo",
     "backup_creating_archive": "A criar ficheiro de backup...",
@@ -145,22 +145,52 @@
     "yunohost_configured": "YunoHost configurada com êxito",
     "yunohost_installing": "A instalar a YunoHost...",
     "yunohost_not_installed": "YunoHost ainda não está corretamente configurado. Por favor execute as 'ferramentas pós-instalação yunohost'.",
-    "app_incompatible": "A aplicação é incompatível com a sua versão de Yunohost",
+    "app_incompatible": "A aplicação {app} é incompatível com a sua versão de Yunohost",
     "app_not_correctly_installed": "{app:s} parece não estar corretamente instalada",
     "app_not_properly_removed": "{app:s} não foi corretamente removido",
-    "app_requirements_checking": "Verificando os pacotes necessários...",
-    "app_unsupported_remote_type": "Remoto tipo utilizado para a aplicação não suportado",
+    "app_requirements_checking": "Verificando os pacotes necessários para {app}...",
+    "app_unsupported_remote_type": "A aplicação não possui suporte ao tipo remoto utilizado",
     "backup_archive_app_not_found": "A aplicação '{app:s}' não foi encontrada no arquivo de backup",
-    "backup_archive_broken_link": "Impossível acessar o arquivo de backup (link quebrado para {path:s} )",
+    "backup_archive_broken_link": "Impossível acessar o arquivo de backup (link quebrado ao {path:s})",
     "backup_archive_hook_not_exec": "O gancho '{hook:s}' não foi executado neste backup",
     "backup_archive_name_exists": "O nome do arquivo de backup já existe",
-    "backup_archive_open_failed": "Impossível abrir o arquivo de backup",
-    "backup_cleaning_failed": "Impossível apagar o diretório temporário de backup",
+    "backup_archive_open_failed": "Não é possível abrir o arquivo de backup",
+    "backup_cleaning_failed": "Não é possível limpar a pasta temporária de backups",
     "backup_creation_failed": "A criação do backup falhou",
     "backup_delete_error": "Impossível apagar '{path:s}'",
     "backup_deleted": "O backup foi suprimido",
     "backup_extracting_archive": "Extraindo arquivo de backup...",
     "backup_hook_unknown": "Gancho de backup '{hook:s}' desconhecido",
     "backup_nothings_done": "Não há nada para guardar",
-    "backup_output_directory_forbidden": "Diretório de saída proibido. Os backups não podem ser criados em /boot, /dev, /etc, /lib, /root, /run, /sbin, /sys, /usr, /var ou /home/yunohost.backup/archives subpastas"
+    "backup_output_directory_forbidden": "Diretório de saída proibido. Os backups não podem ser criados em /boot, /dev, /etc, /lib, /root, /run, /sbin, /sys, /usr, /var ou /home/yunohost.backup/archives subpastas",
+    "app_already_installed_cant_change_url": "Este aplicativo já está instalado. A URL não pode ser alterada apenas por esta função. Olhe para o `app changeurl` se estiver disponível.",
+    "app_already_up_to_date": "{app:s} já está atualizado",
+    "app_argument_choice_invalid": "Escolha inválida para o argumento '{name:s}', deve ser um dos {choices:s}",
+    "app_argument_invalid": "Valor inválido de argumento '{name:s}': {error:s}",
+    "app_argument_required": "O argumento '{name:s}' é obrigatório",
+    "app_change_url_failed_nginx_reload": "Falha ao reiniciar o nginx. Aqui está o retorno de 'nginx -t':\n{nginx_errors:s}",
+    "app_change_no_change_url_script": "A aplicação {app_name:s} ainda não permite mudança da URL, talvez seja necessário atualiza-la.",
+    "app_location_unavailable": "Esta url não está disponível ou está em conflito com outra aplicação já instalada",
+    "app_package_need_update": "O pacote da aplicação {app} precisa ser atualizado para aderir as mudanças do YunoHost",
+    "app_requirements_failed": "Não foi possível atender aos requisitos da aplicação {app}: {error}",
+    "app_upgrade_app_name": "Atualizando aplicação {app}…",
+    "app_upgrade_some_app_failed": "Não foi possível atualizar algumas aplicações",
+    "appslist_corrupted_json": "Falha ao carregar a lista de aplicações. O arquivo {filename:s} aparenta estar corrompido.",
+    "appslist_migrating": "Migando lista de aplicações {appslist:s}…",
+    "appslist_name_already_tracked": "Já existe uma lista de aplicações registrada com o nome {name:s}.",
+    "appslist_retrieve_bad_format": "O arquivo recuperado para a lista de aplicações {appslist:s} é invalido",
+    "appslist_url_already_tracked": "Já existe uma lista de aplicações registrada com a url {url:s}.",
+    "ask_path": "Caminho",
+    "backup_abstract_method": "Este metodo de backup ainda não foi implementado",
+    "backup_action_required": "Deve-se especificar algo a salvar",
+    "backup_app_failed": "Não foi possível fazer o backup dos aplicativos '{app:s}'",
+    "backup_applying_method_custom": "Chamando o metodo personalizado de backup '{method:s}'…",
+    "backup_applying_method_tar": "Criando o arquivo tar de backup…",
+    "backup_archive_mount_failed": "Falha ao montar o arquivo de backup",
+    "backup_archive_name_unknown": "Desconhece-se o arquivo local de backup de nome '{name:s}'",
+    "backup_archive_system_part_not_available": "A seção do sistema '{part:s}' está indisponivel neste backup",
+    "backup_ask_for_copying_if_needed": "Alguns arquivos não consiguiram ser preparados para backup utilizando o metodo que não gasta espaço de disco temporariamente. Para realizar o backup {size:s}MB precisam ser usados temporariamente. Você concorda?",
+    "backup_borg_not_implemented": "O método de backup Borg ainda não foi implementado.",
+    "backup_cant_mount_uncompress_archive": "Não foi possível montar em modo leitura o diretorio de arquivos não comprimido",
+    "backup_copying_to_organize_the_archive": "Copiando {size:s}MB para organizar o arquivo"
 }

src/yunohost/app.py

@@ -32,7 +32,6 @@ import re
 import urlparse
 import errno
 import subprocess
-import requests
 import glob
 import pwd
 import grp
@@ -133,6 +132,7 @@ def app_fetchlist(url=None, name=None):
     else:
         appslists_to_be_fetched = appslists.keys()
 
+    import requests # lazy loading this module for performance reasons
     # Fetch all appslists to be fetched
     for name in appslists_to_be_fetched:
 
@@ -576,7 +576,7 @@ def app_upgrade(auth, app=[], url=None, file=None):
     logger.info("Upgrading apps %s", ", ".join(app))
 
     for app_instance_name in apps:
-        logger.warning(m18n.n('app_upgrade_app_name', app=app_instance_name))
+        logger.info(m18n.n('app_upgrade_app_name', app=app_instance_name))
         installed = _is_installed(app_instance_name)
         if not installed:
             raise MoulinetteError(errno.ENOPKG,
@@ -628,6 +628,9 @@ def app_upgrade(auth, app=[], url=None, file=None):
         uo = UnitOperation('app_upgrade', related_to, env=env_dict)
         uo.start()
 
+        # Apply dirty patch to make php5 apps compatible with php7
+        _patch_php5(extracted_app_folder)
+
         # Execute App upgrade script
         os.system('chown -hR admin: %s' % INSTALL_TMP)
         if hook_exec(extracted_app_folder + '/scripts/upgrade', args=args_list, env=env_dict, user="root") != 0:
@@ -767,6 +770,9 @@ def app_install(uo, auth, app, label=None, args=None, no_remove_on_failure=False
     app_settings['install_time'] = status['installed_at']
     _set_app_settings(app_instance_name, app_settings)
 
+    # Apply dirty patch to make php5 apps compatible with php7
+    _patch_php5(extracted_app_folder)
+
     os.system('chown -R admin: ' + extracted_app_folder)
 
     # Execute App install script
@@ -876,6 +882,10 @@ def app_remove(uo, auth, app):
     except:
         pass
 
+    # Apply dirty patch to make php5 apps compatible with php7 (e.g. the remove
+    # script might date back from jessie install)
+    _patch_php5(app_setting_path)
+
     os.system('cp -a %s /tmp/yunohost_remove && chown -hR admin: /tmp/yunohost_remove' % app_setting_path)
     os.system('chown -R admin: /tmp/yunohost_remove')
     os.system('chmod -R u+rX /tmp/yunohost_remove')
@@ -1161,7 +1171,7 @@ def app_setting(app, key, value=None, delete=False):
         try:
             return app_settings[key]
         except:
-            logger.info("cannot get app setting '%s' for '%s'", key, app)
+            logger.debug("cannot get app setting '%s' for '%s'", key, app)
             return None
     else:
         if delete and key in app_settings:
@@ -1512,7 +1522,7 @@ def _extract_app_from_file(path, remove=False):
         Dict manifest
 
     """
-    logger.info(m18n.n('extracting'))
+    logger.debug(m18n.n('extracting'))
 
     if os.path.exists(APP_TMP_FOLDER):
         shutil.rmtree(APP_TMP_FOLDER)
@@ -1553,7 +1563,7 @@ def _extract_app_from_file(path, remove=False):
         raise MoulinetteError(errno.EINVAL,
                               m18n.n('app_manifest_invalid', error=e.strerror))
 
-    logger.info(m18n.n('done'))
+    logger.debug(m18n.n('done'))
 
     manifest['remote'] = {'type': 'file', 'path': path}
     return manifest, extracted_app_folder
@@ -1598,7 +1608,7 @@ def _fetch_app_from_git(app):
     if os.path.exists(app_tmp_archive):
         os.remove(app_tmp_archive)
 
-    logger.info(m18n.n('downloading'))
+    logger.debug(m18n.n('downloading'))
 
     if ('@' in app) or ('http://' in app) or ('https://' in app):
         url = app
@@ -1649,7 +1659,7 @@ def _fetch_app_from_git(app):
                 raise MoulinetteError(errno.EIO,
                                       m18n.n('app_manifest_invalid', error=e.strerror))
             else:
-                logger.info(m18n.n('done'))
+                logger.debug(m18n.n('done'))
 
         # Store remote repository info into the returned manifest
         manifest['remote'] = {'type': 'git', 'url': url, 'branch': branch}
@@ -1706,7 +1716,7 @@ def _fetch_app_from_git(app):
                 raise MoulinetteError(errno.EIO,
                                       m18n.n('app_manifest_invalid', error=e.strerror))
             else:
-                logger.info(m18n.n('done'))
+                logger.debug(m18n.n('done'))
 
         # Store remote repository info into the returned manifest
         manifest['remote'] = {
@@ -1819,7 +1829,7 @@ def _check_manifest_requirements(manifest, app_instance_name):
     # Validate multi-instance app
     if is_true(manifest.get('multi_instance', False)):
         # Handle backward-incompatible change introduced in yunohost >= 2.3.6
-        # See https://dev.yunohost.org/issues/156
+        # 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'):
@@ -1829,7 +1839,7 @@ def _check_manifest_requirements(manifest, app_instance_name):
     elif not requirements:
         return
 
-    logger.info(m18n.n('app_requirements_checking', app=app_instance_name))
+    logger.debug(m18n.n('app_requirements_checking', app=app_instance_name))
 
     # Retrieve versions of each required package
     try:
@@ -2059,7 +2069,7 @@ def _migrate_appslist_system():
 
     for cron_path in legacy_crons:
         appslist_name = os.path.basename(cron_path).replace("yunohost-applist-", "")
-        logger.info(m18n.n('appslist_migrating', appslist=appslist_name))
+        logger.debug(m18n.n('appslist_migrating', appslist=appslist_name))
 
         # Parse appslist url in cron
         cron_file_content = open(cron_path).read().strip()
@@ -2237,3 +2247,40 @@ def normalize_url_path(url_path):
         return '/' + url_path.strip("/").strip() + '/'
 
     return "/"
+
+
+def unstable_apps():
+
+    raw_app_installed = app_list(installed=True, raw=True)
+    output = []
+
+    for app, infos in raw_app_installed.items():
+
+        repo = infos.get("repository", None)
+        state = infos.get("state", None)
+
+        if repo is None or state in ["inprogress", "notworking"]:
+            output.append(app)
+
+    return output
+
+
+def _patch_php5(app_folder):
+
+    files_to_patch = []
+    files_to_patch.extend(glob.glob("%s/conf/*" % app_folder))
+    files_to_patch.extend(glob.glob("%s/scripts/*" % app_folder))
+    files_to_patch.extend(glob.glob("%s/scripts/.*" % app_folder))
+    files_to_patch.append("%s/manifest.json" % app_folder)
+
+    for filename in files_to_patch:
+
+        # Ignore non-regular files
+        if not os.path.isfile(filename):
+            continue
+
+        c = "sed -i -e 's@/etc/php5@/etc/php/7.0@g' " \
+                   "-e 's@/var/run/php5-fpm@/var/run/php/php7.0-fpm@g' " \
+                   "-e 's@php5@php7.0@g' " \
+                   "%s" % filename
+        os.system(c)

src/yunohost/backup.py

@@ -43,7 +43,7 @@ from moulinette.utils.log import getActionLogger
 from moulinette.utils.filesystem import read_file
 
 from yunohost.app import (
-    app_info, _is_installed, _parse_app_instance_name
+    app_info, _is_installed, _parse_app_instance_name, _patch_php5
 )
 from yunohost.hook import (
     hook_list, hook_info, hook_callback, hook_exec, CUSTOM_HOOK_FOLDER
@@ -578,7 +578,7 @@ class BackupManager():
         if system_targets == []:
             return
 
-        logger.info(m18n.n('backup_running_hooks'))
+        logger.debug(m18n.n('backup_running_hooks'))
 
         # Prepare environnement
         env_dict = self._get_env_var()
@@ -666,7 +666,7 @@ class BackupManager():
         tmp_app_bkp_dir = env_dict["YNH_APP_BACKUP_DIR"]
         settings_dir = os.path.join(self.work_dir, 'apps', app, 'settings')
 
-        logger.info(m18n.n('backup_running_app_script', app=app))
+        logger.debug(m18n.n('backup_running_app_script', app=app))
         try:
             # Prepare backup directory for the app
             filesystem.mkdir(tmp_app_bkp_dir, 0750, True, uid='admin')
@@ -723,9 +723,9 @@ class BackupManager():
         """Apply backup methods"""
 
         for method in self.methods:
-            logger.info(m18n.n('backup_applying_method_' + method.method_name))
+            logger.debug(m18n.n('backup_applying_method_' + method.method_name))
             method.mount_and_backup(self)
-            logger.info(m18n.n('backup_method_' + method.method_name + '_finished'))
+            logger.debug(m18n.n('backup_method_' + method.method_name + '_finished'))
 
     def _compute_backup_size(self):
         """
@@ -1112,11 +1112,58 @@ class RestoreManager():
 
         try:
             self._postinstall_if_needed()
+
+            # Apply dirty patch to redirect php5 file on php7
+            self._patch_backup_csv_file()
+
+
             self._restore_system()
             self._restore_apps()
         finally:
             self.clean()
 
+    def _patch_backup_csv_file(self):
+        """
+        Apply dirty patch to redirect php5 file on php7
+        """
+
+        backup_csv = os.path.join(self.work_dir, 'backup.csv')
+
+        if not os.path.isfile(backup_csv):
+            return
+
+        try:
+            contains_php5 = False
+            with open(backup_csv) as csvfile:
+                reader = csv.DictReader(csvfile, fieldnames=['source', 'dest'])
+                newlines = []
+                for row in reader:
+                    if 'php5' in row['source']:
+                        contains_php5 = True
+                        row['source'] = row['source'].replace('/etc/php5', '/etc/php/7.0') \
+                            .replace('/var/run/php5-fpm', '/var/run/php/php7.0-fpm') \
+                            .replace('php5','php7')
+
+                    newlines.append(row)
+        except (IOError, OSError, csv.Error) as e:
+            raise MoulinetteError(errno.EIO,m18n.n('error_reading_file',
+                                                   file=backup_csv,
+                                                   error=str(e)))
+
+        if not contains_php5:
+            return
+
+        try:
+            with open(backup_csv, 'w') as csvfile:
+                writer = csv.DictWriter(csvfile,
+                                        fieldnames=['source', 'dest'],
+                                        quoting=csv.QUOTE_ALL)
+                for row in newlines:
+                    writer.writerow(row)
+        except (IOError, OSError, csv.Error) as e:
+            logger.warning(m18n.n('backup_php5_to_php7_migration_may_fail',
+                                  error=str(e)))
+
     def _restore_system(self):
         """ Restore user and system parts """
 
@@ -1130,7 +1177,7 @@ class RestoreManager():
         uo = UnitOperation('backup_restore_system')
         uo.start()
 
-        logger.info(m18n.n('restore_running_hooks'))
+        logger.debug(m18n.n('restore_running_hooks'))
 
         env_dict = self._get_env_var()
         uo.extra['env'] = env_dict
@@ -1218,6 +1265,13 @@ class RestoreManager():
         app_settings_in_archive = os.path.join(app_dir_in_archive, 'settings')
         app_scripts_in_archive = os.path.join(app_settings_in_archive, 'scripts')
 
+        # Apply dirty patch to make php5 apps compatible with php7
+        _patch_php5(app_settings_in_archive)
+
+        # Delete _common.sh file in backup
+        common_file = os.path.join(app_backup_in_archive, '_common.sh')
+        filesystem.rm(common_file, force=True)
+
         # Check if the app has a restore script
         app_restore_script_in_archive = os.path.join(app_scripts_in_archive,
                                                     'restore')
@@ -1226,7 +1280,7 @@ class RestoreManager():
             self.targets.set_result("apps", app_instance_name, "Warning")
             return
 
-        logger.info(m18n.n('restore_running_app_script', app=app_instance_name))
+        logger.debug(m18n.n('restore_running_app_script', app=app_instance_name))
         try:
             # Restore app settings
             app_settings_new_path = os.path.join('/etc/yunohost/apps/',
@@ -1346,9 +1400,7 @@ class BackupMethod(object):
     TarBackupMethod
     ---------------
     This method compresses all files to backup in a .tar.gz archive. When
-    restoring, it tries to mount the archive using archivemount/fuse instead
-    of untaring the archive. Some systems don't support fuse (for these,
-    it automatically falls back to untaring the required parts).
+    restoring, it untars the required parts.
 
     CustomBackupMethod
     ------------------
@@ -1612,7 +1664,7 @@ class BackupMethod(object):
                                      m18n.n('backup_unable_to_organize_files'))
 
         # Copy unbinded path
-        logger.info(m18n.n('backup_copying_to_organize_the_archive',
+        logger.debug(m18n.n('backup_copying_to_organize_the_archive',
             size=str(size)))
         for path in paths_needed_to_be_copied:
             dest = os.path.join(self.work_dir, path['dest'])
@@ -1717,8 +1769,7 @@ class CopyBackupMethod(BackupMethod):
 
 class TarBackupMethod(BackupMethod):
     """
-    This class compress all files to backup in archive. To restore it try to
-    mount the archive with archivemount (fuse). Some system don't support fuse.
+    This class compress all files to backup in archive.
     """
 
     def __init__(self, repo=None):
@@ -1790,8 +1841,6 @@ class TarBackupMethod(BackupMethod):
 
         Exceptions:
         backup_archive_open_failed -- Raised if the archive can't be open
-        backup_archive_mount_failed -- Raised if the system don't support
-        archivemount
         """
         super(TarBackupMethod, self).mount(restore_manager)
 
@@ -1806,60 +1855,50 @@ class TarBackupMethod(BackupMethod):
         tar.close()
 
         # Mount the tarball
+        logger.debug(m18n.n("restore_extracting"))
+        tar = tarfile.open(self._archive_file, "r:gz")
+        tar.extract('info.json', path=self.work_dir)
+
         try:
-            ret = subprocess.call(['archivemount', '-o', 'readonly',
-                                   self._archive_file, self.work_dir])
-        except:
-            ret = -1
+            tar.extract('backup.csv', path=self.work_dir)
+        except KeyError:
+            # Old backup archive have no backup.csv file
+            pass
 
-        # If archivemount failed, extract the archive
-        if ret != 0:
-            logger.warning(m18n.n('backup_archive_mount_failed'))
+        # Extract system parts backup
+        conf_extracted = False
 
-            logger.info(m18n.n("restore_extracting"))
-            tar = tarfile.open(self._archive_file, "r:gz")
-            tar.extract('info.json', path=self.work_dir)
+        system_targets = self.manager.targets.list("system", exclude=["Skipped"])
+        apps_targets = self.manager.targets.list("apps", exclude=["Skipped"])
 
-            try:
-                tar.extract('backup.csv', path=self.work_dir)
-            except KeyError:
-                # Old backup archive have no backup.csv file
-                pass
-
-            # Extract system parts backup
-            conf_extracted = False
-
-            system_targets = self.manager.targets.list("system", exclude=["Skipped"])
-            apps_targets = self.manager.targets.list("apps", exclude=["Skipped"])
-
-            for system_part in system_targets:
-                # Caution: conf_ynh_currenthost helpers put its files in
-                # conf/ynh
-                if system_part.startswith("conf_"):
-                    if conf_extracted:
-                        continue
-                    system_part = "conf/"
-                    conf_extracted = True
-                else:
-                    system_part = system_part.replace("_", "/") + "/"
-                subdir_and_files = [
-                    tarinfo for tarinfo in tar.getmembers()
-                    if tarinfo.name.startswith(system_part)
-                ]
-                tar.extractall(members=subdir_and_files, path=self.work_dir)
+        for system_part in system_targets:
+            # Caution: conf_ynh_currenthost helpers put its files in
+            # conf/ynh
+            if system_part.startswith("conf_"):
+                if conf_extracted:
+                    continue
+                system_part = "conf/"
+                conf_extracted = True
+            else:
+                system_part = system_part.replace("_", "/") + "/"
             subdir_and_files = [
                 tarinfo for tarinfo in tar.getmembers()
-                if tarinfo.name.startswith("hooks/restore/")
+                if tarinfo.name.startswith(system_part)
             ]
             tar.extractall(members=subdir_and_files, path=self.work_dir)
+        subdir_and_files = [
+            tarinfo for tarinfo in tar.getmembers()
+            if tarinfo.name.startswith("hooks/restore/")
+        ]
+        tar.extractall(members=subdir_and_files, path=self.work_dir)
 
-            # Extract apps backup
-            for app in apps_targets:
-                subdir_and_files = [
-                    tarinfo for tarinfo in tar.getmembers()
-                    if tarinfo.name.startswith("apps/" + app)
-                ]
-                tar.extractall(members=subdir_and_files, path=self.work_dir)
+        # Extract apps backup
+        for app in apps_targets:
+            subdir_and_files = [
+                tarinfo for tarinfo in tar.getmembers()
+                if tarinfo.name.startswith("apps/" + app)
+            ]
+            tar.extractall(members=subdir_and_files, path=self.work_dir)
 
 
 class BorgBackupMethod(BackupMethod):
@@ -1953,9 +1992,7 @@ class CustomBackupMethod(BackupMethod):
 
 def backup_create(name=None, description=None, methods=[],
                   output_directory=None, no_compress=False,
-                  ignore_system=False, system=[],
-                  ignore_apps=False, apps=[],
-                  ignore_hooks=False, hooks=[]):
+                  system=[], apps=[]):
     """
     Create a backup local archive
 
@@ -1966,12 +2003,7 @@ def backup_create(name=None, description=None, methods=[],
         output_directory -- Output directory for the backup
         no_compress -- Do not create an archive file
         system -- List of system elements to backup
-        ignore_system -- Ignore system elements
         apps -- List of application names to backup
-        ignore_apps -- Do not backup apps
-
-        hooks -- (Deprecated) Renamed to "system"
-        ignore_hooks -- (Deprecated) Renamed to "ignore_system"
     """
 
     # TODO: Add a 'clean' argument to clean output directory
@@ -1980,22 +2012,6 @@ def backup_create(name=None, description=None, methods=[],
     #   Validate / parse arguments                                            #
     ###########################################################################
 
-    # Historical, deprecated options
-    if ignore_hooks is not False:
-        logger.warning("--ignore-hooks is deprecated and will be removed in the"
-                       "future. Please use --ignore-system instead.")
-        ignore_system = ignore_hooks
-
-    if hooks != [] and hooks is not None:
-        logger.warning("--hooks is deprecated and will be removed in the"
-                       "future. Please use --system instead.")
-        system = hooks
-
-    # Validate that there's something to backup
-    if ignore_system and ignore_apps:
-        raise MoulinetteError(errno.EINVAL,
-                              m18n.n('backup_action_required'))
-
     # Validate there is no archive with the same name
     if name and name in backup_list()['archives']:
         raise MoulinetteError(errno.EINVAL,
@@ -2028,14 +2044,9 @@ def backup_create(name=None, description=None, methods=[],
         else:
             methods = ['tar']  # In future, borg will be the default actions
 
-    if ignore_system:
-        system = None
-    elif system is None:
+    # If no --system or --apps given, backup everything
+    if system is None and apps is None:
         system = []
-
-    if ignore_apps:
-        apps = None
-    elif apps is None:
         apps = []
 
     ###########################################################################
@@ -2084,11 +2095,7 @@ def backup_create(name=None, description=None, methods=[],
     }
 
 
-def backup_restore(auth, name,
-                   system=[], ignore_system=False,
-                   apps=[], ignore_apps=False,
-                   hooks=[], ignore_hooks=False,
-                   force=False):
+def backup_restore(auth, name, system=[], apps=[], force=False):
     """
     Restore from a local backup archive
 
@@ -2096,48 +2103,23 @@ def backup_restore(auth, name,
         name -- Name of the local backup archive
         force -- Force restauration on an already installed system
         system -- List of system parts to restore
-        ignore_system -- Do not restore any system parts
         apps -- List of application names to restore
-        ignore_apps -- Do not restore apps
-
-        hooks -- (Deprecated) Renamed to "system"
-        ignore_hooks -- (Deprecated) Renamed to "ignore_system"
     """
 
     ###########################################################################
     #   Validate / parse arguments                                            #
     ###########################################################################
 
-    # Historical, deprecated options
-    if ignore_hooks is not False:
-        logger.warning("--ignore-hooks is deprecated and will be removed in the"
-                       "future. Please use --ignore-system instead.")
-        ignore_system = ignore_hooks
-    if hooks != [] and hooks is not None:
-        logger.warning("--hooks is deprecated and will be removed in the"
-                       "future. Please use --system instead.")
-        system = hooks
-
-    # Validate what to restore
-    if ignore_system and ignore_apps:
-        raise MoulinetteError(errno.EINVAL,
-                              m18n.n('restore_action_required'))
-
-    if ignore_system:
-        system = None
-    elif system is None:
+    # If no --system or --apps given, restore everything
+    if system is None and apps is None:
         system = []
-
-    if ignore_apps:
-        apps = None
-    elif apps is None:
         apps = []
 
     # TODO don't ask this question when restoring apps only and certain system
     # parts
 
     # Check if YunoHost is installed
-    if os.path.isfile('/etc/yunohost/installed') and not ignore_system:
+    if system is not None and os.path.isfile('/etc/yunohost/installed'):
         logger.warning(m18n.n('yunohost_already_installed'))
         if not force:
             try:

src/yunohost/certificate.py

@@ -29,14 +29,11 @@ import shutil
 import pwd
 import grp
 import smtplib
-import requests
 import subprocess
 import dns.resolver
 import glob
 
-from OpenSSL import crypto
 from datetime import datetime
-from requests.exceptions import Timeout
 
 from yunohost.vendor.acme_tiny.acme_tiny import get_crt as sign_certificate
 
@@ -217,7 +214,7 @@ def _certificate_install_selfsigned(domain_list, force=False):
                 raise MoulinetteError(
                     errno.EIO, m18n.n('domain_cert_gen_failed'))
             else:
-                logger.info(out)
+                logger.debug(out)
 
         # Link the CA cert (not sure it's actually needed in practice though,
         # since we append it at the end of crt.pem. For instance for Let's
@@ -307,8 +304,8 @@ def _certificate_install_letsencrypt(auth, domain_list, force=False, no_checks=F
                 m18n.n("certmanager_cert_install_success", domain=domain))
 
             uo.success()
-
         except Exception as e:
+            _display_debug_information(domain)
             msg = "Certificate installation for %s failed !\nException: %s" % (domain, e)
             logger.error(msg)
             uo.error(msg)
@@ -487,7 +484,7 @@ def _configure_for_acme_challenge(auth, domain):
     nginx_conf_file = "%s/000-acmechallenge.conf" % nginx_conf_folder
 
     nginx_configuration = '''
-location '/.well-known/acme-challenge'
+location ^~ '/.well-known/acme-challenge'
 {
         default_type "text/plain";
         alias %s;
@@ -510,11 +507,11 @@ location '/.well-known/acme-challenge'
 
     # Write the conf
     if os.path.exists(nginx_conf_file):
-        logger.info(
+        logger.debug(
             "Nginx configuration file for ACME challenge already exists for domain, skipping.")
         return
 
-    logger.info(
+    logger.debug(
         "Adding Nginx configuration file for Acme challenge for domain %s.", domain)
 
     with open(nginx_conf_file, "w") as f:
@@ -556,7 +553,7 @@ def _fetch_and_enable_new_certificate(domain, staging=False):
     _regen_dnsmasq_if_needed()
 
     # Prepare certificate signing request
-    logger.info(
+    logger.debug(
         "Prepare key and certificate signing request (CSR) for %s...", domain)
 
     domain_key_file = "%s/%s.pem" % (TMP_FOLDER, domain)
@@ -566,7 +563,7 @@ def _fetch_and_enable_new_certificate(domain, staging=False):
     _prepare_certificate_signing_request(domain, domain_key_file, TMP_FOLDER)
 
     # Sign the certificate
-    logger.info("Now using ACME Tiny to sign the certificate...")
+    logger.debug("Now using ACME Tiny to sign the certificate...")
 
     domain_csr_file = "%s/%s.csr" % (TMP_FOLDER, domain)
 
@@ -587,6 +584,7 @@ def _fetch_and_enable_new_certificate(domain, staging=False):
                 'certmanager_hit_rate_limit', domain=domain))
         else:
             logger.error(str(e))
+            _display_debug_information(domain)
             raise MoulinetteError(errno.EINVAL, m18n.n(
                 'certmanager_cert_signing_failed'))
 
@@ -596,13 +594,14 @@ def _fetch_and_enable_new_certificate(domain, staging=False):
         raise MoulinetteError(errno.EINVAL, m18n.n(
             'certmanager_cert_signing_failed'))
 
+    import requests # lazy loading this module for performance reasons
     try:
         intermediate_certificate = requests.get(INTERMEDIATE_CERTIFICATE_URL, timeout=30).text
-    except Timeout as e:
+    except requests.exceptions.Timeout as e:
         raise MoulinetteError(errno.EINVAL, m18n.n('certmanager_couldnt_fetch_intermediate_cert'))
 
     # Now save the key and signed certificate
-    logger.info("Saving the key and signed certificate...")
+    logger.debug("Saving the key and signed certificate...")
 
     # Create corresponding directory
     date_tag = datetime.now().strftime("%Y%m%d.%H%M%S")
@@ -647,6 +646,7 @@ def _fetch_and_enable_new_certificate(domain, staging=False):
 
 
 def _prepare_certificate_signing_request(domain, key_file, output_folder):
+    from OpenSSL import crypto # lazy loading this module for performance reasons
     # Init a request
     csr = crypto.X509Req()
 
@@ -664,7 +664,7 @@ def _prepare_certificate_signing_request(domain, key_file, output_folder):
 
     # Save the request in tmp folder
     csr_file = output_folder + domain + ".csr"
-    logger.info("Saving to %s.", csr_file)
+    logger.debug("Saving to %s.", csr_file)
 
     with open(csr_file, "w") as f:
         f.write(crypto.dump_certificate_request(crypto.FILETYPE_PEM, csr))
@@ -678,6 +678,7 @@ def _get_status(domain):
         raise MoulinetteError(errno.EINVAL, m18n.n(
             'certmanager_no_cert_file', domain=domain, file=cert_file))
 
+    from OpenSSL import crypto # lazy loading this module for performance reasons
     try:
         cert = crypto.load_certificate(
             crypto.FILETYPE_PEM, open(cert_file).read())
@@ -774,12 +775,13 @@ def _get_status(domain):
 
 
 def _generate_account_key():
-    logger.info("Generating account key ...")
+    logger.debug("Generating account key ...")
     _generate_key(ACCOUNT_KEY_FILE)
     _set_permissions(ACCOUNT_KEY_FILE, "root", "root", 0400)
 
 
 def _generate_key(destination_path):
+    from OpenSSL import crypto # lazy loading this module for performance reasons
     k = crypto.PKey()
     k.generate_key(crypto.TYPE_RSA, KEY_SIZE)
 
@@ -796,7 +798,7 @@ def _set_permissions(path, user, group, permissions):
 
 
 def _enable_certificate(domain, new_cert_folder):
-    logger.info("Enabling the certificate for domain %s ...", domain)
+    logger.debug("Enabling the certificate for domain %s ...", domain)
 
     live_link = os.path.join(CERT_FOLDER, domain)
 
@@ -813,7 +815,7 @@ def _enable_certificate(domain, new_cert_folder):
 
     os.symlink(new_cert_folder, live_link)
 
-    logger.info("Restarting services...")
+    logger.debug("Restarting services...")
 
     for service in ("postfix", "dovecot", "metronome"):
         _run_service_command("restart", service)
@@ -822,7 +824,7 @@ def _enable_certificate(domain, new_cert_folder):
 
 
 def _backup_current_cert(domain):
-    logger.info("Backuping existing certificate for domain %s", domain)
+    logger.debug("Backuping existing certificate for domain %s", domain)
 
     cert_folder_domain = os.path.join(CERT_FOLDER, domain)
 
@@ -846,7 +848,7 @@ def _check_domain_is_ready_for_ACME(domain):
             'certmanager_domain_http_not_working', domain=domain))
 
 
-def _dns_ip_match_public_ip(public_ip, domain):
+def _get_dns_ip(domain):
     try:
         resolver = dns.resolver.Resolver()
         resolver.nameservers = DNS_RESOLVERS
@@ -855,15 +857,18 @@ def _dns_ip_match_public_ip(public_ip, domain):
         raise MoulinetteError(errno.EINVAL, m18n.n(
             'certmanager_error_no_A_record', domain=domain))
 
-    dns_ip = str(answers[0])
+    return str(answers[0])
 
-    return dns_ip == public_ip
+
+def _dns_ip_match_public_ip(public_ip, domain):
+    return _get_dns_ip(domain) == public_ip
 
 
 def _domain_is_accessible_through_HTTP(ip, domain):
+    import requests # lazy loading this module for performance reasons
     try:
         requests.head("http://" + ip, headers={"Host": domain}, timeout=10)
-    except Timeout as e:
+    except requests.exceptions.Timeout as e:
         logger.warning(m18n.n('certmanager_http_check_timeout', domain=domain, ip=ip))
         return False
     except Exception as e:
@@ -873,6 +878,30 @@ def _domain_is_accessible_through_HTTP(ip, domain):
     return True
 
 
+def _get_local_dns_ip(domain):
+    try:
+        resolver = dns.resolver.Resolver()
+        answers = resolver.query(domain, "A")
+    except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN):
+        logger.warning("Failed to resolved domain '%s' locally", domain)
+        return None
+
+    return str(answers[0])
+
+
+def _display_debug_information(domain):
+    dns_ip = _get_dns_ip(domain)
+    public_ip = get_public_ip()
+    local_dns_ip = _get_local_dns_ip(domain)
+
+    logger.warning("""\
+Debug information:
+ - domain ip from DNS        %s
+ - domain ip from local DNS  %s
+ - public ip of the server   %s
+""", dns_ip, local_dns_ip, public_ip)
+
+
 # FIXME / TODO : ideally this should not be needed. There should be a proper
 # mechanism to regularly check the value of the public IP and trigger
 # corresponding hooks (e.g. dyndns update and dnsmasq regen-conf)

src/yunohost/data_migrations/0002_migrate_to_tsig_sha256.py

@@ -30,10 +30,10 @@ class MyMigration(Migration):
                 (domain, private_key_path) = _guess_current_dyndns_domain(dyn_host)
                 assert "+157" in private_key_path
             except (MoulinetteError, AssertionError):
-                logger.warning(m18n.n("migrate_tsig_not_needed"))
+                logger.info(m18n.n("migrate_tsig_not_needed"))
                 return
 
-        logger.warning(m18n.n('migrate_tsig_start', domain=domain))
+        logger.info(m18n.n('migrate_tsig_start', domain=domain))
         public_key_path = private_key_path.rsplit(".private", 1)[0] + ".key"
         public_key_md5 = open(public_key_path).read().strip().split(' ')[-1]
 
@@ -77,15 +77,15 @@ class MyMigration(Migration):
         os.system("mv /etc/yunohost/dyndns/*+157* /tmp")
 
         # sleep to wait for dyndns cache invalidation
-        logger.warning(m18n.n('migrate_tsig_wait'))
+        logger.info(m18n.n('migrate_tsig_wait'))
         time.sleep(60)
-        logger.warning(m18n.n('migrate_tsig_wait_2'))
+        logger.info(m18n.n('migrate_tsig_wait_2'))
         time.sleep(60)
-        logger.warning(m18n.n('migrate_tsig_wait_3'))
+        logger.info(m18n.n('migrate_tsig_wait_3'))
         time.sleep(30)
-        logger.warning(m18n.n('migrate_tsig_wait_4'))
+        logger.info(m18n.n('migrate_tsig_wait_4'))
         time.sleep(30)
 
-        logger.warning(m18n.n('migrate_tsig_end'))
+        logger.info(m18n.n('migrate_tsig_end'))
         return
 

src/yunohost/data_migrations/0003_migrate_to_stretch.py

@@ -0,0 +1,382 @@
+import glob
+import os
+from shutil import copy2
+
+from moulinette import m18n, msettings
+from moulinette.core import MoulinetteError
+from moulinette.utils.log import getActionLogger
+from moulinette.utils.process import check_output, call_async_output
+from moulinette.utils.filesystem import read_file
+
+from yunohost.tools import Migration
+from yunohost.app import unstable_apps
+from yunohost.service import (_run_service_command,
+                              manually_modified_files,
+                              manually_modified_files_compared_to_debian_default)
+from yunohost.utils.filesystem import free_space_in_directory
+from yunohost.utils.packages import get_installed_version
+from yunohost.utils.network import get_network_interfaces
+from yunohost.firewall import firewall_allow, firewall_disallow
+
+logger = getActionLogger('yunohost.migration')
+
+YUNOHOST_PACKAGES = ["yunohost", "yunohost-admin", "moulinette", "ssowat"]
+
+
+class MyMigration(Migration):
+    "Upgrade the system to Debian Stretch and Yunohost 3.0"
+
+    mode = "manual"
+
+    def backward(self):
+
+        raise MoulinetteError(m18n.n("migration_0003_backward_impossible"))
+
+    def migrate(self):
+
+        self.logfile = "/tmp/{}.log".format(self.name)
+
+        self.check_assertions()
+
+        logger.info(m18n.n("migration_0003_start", logfile=self.logfile))
+
+        # Preparing the upgrade
+        self.restore_original_nginx_conf_if_needed()
+
+        logger.info(m18n.n("migration_0003_patching_sources_list"))
+        self.patch_apt_sources_list()
+        self.backup_files_to_keep()
+        self.apt_update()
+        apps_packages = self.get_apps_equivs_packages()
+        self.unhold(["metronome"])
+        self.hold(YUNOHOST_PACKAGES + apps_packages + ["fail2ban"])
+
+        # Main dist-upgrade
+        logger.info(m18n.n("migration_0003_main_upgrade"))
+        _run_service_command("stop", "mysql")
+        self.apt_dist_upgrade(conf_flags=["old", "miss", "def"])
+        _run_service_command("start", "mysql")
+        if self.debian_major_version() == 8:
+            raise MoulinetteError(m18n.n("migration_0003_still_on_jessie_after_main_upgrade", log=self.logfile))
+
+        # Specific upgrade for fail2ban...
+        logger.info(m18n.n("migration_0003_fail2ban_upgrade"))
+        self.unhold(["fail2ban"])
+        # Don't move this if folder already exists. If it does, we probably are
+        # running this script a 2nd, 3rd, ... time but /etc/fail2ban will
+        # be re-created only for the first dist-upgrade of fail2ban
+        if not os.path.exists("/etc/fail2ban.old"):
+            os.system("mv /etc/fail2ban /etc/fail2ban.old")
+        self.apt_dist_upgrade(conf_flags=["new", "miss", "def"])
+        _run_service_command("restart", "fail2ban")
+
+        self.disable_predicable_interface_names()
+
+        # Clean the mess
+        os.system("apt autoremove --assume-yes")
+        os.system("apt clean --assume-yes")
+
+        # We moved to port 587 for SMTP
+        # https://busylog.net/smtp-tls-ssl-25-465-587/
+        firewall_allow("Both", 587)
+        firewall_disallow("Both", 465)
+
+        # Upgrade yunohost packages
+        logger.info(m18n.n("migration_0003_yunohost_upgrade"))
+        self.restore_files_to_keep()
+        self.unhold(YUNOHOST_PACKAGES + apps_packages)
+        self.upgrade_yunohost_packages()
+
+    def debian_major_version(self):
+        # The python module "platform" and lsb_release are not reliable because
+        # on some setup, they still return Release=8 even after upgrading to
+        # stretch ... (Apparently this is related to OVH overriding some stuff
+        # with /etc/lsb-release for instance -_-)
+        # Instead, we rely on /etc/os-release which should be the raw info from
+        # the distribution...
+        return int(check_output("grep VERSION_ID /etc/os-release | tr '\"' ' ' | cut -d ' ' -f2"))
+
+    def yunohost_major_version(self):
+        return int(get_installed_version("yunohost").split('.')[0])
+
+    def check_assertions(self):
+
+        # Be on jessie (8.x) and yunohost 2.x
+        # NB : we do both check to cover situations where the upgrade crashed
+        # in the middle and debian version could be >= 9.x but yunohost package
+        # would still be in 2.x...
+        if not self.debian_major_version() == 8 \
+           and not self.yunohost_major_version() == 2:
+            raise MoulinetteError(m18n.n("migration_0003_not_jessie"))
+
+        # Have > 1 Go free space on /var/ ?
+        if free_space_in_directory("/var/") / (1024**3) < 1.0:
+            raise MoulinetteError(m18n.n("migration_0003_not_enough_free_space"))
+
+        # Check system is up to date
+        # (but we don't if 'stretch' is already in the sources.list ...
+        # which means maybe a previous upgrade crashed and we're re-running it)
+        if " stretch " not in read_file("/etc/apt/sources.list"):
+            self.apt_update()
+            apt_list_upgradable = check_output("apt list --upgradable -a")
+            if "upgradable" in apt_list_upgradable:
+                raise MoulinetteError(m18n.n("migration_0003_system_not_fully_up_to_date"))
+
+    @property
+    def disclaimer(self):
+
+        # Avoid having a super long disclaimer + uncessary check if we ain't
+        # on jessie / yunohost 2.x anymore
+        # NB : we do both check to cover situations where the upgrade crashed
+        # in the middle and debian version could be >= 9.x but yunohost package
+        # would still be in 2.x...
+        if not self.debian_major_version() == 8 \
+           and not self.yunohost_major_version() == 2:
+            return None
+
+        # Get list of problematic apps ? I.e. not official or community+working
+        problematic_apps = unstable_apps()
+        problematic_apps = "".join(["\n    - " + app for app in problematic_apps])
+
+        # Manually modified files ? (c.f. yunohost service regen-conf)
+        modified_files = manually_modified_files()
+        # We also have a specific check for nginx.conf which some people
+        # modified and needs to be upgraded...
+        if "/etc/nginx/nginx.conf" in manually_modified_files_compared_to_debian_default():
+            modified_files.append("/etc/nginx/nginx.conf")
+        modified_files = "".join(["\n    - " + f for f in modified_files])
+
+        message = m18n.n("migration_0003_general_warning")
+
+        if problematic_apps:
+            message += "\n\n" + m18n.n("migration_0003_problematic_apps_warning", problematic_apps=problematic_apps)
+
+        if modified_files:
+            message += "\n\n" + m18n.n("migration_0003_modified_files", manually_modified_files=modified_files)
+
+        return message
+
+    def patch_apt_sources_list(self):
+
+        sources_list = glob.glob("/etc/apt/sources.list.d/*.list")
+        sources_list.append("/etc/apt/sources.list")
+
+        # This :
+        # - replace single 'jessie' occurence by 'stretch'
+        # - comments lines containing "backports"
+        # - replace 'jessie/updates' by 'strech/updates' (or same with a -)
+        # - switch yunohost's repo to forge
+        for f in sources_list:
+            command = "sed -i -e 's@ jessie @ stretch @g' " \
+                             "-e '/backports/ s@^#*@#@' " \
+                             "-e 's@ jessie/updates @ stretch/updates @g' " \
+                             "-e 's@ jessie-updates @ stretch-updates @g' " \
+                             "-e 's@repo.yunohost@forge.yunohost@g' " \
+                             "{}".format(f)
+            os.system(command)
+
+    def get_apps_equivs_packages(self):
+
+        command = "dpkg --get-selections" \
+                  " | grep -v deinstall" \
+                  " | awk '{print $1}'" \
+                  " | { grep 'ynh-deps$' || true; }"
+
+        output = check_output(command).strip()
+
+        return output.split('\n') if output else []
+
+    def hold(self, packages):
+        for package in packages:
+            os.system("apt-mark hold {}".format(package))
+
+    def unhold(self, packages):
+        for package in packages:
+            os.system("apt-mark unhold {}".format(package))
+
+    def apt_update(self):
+
+        command = "apt-get update"
+        logger.debug("Running apt command :\n{}".format(command))
+        command += " 2>&1 | tee -a {}".format(self.logfile)
+
+        os.system(command)
+
+    def upgrade_yunohost_packages(self):
+
+        #
+        # Here we use a dirty hack to run a command after the current
+        # "yunohost tools migrations migrate", because the upgrade of
+        # yunohost will also trigger another "yunohost tools migrations migrate"
+        # (also the upgrade of the package, if executed from the webadmin, is
+        # likely to kill/restart the api which is in turn likely to kill this
+        # command before it ends...)
+        #
+
+        MOULINETTE_LOCK = "/var/run/moulinette_yunohost.lock"
+
+        upgrade_command = ""
+        upgrade_command += " DEBIAN_FRONTEND=noninteractive"
+        upgrade_command += " APT_LISTCHANGES_FRONTEND=none"
+        upgrade_command += " apt-get install"
+        upgrade_command += " --assume-yes "
+        upgrade_command += " ".join(YUNOHOST_PACKAGES)
+        # We also install php-zip and php7.0-acpu to fix an issue with
+        # nextcloud and kanboard that need it when on stretch.
+        upgrade_command += " php-zip php7.0-apcu"
+        upgrade_command += " 2>&1 | tee -a {}".format(self.logfile)
+
+        wait_until_end_of_yunohost_command = "(while [ -f {} ]; do sleep 2; done)".format(MOULINETTE_LOCK)
+
+        command = "({} && {}; echo 'Migration complete!') &".format(wait_until_end_of_yunohost_command,
+                                                                    upgrade_command)
+
+        logger.debug("Running command :\n{}".format(command))
+
+        os.system(command)
+
+    def apt_dist_upgrade(self, conf_flags):
+
+        # Make apt-get happy
+        os.system("echo 'libc6 libraries/restart-without-asking boolean true' | debconf-set-selections")
+        # Don't send an email to root about the postgresql migration. It should be handled automatically after.
+        os.system("echo 'postgresql-common postgresql-common/obsolete-major seen true' | debconf-set-selections")
+
+        command = ""
+        command += " DEBIAN_FRONTEND=noninteractive"
+        command += " APT_LISTCHANGES_FRONTEND=none"
+        command += " apt-get"
+        command += " --fix-broken --show-upgraded --assume-yes"
+        for conf_flag in conf_flags:
+            command += ' -o Dpkg::Options::="--force-conf{}"'.format(conf_flag)
+        command += " dist-upgrade"
+
+        logger.debug("Running apt command :\n{}".format(command))
+
+        command += " 2>&1 | tee -a {}".format(self.logfile)
+
+        is_api = msettings.get('interface') == 'api'
+        if is_api:
+            callbacks = (
+                lambda l: logger.info(l.rstrip()),
+                lambda l: logger.warning(l.rstrip()),
+            )
+            call_async_output(command, callbacks, shell=True)
+        else:
+            # We do this when running from the cli to have the output of the
+            # command showing in the terminal, since 'info' channel is only
+            # enabled if the user explicitly add --verbose ...
+            os.system(command)
+
+    # Those are files that should be kept and restored before the final switch
+    # to yunohost 3.x... They end up being modified by the various dist-upgrades
+    # (or need to be taken out momentarily), which then blocks the regen-conf
+    # as they are flagged as "manually modified"...
+    files_to_keep = [
+        "/etc/mysql/my.cnf",
+        "/etc/nslcd.conf",
+        "/etc/postfix/master.cf",
+        "/etc/fail2ban/filter.d/yunohost.conf"
+    ]
+
+    def backup_files_to_keep(self):
+
+        logger.debug("Backuping specific files to keep ...")
+
+        # Create tmp directory if it does not exists
+        tmp_dir = os.path.join("/tmp/", self.name)
+        if not os.path.exists(tmp_dir):
+            os.mkdir(tmp_dir, 0700)
+
+        for f in self.files_to_keep:
+            dest_file = f.strip('/').replace("/", "_")
+
+            # If the file is already there, we might be re-running the migration
+            # because it previously crashed. Hence we keep the existing file.
+            if os.path.exists(os.path.join(tmp_dir, dest_file)):
+                continue
+
+            copy2(f, os.path.join(tmp_dir, dest_file))
+
+    def restore_files_to_keep(self):
+
+        logger.debug("Restoring specific files to keep ...")
+
+        tmp_dir = os.path.join("/tmp/", self.name)
+
+        for f in self.files_to_keep:
+            dest_file = f.strip('/').replace("/", "_")
+            copy2(os.path.join(tmp_dir, dest_file), f)
+
+    # On some setups, /etc/nginx/nginx.conf got edited. But this file needs
+    # to be upgraded because of the way the new module system works for nginx.
+    # (in particular, having the line that include the modules at the top)
+    #
+    # So here, if it got edited, we force the restore of the original conf
+    # *before* starting the actual upgrade...
+    #
+    # An alternative strategy that was attempted was to hold the nginx-common
+    # package and have a specific upgrade for it like for fail2ban, but that
+    # leads to apt complaining about not being able to upgrade for shitty
+    # reasons >.>
+    def restore_original_nginx_conf_if_needed(self):
+        if "/etc/nginx/nginx.conf" not in manually_modified_files_compared_to_debian_default():
+            return
+
+        if not os.path.exists("/etc/nginx/nginx.conf"):
+            return
+
+        # If stretch is in the sources.list, we already started migrating on
+        # stretch so we don't re-do this
+        if " stretch " in read_file("/etc/apt/sources.list"):
+            return
+
+        backup_dest = "/home/yunohost.conf/backup/nginx.conf.bkp_before_stretch"
+
+        logger.warning(m18n.n("migration_0003_restoring_origin_nginx_conf",
+                              backup_dest=backup_dest))
+
+        os.system("mv /etc/nginx/nginx.conf %s" % backup_dest)
+
+        command = ""
+        command += " DEBIAN_FRONTEND=noninteractive"
+        command += " APT_LISTCHANGES_FRONTEND=none"
+        command += " apt-get"
+        command += " --fix-broken --show-upgraded --assume-yes"
+        command += ' -o Dpkg::Options::="--force-confmiss"'
+        command += " install --reinstall"
+        command += " nginx-common"
+
+        logger.debug("Running apt command :\n{}".format(command))
+
+        command += " 2>&1 | tee -a {}".format(self.logfile)
+
+        is_api = msettings.get('interface') == 'api'
+        if is_api:
+            callbacks = (
+                lambda l: logger.info(l.rstrip()),
+                lambda l: logger.warning(l.rstrip()),
+            )
+            call_async_output(command, callbacks, shell=True)
+        else:
+            # We do this when running from the cli to have the output of the
+            # command showing in the terminal, since 'info' channel is only
+            # enabled if the user explicitly add --verbose ...
+            os.system(command)
+
+    def disable_predicable_interface_names(self):
+
+        # Try to see if currently used interface names are predictable ones or not...
+        # If we ain't using "eth0" or "wlan0", assume we are using predictable interface
+        # names and therefore they shouldnt be disabled
+        network_interfaces = get_network_interfaces().keys()
+        if "eth0" not in network_interfaces and "wlan0" not in network_interfaces:
+            return
+
+        interfaces_config = read_file("/etc/network/interfaces")
+        if "eth0" not in interfaces_config and "wlan0" not in interfaces_config:
+            return
+
+        # Disable predictive interface names
+        # c.f. https://unix.stackexchange.com/a/338730
+        os.system("ln -s /dev/null /etc/systemd/network/99-default.link")

src/yunohost/data_migrations/0004_php5_to_php7_pools.py

@@ -0,0 +1,97 @@
+import os
+import glob
+from shutil import copy2
+
+from moulinette.utils.log import getActionLogger
+
+from yunohost.tools import Migration
+from yunohost.service import _run_service_command
+
+logger = getActionLogger('yunohost.migration')
+
+PHP5_POOLS = "/etc/php5/fpm/pool.d"
+PHP7_POOLS = "/etc/php/7.0/fpm/pool.d"
+
+PHP5_SOCKETS_PREFIX = "/var/run/php5-fpm"
+PHP7_SOCKETS_PREFIX = "/run/php/php7.0-fpm"
+
+MIGRATION_COMMENT = "; YunoHost note : this file was automatically moved from {}".format(PHP5_POOLS)
+
+
+class MyMigration(Migration):
+    "Migrate php5-fpm 'pool' conf files to php7 stuff"
+
+    def migrate(self):
+
+        # Get list of php5 pool files
+        php5_pool_files = glob.glob("{}/*.conf".format(PHP5_POOLS))
+
+        # Keep only basenames
+        php5_pool_files = [os.path.basename(f) for f in php5_pool_files]
+
+        # Ignore the "www.conf" (default stuff, probably don't want to touch it ?)
+        php5_pool_files = [f for f in php5_pool_files if f != "www.conf"]
+
+        for f in php5_pool_files:
+
+            # Copy the files to the php7 pool
+            src = "{}/{}".format(PHP5_POOLS, f)
+            dest = "{}/{}".format(PHP7_POOLS, f)
+            copy2(src, dest)
+
+            # Replace the socket prefix if it's found
+            c = "sed -i -e 's@{}@{}@g' {}".format(PHP5_SOCKETS_PREFIX, PHP7_SOCKETS_PREFIX, dest)
+            os.system(c)
+
+            # Also add a comment that it was automatically moved from php5
+            # (for human traceability and backward migration)
+            c = "sed -i '1i {}' {}".format(MIGRATION_COMMENT, dest)
+            os.system(c)
+
+            # Some old comments starting with '#' instead of ';' are not
+            # compatible in php7
+            c = "sed -i 's/^#/;#/g' {}".format(dest)
+            os.system(c)
+
+        # Reload/restart the php pools
+        _run_service_command("restart", "php7.0-fpm")
+        _run_service_command("enable", "php7.0-fpm")
+        os.system("systemctl stop php5-fpm")
+        os.system("systemctl disable php5-fpm")
+        os.system("rm /etc/logrotate.d/php5-fpm") # We remove this otherwise the logrotate cron will be unhappy
+
+        # Get list of nginx conf file
+        nginx_conf_files = glob.glob("/etc/nginx/conf.d/*.d/*.conf")
+        for f in nginx_conf_files:
+            # Replace the socket prefix if it's found
+            c = "sed -i -e 's@{}@{}@g' {}".format(PHP5_SOCKETS_PREFIX, PHP7_SOCKETS_PREFIX, f)
+            os.system(c)
+
+        # Reload nginx
+        _run_service_command("reload", "nginx")
+
+    def backward(self):
+
+        # Get list of php7 pool files
+        php7_pool_files = glob.glob("{}/*.conf".format(PHP7_POOLS))
+
+        # Keep only files which have the migration comment
+        php7_pool_files = [f for f in php7_pool_files if open(f).readline().strip() == MIGRATION_COMMENT]
+
+        # Delete those files
+        for f in php7_pool_files:
+            os.remove(f)
+
+        # Reload/restart the php pools
+        _run_service_command("stop", "php7.0-fpm")
+        os.system("systemctl start php5-fpm")
+
+        # Get list of nginx conf file
+        nginx_conf_files = glob.glob("/etc/nginx/conf.d/*.d/*.conf")
+        for f in nginx_conf_files:
+            # Replace the socket prefix if it's found
+            c = "sed -i -e 's@{}@{}@g' {}".format(PHP7_SOCKETS_PREFIX, PHP5_SOCKETS_PREFIX, f)
+            os.system(c)
+
+        # Reload nginx
+        _run_service_command("reload", "nginx")

src/yunohost/data_migrations/0005_postgresql_9p4_to_9p6.py

@@ -0,0 +1,42 @@
+import subprocess
+
+from moulinette import m18n
+from moulinette.core import MoulinetteError
+from moulinette.utils.log import getActionLogger
+
+from yunohost.tools import Migration
+from yunohost.utils.filesystem import free_space_in_directory, space_used_by_directory
+
+logger = getActionLogger('yunohost.migration')
+
+
+class MyMigration(Migration):
+    "Migrate DBs from Postgresql 9.4 to 9.6 after migrating to Stretch"
+
+    def migrate(self):
+
+        if not self.package_is_installed("postgresql-9.4"):
+            logger.warning(m18n.n("migration_0005_postgresql_94_not_installed"))
+            return
+
+        if not self.package_is_installed("postgresql-9.6"):
+            raise MoulinetteError(m18n.n("migration_0005_postgresql_96_not_installed"))
+
+        if not space_used_by_directory("/var/lib/postgresql/9.4") > free_space_in_directory("/var/lib/postgresql"):
+            raise MoulinetteError(m18n.n("migration_0005_not_enough_space", path="/var/lib/postgresql/"))
+
+        subprocess.check_call("service postgresql stop", shell=True)
+        subprocess.check_call("pg_dropcluster --stop 9.6 main", shell=True)
+        subprocess.check_call("pg_upgradecluster -m upgrade 9.4 main", shell=True)
+        subprocess.check_call("pg_dropcluster --stop 9.4 main", shell=True)
+        subprocess.check_call("service postgresql start", shell=True)
+
+    def backward(self):
+
+        pass
+
+    def package_is_installed(self, package_name):
+
+        p = subprocess.Popen("dpkg --list | grep -q -w {}".format(package_name), shell=True)
+        p.communicate()
+        return p.returncode == 0

src/yunohost/domain.py

@@ -28,7 +28,6 @@ import re
 import json
 import yaml
 import errno
-import requests
 
 from moulinette import m18n, msettings
 from moulinette.core import MoulinetteError
@@ -209,7 +208,7 @@ def domain_dns_conf(domain, ttl=None):
 
     is_cli = True if msettings.get('interface') == 'cli' else False
     if is_cli:
-        logger.warning(m18n.n("domain_dns_conf_is_just_a_recommendation"))
+        logger.info(m18n.n("domain_dns_conf_is_just_a_recommendation"))
 
     return result
 
@@ -391,17 +390,54 @@ def _get_DKIM(domain):
     with open(DKIM_file) as f:
         dkim_content = f.read()
 
-    dkim = re.match((
-        r'^(?P<host>[a-z_\-\.]+)[\s]+([0-9]+[\s]+)?IN[\s]+TXT[\s]+[^"]*'
-        '(?=.*(;[\s]*|")v=(?P<v>[^";]+))'
-        '(?=.*(;[\s]*|")k=(?P<k>[^";]+))'
-        '(?=.*(;[\s]*|")p=(?P<p>[^";]+))'), dkim_content, re.M | re.S
-    )
+    # Gotta manage two formats :
+    #
+    # Legacy
+    # -----
+    #
+    # mail._domainkey IN      TXT     ( "v=DKIM1; k=rsa; "
+    #           "p=<theDKIMpublicKey>" )
+    #
+    # New
+    # ------
+    #
+    # mail._domainkey IN  TXT ( "v=DKIM1; h=sha256; k=rsa; "
+    #           "p=<theDKIMpublicKey>" )
+
+    is_legacy_format = " h=sha256; " not in dkim_content
+
+    # Legacy DKIM format
+    if is_legacy_format:
+        dkim = re.match((
+            r'^(?P<host>[a-z_\-\.]+)[\s]+([0-9]+[\s]+)?IN[\s]+TXT[\s]+'
+             '[^"]*"v=(?P<v>[^";]+);'
+             '[\s"]*k=(?P<k>[^";]+);'
+             '[\s"]*p=(?P<p>[^";]+)'), dkim_content, re.M | re.S
+        )
+    else:
+        dkim = re.match((
+            r'^(?P<host>[a-z_\-\.]+)[\s]+([0-9]+[\s]+)?IN[\s]+TXT[\s]+'
+             '[^"]*"v=(?P<v>[^";]+);'
+             '[\s"]*h=(?P<h>[^";]+);'
+             '[\s"]*k=(?P<k>[^";]+);'
+             '[\s"]*p=(?P<p>[^";]+)'), dkim_content, re.M | re.S
+        )
 
     if not dkim:
         return (None, None)
 
-    return (
-        dkim.group('host'),
-        '"v={v}; k={k}; p={p}"'.format(v=dkim.group('v'), k=dkim.group('k'), p=dkim.group('p'))
-    )
+    if is_legacy_format:
+        return (
+            dkim.group('host'),
+            '"v={v}; k={k}; p={p}"'.format(v=dkim.group('v'),
+                                           k=dkim.group('k'),
+                                           p=dkim.group('p'))
+        )
+    else:
+        return (
+            dkim.group('host'),
+            '"v={v}; h={h}; k={k}; p={p}"'.format(v=dkim.group('v'),
+                                                  h=dkim.group('h'),
+                                                  k=dkim.group('k'),
+                                                  p=dkim.group('p'))
+        )

src/yunohost/dyndns.py

@@ -30,7 +30,6 @@ import glob
 import time
 import base64
 import errno
-import requests
 import subprocess
 
 from moulinette import m18n
@@ -146,7 +145,7 @@ def dyndns_subscribe(uo, subscribe_host="dyndns.yunohost.org", domain=None, key=
             if not os.path.exists('/etc/yunohost/dyndns'):
                 os.makedirs('/etc/yunohost/dyndns')
 
-            logger.info(m18n.n('dyndns_key_generating'))
+            logger.debug(m18n.n('dyndns_key_generating'))
 
             os.system('cd /etc/yunohost/dyndns && '
                       'dnssec-keygen -a hmac-sha512 -b 512 -r /dev/urandom -n USER %s' % domain)
@@ -156,6 +155,7 @@ def dyndns_subscribe(uo, subscribe_host="dyndns.yunohost.org", domain=None, key=
         with open(key_file) as f:
             key = f.readline().strip().split(' ', 6)[-1]
 
+    import requests # lazy loading this module for performance reasons
     # Send subscription
     try:
         r = requests.post('https://%s/key/%s?key_algo=hmac-sha512' % (subscribe_host, base64.b64encode(key)), data={'subdomain': domain}, timeout=30)
@@ -165,7 +165,7 @@ def dyndns_subscribe(uo, subscribe_host="dyndns.yunohost.org", domain=None, key=
         try:
             error = json.loads(r.text)['error']
         except:
-            error = "Server error"
+            error = "Server error, code: %s. (Message: \"%s\")" % (r.status_code, r.text)
         raise MoulinetteError(errno.EPERM,
                               m18n.n('dyndns_registration_failed', error=error))
 
@@ -243,10 +243,13 @@ def dyndns_update(uo, dyn_host="dyndns.yunohost.org", domain=None, key=None,
         from yunohost.tools import _get_migration_by_name
         migration = _get_migration_by_name("migrate_to_tsig_sha256")
         try:
-            migration["module"].MyMigration().migrate(dyn_host, domain, key)
+            migration.migrate(dyn_host, domain, key)
         except Exception as e:
-            logger.error(m18n.n('migrations_migration_has_failed', exception=e, **migration), exc_info=1)
-
+            logger.error(m18n.n('migrations_migration_has_failed',
+                                exception=e,
+                                number=migration.number,
+                                name=migration.name),
+                                exc_info=1)
         return
 
     # Extract 'host', e.g. 'nohost.me' from 'foo.nohost.me'
@@ -281,6 +284,7 @@ def dyndns_update(uo, dyn_host="dyndns.yunohost.org", domain=None, key=None,
             # should be muc.the.domain.tld. or the.domain.tld
             if record["value"] == "@":
                 record["value"] = domain
+            record["value"] = record["value"].replace(";","\;")
 
             action = "update add {name}.{domain}. {ttl} {type} {value}".format(domain=domain, **record)
             action = action.replace(" @.", " ")
@@ -295,7 +299,7 @@ def dyndns_update(uo, dyn_host="dyndns.yunohost.org", domain=None, key=None,
     # to nsupdate as argument
     write_to_file(DYNDNS_ZONE, '\n'.join(lines))
 
-    logger.info("Now pushing new conf to DynDNS host...")
+    logger.debug("Now pushing new conf to DynDNS host...")
 
     try:
         command = ["/usr/bin/nsupdate", "-k", key, DYNDNS_ZONE]

src/yunohost/firewall.py

@@ -305,7 +305,7 @@ def firewall_upnp(action='status', no_refresh=False):
 
     # Compatibility with previous version
     if action == 'reload':
-        logger.info("'reload' action is deprecated and will be removed")
+        logger.debug("'reload' action is deprecated and will be removed")
         try:
             # Remove old cron job
             os.remove('/etc/cron.d/yunohost-firewall')
@@ -357,7 +357,7 @@ def firewall_upnp(action='status', no_refresh=False):
                 # Select UPnP device
                 upnpc.selectigd()
             except:
-                logger.info('unable to select UPnP device', exc_info=1)
+                logger.debug('unable to select UPnP device', exc_info=1)
                 enabled = False
             else:
                 # Iterate over ports
@@ -376,7 +376,7 @@ def firewall_upnp(action='status', no_refresh=False):
                             upnpc.addportmapping(port, protocol, upnpc.lanaddr,
                                 port, 'yunohost firewall: port %d' % port, '')
                         except:
-                            logger.info('unable to add port %d using UPnP',
+                            logger.debug('unable to add port %d using UPnP',
                                         port, exc_info=1)
                             enabled = False
 
@@ -459,6 +459,6 @@ def _update_firewall_file(rules):
 def _on_rule_command_error(returncode, cmd, output):
     """Callback for rules commands error"""
     # Log error and continue commands execution
-    logger.info('"%s" returned non-zero exit status %d:\n%s',
-                cmd, returncode, prependlines(output.rstrip(), '> '))
+    logger.debug('"%s" returned non-zero exit status %d:\n%s',
+                 cmd, returncode, prependlines(output.rstrip(), '> '))
     return True

src/yunohost/hook.py

@@ -355,13 +355,13 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False,
     command.append(cmd.format(script=cmd_script, args=cmd_args))
 
     if logger.isEnabledFor(log.DEBUG):
-        logger.info(m18n.n('executing_command', command=' '.join(command)))
+        logger.debug(m18n.n('executing_command', command=' '.join(command)))
     else:
-        logger.info(m18n.n('executing_script', script=path))
+        logger.debug(m18n.n('executing_script', script=path))
 
     # Define output callbacks and call command
     callbacks = (
-        lambda l: logger.info(l.rstrip()),
+        lambda l: logger.debug(l.rstrip()),
         lambda l: logger.warning(l.rstrip()),
     )
     returncode = call_async_output(

src/yunohost/monitor.py

@@ -164,6 +164,7 @@ def monitor_network(units=None, human_readable=False):
         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):
@@ -213,6 +214,7 @@ def monitor_network(units=None, human_readable=False):
         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':

src/yunohost/service.py

@@ -26,12 +26,14 @@
 import os
 import time
 import yaml
-import glob
+import json
 import subprocess
 import errno
 import shutil
 import hashlib
+
 from difflib import unified_diff
+from datetime import datetime
 
 from moulinette import m18n
 from moulinette.core import MoulinetteError
@@ -75,6 +77,7 @@ def service_add(name, status=None, log=None, runlevel=None):
     try:
         _save_services(services)
     except:
+        # we'll get a logger.warning with more details in _save_services
         raise MoulinetteError(errno.EIO, m18n.n('service_add_failed', service=name))
 
     logger.success(m18n.n('service_added', service=name))
@@ -98,6 +101,7 @@ def service_remove(name):
     try:
         _save_services(services)
     except:
+        # we'll get a logger.warning with more details in _save_services
         raise MoulinetteError(errno.EIO, m18n.n('service_remove_failed', service=name))
 
     logger.success(m18n.n('service_removed', service=name))
@@ -113,14 +117,17 @@ def service_start(names):
     """
     if isinstance(names, str):
         names = [names]
+
     for name in names:
         if _run_service_command('start', name):
             logger.success(m18n.n('service_started', service=name))
         else:
             if service_status(name)['status'] != 'running':
                 raise MoulinetteError(errno.EPERM,
-                                      m18n.n('service_start_failed', service=name))
-            logger.info(m18n.n('service_already_started', service=name))
+                                      m18n.n('service_start_failed',
+                                             service=name,
+                                             logs=_get_journalctl_logs(name)))
+            logger.debug(m18n.n('service_already_started', service=name))
 
 
 def service_stop(names):
@@ -139,8 +146,10 @@ def service_stop(names):
         else:
             if service_status(name)['status'] != 'inactive':
                 raise MoulinetteError(errno.EPERM,
-                                      m18n.n('service_stop_failed', service=name))
-            logger.info(m18n.n('service_already_stopped', service=name))
+                                      m18n.n('service_stop_failed',
+                                             service=name,
+                                             logs=_get_journalctl_logs(name)))
+            logger.debug(m18n.n('service_already_stopped', service=name))
 
 @is_unit_operation()
 def service_enable(names):
@@ -158,7 +167,9 @@ def service_enable(names):
             logger.success(m18n.n('service_enabled', service=name))
         else:
             raise MoulinetteError(errno.EPERM,
-                                  m18n.n('service_enable_failed', service=name))
+                                  m18n.n('service_enable_failed',
+                                         service=name,
+                                         logs=_get_journalctl_logs(name)))
 
 
 def service_disable(names):
@@ -176,7 +187,9 @@ def service_disable(names):
             logger.success(m18n.n('service_disabled', service=name))
         else:
             raise MoulinetteError(errno.EPERM,
-                                  m18n.n('service_disable_failed', service=name))
+                                  m18n.n('service_disable_failed',
+                                         service=name,
+                                         logs=_get_journalctl_logs(name)))
 
 
 def service_status(names=[]):
@@ -202,46 +215,91 @@ def service_status(names=[]):
             raise MoulinetteError(errno.EINVAL,
                                   m18n.n('service_unknown', service=name))
 
-        status = None
-        if services[name].get('status') == 'service':
-            status = 'service %s status' % name
-        elif "status" in services[name]:
-            status = str(services[name]['status'])
-        else:
+        # this "service" isn't a service actually so we skip it
+        #
+        # the historical reason is because regenconf has been hacked into the
+        # service part of YunoHost will in some situation we need to regenconf
+        # for things that aren't services
+        # the hack was to add fake services...
+        # we need to extract regenconf from service at some point, also because
+        # some app would really like to use it
+        if "status" in services[name] and services[name]["status"] is None:
             continue
 
-        runlevel = 5
-        if 'runlevel' in services[name].keys():
-            runlevel = int(services[name]['runlevel'])
+        status = _get_service_information_from_systemd(name)
 
-        result[name] = {'status': 'unknown', 'loaded': 'unknown'}
+        # try to get status using alternative version if they exists
+        # this is for mariadb/mysql but is generic in case of
+        alternates = services[name].get("alternates", [])
+        while status is None and alternates:
+            status = _get_service_information_from_systemd(alternates.pop())
+
+        if status is None:
+            logger.error("Failed to get status information via dbus for service %s, systemctl didn't recognize this service ('NoSuchUnit')." % name)
+            result[name] = {
+                'status': "unknown",
+                'loaded': "unknown",
+                'active': "unknown",
+                'active_at': {
+                    "timestamp": "unknown",
+                    "human": "unknown",
+                },
+                'description': "Error: failed to get information for this service, it doesn't exists for systemd",
+                'service_file_path': "unknown",
+            }
 
-        # Retrieve service status
-        try:
-            ret = subprocess.check_output(status, stderr=subprocess.STDOUT,
-                                          shell=True)
-        except subprocess.CalledProcessError as e:
-            if 'usage:' in e.output.lower():
-                logger.warning(m18n.n('service_status_failed', service=name))
-            else:
-                result[name]['status'] = 'inactive'
         else:
-            result[name]['status'] = 'running'
+            translation_key = "service_description_%s" % name
+            description = m18n.n(translation_key)
 
-        # Retrieve service loading
-        rc_path = glob.glob("/etc/rc%d.d/S[0-9][0-9]%s" % (runlevel, name))
-        if len(rc_path) == 1 and os.path.islink(rc_path[0]):
-            result[name]['loaded'] = 'enabled'
-        elif os.path.isfile("/etc/init.d/%s" % name):
-            result[name]['loaded'] = 'disabled'
-        else:
-            result[name]['loaded'] = 'not-found'
+            # that mean that we don't have a translation for this string
+            # that's the only way to test for that for now
+            # if we don't have it, uses the one provided by systemd
+            if description == translation_key:
+                description = str(status.get("Description", ""))
+
+            result[name] = {
+                'status': str(status.get("SubState", "unknown")),
+                'loaded': "enabled" if str(status.get("LoadState", "unknown")) == "loaded" else str(status.get("LoadState", "unknown")),
+                'active': str(status.get("ActiveState", "unknown")),
+                'active_at': {
+                    "timestamp": str(status.get("ActiveEnterTimestamp", "unknown")),
+                    "human": datetime.fromtimestamp(status["ActiveEnterTimestamp"] / 1000000).strftime("%F %X") if "ActiveEnterTimestamp" in status else "unknown",
+                },
+                'description': description,
+                'service_file_path': str(status.get("FragmentPath", "unknown")),
+            }
 
     if len(names) == 1:
         return result[names[0]]
     return result
 
 
+def _get_service_information_from_systemd(service):
+    "this is the equivalent of 'systemctl status $service'"
+    import dbus
+    from dbus.exceptions import DBusException
+
+    d = dbus.SystemBus()
+
+    systemd = d.get_object('org.freedesktop.systemd1','/org/freedesktop/systemd1')
+    manager = dbus.Interface(systemd, 'org.freedesktop.systemd1.Manager')
+
+    try:
+        service_path = manager.GetUnit(service + ".service")
+    except DBusException as exception:
+        if exception.get_dbus_name() == 'org.freedesktop.systemd1.NoSuchUnit':
+            return None
+        raise
+
+    service_proxy = d.get_object('org.freedesktop.systemd1', service_path)
+
+    # unit_proxy = dbus.Interface(service_proxy, 'org.freedesktop.systemd1.Unit',)
+    properties_interface = dbus.Interface(service_proxy, 'org.freedesktop.DBus.Properties')
+
+    return properties_interface.GetAll('org.freedesktop.systemd1.Unit')
+
+
 def service_log(name, number=50):
     """
     Log every log files of a service
@@ -256,21 +314,33 @@ def service_log(name, number=50):
     if name not in services.keys():
         raise MoulinetteError(errno.EINVAL, m18n.n('service_unknown', service=name))
 
-    if 'log' in services[name]:
-        log_list = services[name]['log']
-        result = {}
-        if not isinstance(log_list, list):
-            log_list = [log_list]
-
-        for log_path in log_list:
-            if os.path.isdir(log_path):
-                for log in [f for f in os.listdir(log_path) if os.path.isfile(os.path.join(log_path, f)) and f[-4:] == '.log']:
-                    result[os.path.join(log_path, log)] = _tail(os.path.join(log_path, log), int(number))
-            else:
-                result[log_path] = _tail(log_path, int(number))
-    else:
+    if 'log' not in services[name]:
         raise MoulinetteError(errno.EPERM, m18n.n('service_no_log', service=name))
 
+    log_list = services[name]['log']
+
+    if not isinstance(log_list, list):
+        log_list = [log_list]
+
+    result = {}
+
+    for log_path in log_list:
+        # log is a file, read it
+        if not os.path.isdir(log_path):
+            result[log_path] = _tail(log_path, int(number)) if os.path.exists(log_path) else []
+            continue
+
+        for log_file in os.listdir(log_path):
+            log_file_path = os.path.join(log_path, log_file)
+            # not a file : skip
+            if not os.path.isfile(log_file_path):
+                continue
+
+            if not log_file.endswith(".log"):
+                continue
+
+            result[log_file_path] = _tail(log_file_path, int(number)) if os.path.exists(log_file_path) else []
+
     return result
 
 
@@ -293,14 +363,19 @@ def service_regen_conf(uo, names=[], with_diff=False, force=False, dry_run=False
     # Return the list of pending conf
     if list_pending:
         pending_conf = _get_pending_conf(names)
-        if with_diff:
-            for service, conf_files in pending_conf.items():
-                for system_path, pending_path in conf_files.items():
-                    pending_conf[service][system_path] = {
-                        'pending_conf': pending_path,
-                        'diff': _get_files_diff(
-                            system_path, pending_path, True),
-                    }
+
+        if not with_diff:
+            return pending_conf
+
+        for service, conf_files in pending_conf.items():
+            for system_path, pending_path in conf_files.items():
+
+                pending_conf[service][system_path] = {
+                    'pending_conf': pending_path,
+                    'diff': _get_files_diff(
+                        system_path, pending_path, True),
+                }
+
         return pending_conf
 
     if not dry_run:
@@ -329,13 +404,16 @@ def service_regen_conf(uo, names=[], with_diff=False, force=False, dry_run=False
     def _pre_call(name, priority, path, args):
         # create the pending conf directory for the service
         service_pending_path = os.path.join(PENDING_CONF_DIR, name)
-        filesystem.mkdir(service_pending_path, 0755, True, uid='admin')
+        filesystem.mkdir(service_pending_path, 0755, True, uid='root')
+
         # return the arguments to pass to the script
         return pre_args + [service_pending_path, ]
+
     pre_result = hook_callback('conf_regen', names, pre_callback=_pre_call)
 
     # Update the services name
     names = pre_result['succeed'].keys()
+
     if not names:
         raise MoulinetteError(errno.EIO,
                               m18n.n('service_regenconf_failed',
@@ -351,7 +429,7 @@ def service_regen_conf(uo, names=[], with_diff=False, force=False, dry_run=False
         if not dry_run:
             uo.related_to.append(('service', service))
 
-        logger.info(m18n.n(
+        logger.debug(m18n.n(
             'service_regenconf_pending_applying' if not dry_run else
             'service_regenconf_dry_pending_applying',
             service=service))
@@ -394,10 +472,11 @@ def service_regen_conf(uo, names=[], with_diff=False, force=False, dry_run=False
                     regenerated = _regen(
                         system_path, pending_path, save=False)
                 else:
-                    logger.warning(m18n.n(
+                    logger.info(m18n.n(
                         'service_conf_file_manually_removed',
                         conf=system_path))
                     conf_status = 'removed'
+
             # -> system conf is not managed yet
             elif not saved_hash:
                 logger.debug("> system conf is not managed yet")
@@ -410,17 +489,18 @@ def service_regen_conf(uo, names=[], with_diff=False, force=False, dry_run=False
                     # we assume that it is safe to regen it, since the file is backuped
                     # anyway (by default in _regen), as long as we warn the user
                     # appropriately.
-                    logger.warning(m18n.n('service_conf_new_managed_file',
-                                          conf=system_path, service=service))
+                    logger.info(m18n.n('service_conf_new_managed_file',
+                                       conf=system_path, service=service))
                     regenerated = _regen(system_path, pending_path)
                     conf_status = 'new'
                 elif force:
                     regenerated = _regen(system_path)
                     conf_status = 'force-removed'
                 else:
-                    logger.warning(m18n.n('service_conf_file_kept_back',
-                                          conf=system_path, service=service))
+                    logger.info(m18n.n('service_conf_file_kept_back',
+                                       conf=system_path, service=service))
                     conf_status = 'unmanaged'
+
             # -> system conf has not been manually modified
             elif system_hash == saved_hash:
                 if to_remove:
@@ -433,6 +513,7 @@ def service_regen_conf(uo, names=[], with_diff=False, force=False, dry_run=False
                     logger.debug("> system conf is already up-to-date")
                     os.remove(pending_path)
                     continue
+
             else:
                 logger.debug("> system conf has been manually modified")
                 if system_hash == new_hash:
@@ -462,13 +543,14 @@ def service_regen_conf(uo, names=[], with_diff=False, force=False, dry_run=False
 
         # Check for service conf changes
         if not succeed_regen and not failed_regen:
-            logger.info(m18n.n('service_conf_up_to_date', service=service))
+            logger.debug(m18n.n('service_conf_up_to_date', service=service))
             continue
         elif not failed_regen:
             logger.success(m18n.n(
                 'service_conf_updated' if not dry_run else
                 'service_conf_would_be_updated',
                 service=service))
+
         if succeed_regen and not dry_run:
             _update_conf_hashes(service, conf_hashes)
 
@@ -492,6 +574,7 @@ def service_regen_conf(uo, names=[], with_diff=False, force=False, dry_run=False
         else:
             regen_conf_files = ''
         return post_args + [regen_conf_files, ]
+
     hook_callback('conf_regen', names, pre_callback=_pre_call)
 
     uo.success()
@@ -512,11 +595,11 @@ def _run_service_command(action, service):
     if service not in services.keys():
         raise MoulinetteError(errno.EINVAL, m18n.n('service_unknown', service=service))
 
-    cmd = None
-    if action in ['start', 'stop', 'restart', 'reload', 'enable', 'disable']:
-        cmd = 'systemctl %s %s' % (action, service)
-    else:
-        raise ValueError("Unknown action '%s'" % action)
+    possible_actions = ['start', 'stop', 'restart', 'reload', 'enable', 'disable']
+    if action not in possible_actions:
+        raise ValueError("Unknown action '%s', available actions are: %s" % (action, ", ".join(possible_actions)))
+
+    cmd = 'systemctl %s %s' % (action, service)
 
     need_lock = services[service].get('need_lock', False) \
                 and action in ['start', 'stop', 'restart', 'reload']
@@ -531,14 +614,17 @@ def _run_service_command(action, service):
             PID = _give_lock(action, service, p)
         # Wait for the command to complete
         p.communicate()
-        # Remove the lock if one was given
-        if need_lock and PID != 0:
-            _remove_lock(PID)
 
     except subprocess.CalledProcessError as e:
         # TODO: Log output?
         logger.warning(m18n.n('service_cmd_exec_failed', command=' '.join(e.cmd)))
         return False
+
+    finally:
+        # Remove the lock if one was given
+        if need_lock and PID != 0:
+            _remove_lock(PID)
+
     return True
 
 
@@ -571,6 +657,7 @@ def _give_lock(action, service, p):
     return son_PID
 
 def _remove_lock(PID_to_remove):
+    # FIXME ironically not concurrency safe because it's not atomic...
 
     PIDs = filesystem.read_file(MOULINETTE_LOCK).split("\n")
     PIDs_to_keep = [ PID for PID in PIDs if int(PID) != PID_to_remove ]
@@ -588,6 +675,12 @@ def _get_services():
     except:
         return {}
     else:
+        # some services are marked as None to remove them from YunoHost
+        # filter this
+        for key, value in services.items():
+            if value is None:
+                del services[key]
+
         return services
 
 
@@ -599,12 +692,15 @@ def _save_services(services):
         services -- A dict of managed services with their parameters
 
     """
-    # TODO: Save to custom services.yml
-    with open('/etc/yunohost/services.yml', 'w') as f:
-        yaml.safe_dump(services, f, default_flow_style=False)
+    try:
+        with open('/etc/yunohost/services.yml', 'w') as f:
+            yaml.safe_dump(services, f, default_flow_style=False)
+    except Exception as e:
+        logger.warning('Error while saving services, exception: %s', e, exc_info=1)
+        raise
 
 
-def _tail(file, n, offset=None):
+def _tail(file, n):
     """
     Reads a n lines from f with an offset of offset lines.  The return
     value is a tuple in the form ``(lines, has_more)`` where `has_more` is
@@ -613,7 +709,7 @@ def _tail(file, n, offset=None):
     This function works even with splitted logs (gz compression, log rotate...)
     """
     avg_line_length = 74
-    to_read = n + (offset or 0)
+    to_read = n
 
     try:
         if file.endswith(".gz"):
@@ -631,12 +727,18 @@ def _tail(file, n, offset=None):
                     # woops.  apparently file is smaller than what we want
                     # to step back, go to the beginning instead
                     f.seek(0)
+
                 pos = f.tell()
                 lines = f.read().splitlines()
+
+                if len(lines) >= to_read:
+                    return lines[-to_read:]
+
                 avg_line_length *= 1.3
         f.close()
 
-    except IOError:
+    except IOError as e:
+        logger.warning("Error while tailing file '%s': %s", file, e, exc_info=1)
         return []
 
     if len(lines) < to_read:
@@ -679,36 +781,50 @@ def _get_files_diff(orig_file, new_file, as_string=False, skip_header=True):
     header can also be removed if skip_header is True.
 
     """
-    contents = [[], []]
-    for i, path in enumerate((orig_file, new_file)):
-        try:
-            with open(path, 'r') as f:
-                contents[i] = f.readlines()
-        except IOError:
-            pass
+
+    if os.path.exists(orig_file):
+        with open(orig_file, 'r') as orig_file:
+            orig_file = orig_file.readlines()
+    else:
+        orig_file = []
+
+    if os.path.exists(new_file):
+        with open(new_file, 'r') as new_file:
+            new_file = new_file.readlines()
+    else:
+        new_file = []
 
     # Compare files and format output
-    diff = unified_diff(contents[0], contents[1])
+    diff = unified_diff(orig_file, new_file)
+
     if skip_header:
-        for i in range(2):
-            try:
-                next(diff)
-            except:
-                break
+        try:
+            next(diff)
+            next(diff)
+        except:
+            pass
+
     if as_string:
-        result = ''.join(line for line in diff)
-        return result.rstrip()
+        return ''.join(diff).rstrip()
+
     return diff
 
 
 def _calculate_hash(path):
     """Calculate the MD5 hash of a file"""
+
+    if not os.path.exists(path):
+        return None
+
     hasher = hashlib.md5()
+
     try:
         with open(path, 'rb') as f:
             hasher.update(f.read())
         return hasher.hexdigest()
-    except IOError:
+
+    except IOError as e:
+        logger.warning("Error while calculating file '%s' hash: %s", path, e, exc_info=1)
         return None
 
 
@@ -724,25 +840,33 @@ def _get_pending_conf(services=[]):
 
     """
     result = {}
+
     if not os.path.isdir(PENDING_CONF_DIR):
         return result
+
     if not services:
         services = os.listdir(PENDING_CONF_DIR)
+
     for name in services:
         service_pending_path = os.path.join(PENDING_CONF_DIR, name)
+
         if not os.path.isdir(service_pending_path):
             continue
+
         path_index = len(service_pending_path)
         service_conf = {}
+
         for root, dirs, files in os.walk(service_pending_path):
             for filename in files:
                 pending_path = os.path.join(root, filename)
                 service_conf[pending_path[path_index:]] = pending_path
+
         if service_conf:
             result[name] = service_conf
         else:
             # remove empty directory
             shutil.rmtree(service_pending_path, ignore_errors=True)
+
     return result
 
 
@@ -754,9 +878,11 @@ def _get_conf_hashes(service):
     if service not in services:
         logger.debug("Service %s is not in services.yml yet.", service)
         return {}
+
     elif services[service] is None or 'conffiles' not in services[service]:
         logger.debug("No configuration files for service %s.", service)
         return {}
+
     else:
         return services[service]['conffiles']
 
@@ -789,31 +915,41 @@ def _process_regen_conf(system_conf, new_conf=None, save=True):
         backup_path = os.path.join(BACKUP_CONF_DIR, '{0}-{1}'.format(
             system_conf.lstrip('/'), time.strftime("%Y%m%d.%H%M%S")))
         backup_dir = os.path.dirname(backup_path)
+
         if not os.path.isdir(backup_dir):
             filesystem.mkdir(backup_dir, 0755, True)
+
         shutil.copy2(system_conf, backup_path)
-        logger.info(m18n.n('service_conf_file_backed_up',
+        logger.debug(m18n.n('service_conf_file_backed_up',
                            conf=system_conf, backup=backup_path))
+
     try:
         if not new_conf:
             os.remove(system_conf)
-            logger.info(m18n.n('service_conf_file_removed',
+            logger.debug(m18n.n('service_conf_file_removed',
                                conf=system_conf))
         else:
             system_dir = os.path.dirname(system_conf)
+
             if not os.path.isdir(system_dir):
                 filesystem.mkdir(system_dir, 0755, True)
+
             shutil.copyfile(new_conf, system_conf)
-            logger.info(m18n.n('service_conf_file_updated',
-                               conf=system_conf))
-    except:
+            logger.debug(m18n.n('service_conf_file_updated',
+                                conf=system_conf))
+    except Exception as e:
+        logger.warning("Exception while trying to regenerate conf '%s': %s", system_conf, e, exc_info=1)
         if not new_conf and os.path.exists(system_conf):
             logger.warning(m18n.n('service_conf_file_remove_failed',
                                   conf=system_conf),
                            exc_info=1)
             return False
+
         elif new_conf:
             try:
+                # From documentation:
+                # Raise an exception if an os.stat() call on either pathname fails.
+                # (os.stats returns a series of information from a file like type, size...)
                 copy_succeed = os.path.samefile(system_conf, new_conf)
             except:
                 copy_succeed = False
@@ -823,4 +959,45 @@ def _process_regen_conf(system_conf, new_conf=None, save=True):
                                           conf=system_conf, new=new_conf),
                                    exc_info=1)
                     return False
+
     return 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 service_regenconf does
+    # and only do the part that checks file hashes...
+    cmd = "yunohost service 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():
+        for action, files in actions.items():
+            for filename, infos in files.items():
+                if infos["status"] == "modified":
+                    output.append(filename)
+
+    return output
+
+
+def _get_journalctl_logs(service):
+    try:
+        return subprocess.check_output("journalctl -xn -u %s" % service, shell=True)
+    except:
+        import traceback
+        return "error while get services logs from journalctl:\n%s" % traceback.format_exc()
+
+
+def manually_modified_files_compared_to_debian_default():
+
+    # from https://serverfault.com/a/90401
+    r = subprocess.check_output("dpkg-query -W -f='${Conffiles}\n' '*' \
+                                | awk 'OFS=\"  \"{print $2,$1}' \
+                                | md5sum -c 2>/dev/null \
+                                | awk -F': ' '$2 !~ /OK/{print $1}'", shell=True)
+    return r.strip().split("\n")

src/yunohost/ssh.py

@@ -0,0 +1,203 @@
+# encoding: utf-8
+
+import re
+import os
+import errno
+import pwd
+import subprocess
+
+from moulinette import m18n
+from moulinette.core import MoulinetteError
+from moulinette.utils.filesystem import read_file, write_to_file, chown, chmod, mkdir
+
+SSHD_CONFIG_PATH = "/etc/ssh/sshd_config"
+
+
+def user_ssh_allow(auth, username):
+    """
+    Allow YunoHost user connect as ssh.
+
+    Keyword argument:
+        username -- User username
+    """
+    # TODO it would be good to support different kind of shells
+
+    if not _get_user_for_ssh(auth, username):
+        raise MoulinetteError(errno.EINVAL, m18n.n('user_unknown', user=username))
+
+    auth.update('uid=%s,ou=users' % username, {'loginShell': '/bin/bash'})
+
+    # Somehow this is needed otherwise the PAM thing doesn't forget about the
+    # old loginShell value ?
+    subprocess.call(['nscd', '-i', 'passwd'])
+
+
+def user_ssh_disallow(auth, username):
+    """
+    Disallow YunoHost user connect as ssh.
+
+    Keyword argument:
+        username -- User username
+    """
+    # TODO it would be good to support different kind of shells
+
+    if not _get_user_for_ssh(auth, username):
+        raise MoulinetteError(errno.EINVAL, m18n.n('user_unknown', user=username))
+
+    auth.update('uid=%s,ou=users' % username, {'loginShell': '/bin/false'})
+
+    # Somehow this is needed otherwise the PAM thing doesn't forget about the
+    # old loginShell value ?
+    subprocess.call(['nscd', '-i', 'passwd'])
+
+
+def user_ssh_list_keys(auth, username):
+    user = _get_user_for_ssh(auth, username, ["homeDirectory"])
+    if not user:
+        raise Exception("User with username '%s' doesn't exists" % username)
+
+    authorized_keys_file = os.path.join(user["homeDirectory"][0], ".ssh", "authorized_keys")
+
+    if not os.path.exists(authorized_keys_file):
+        return {"keys": []}
+
+    keys = []
+    last_comment = ""
+    for line in read_file(authorized_keys_file).split("\n"):
+        # empty line
+        if not line.strip():
+            continue
+
+        if line.lstrip().startswith("#"):
+            last_comment = line.lstrip().lstrip("#").strip()
+            continue
+
+        # assuming a key per non empty line
+        key = line.strip()
+        keys.append({
+            "key": key,
+            "name": last_comment,
+        })
+
+        last_comment = ""
+
+    return {"keys": keys}
+
+
+def user_ssh_add_key(auth, username, key, comment):
+    user = _get_user_for_ssh(auth, username, ["homeDirectory", "uid"])
+    if not user:
+        raise Exception("User with username '%s' doesn't exists" % username)
+
+    authorized_keys_file = os.path.join(user["homeDirectory"][0], ".ssh", "authorized_keys")
+
+    if not os.path.exists(authorized_keys_file):
+        # ensure ".ssh" exists
+        mkdir(os.path.join(user["homeDirectory"][0], ".ssh"),
+              force=True, parents=True, uid=user["uid"][0])
+
+        # create empty file to set good permissions
+        write_to_file(authorized_keys_file, "")
+        chown(authorized_keys_file, uid=user["uid"][0])
+        chmod(authorized_keys_file, 0600)
+
+    authorized_keys_content = read_file(authorized_keys_file)
+
+    authorized_keys_content += "\n"
+    authorized_keys_content += "\n"
+
+    if comment and comment.strip():
+        if not comment.lstrip().startswith("#"):
+            comment = "# " + comment
+        authorized_keys_content += comment.replace("\n", " ").strip()
+        authorized_keys_content += "\n"
+
+    authorized_keys_content += key.strip()
+    authorized_keys_content += "\n"
+
+    write_to_file(authorized_keys_file, authorized_keys_content)
+
+
+def user_ssh_remove_key(auth, username, key):
+    user = _get_user_for_ssh(auth, username, ["homeDirectory", "uid"])
+    if not user:
+        raise Exception("User with username '%s' doesn't exists" % username)
+
+    authorized_keys_file = os.path.join(user["homeDirectory"][0], ".ssh", "authorized_keys")
+
+    if not os.path.exists(authorized_keys_file):
+        raise Exception("this key doesn't exists ({} dosesn't exists)".format(authorized_keys_file))
+
+    authorized_keys_content = read_file(authorized_keys_file)
+
+    if key not in authorized_keys_content:
+        raise Exception("Key '{}' is not present in authorized_keys".format(key))
+
+    # don't delete the previous comment because we can't verify if it's legit
+
+    # this regex approach failed for some reasons and I don't know why :(
+    # authorized_keys_content = re.sub("{} *\n?".format(key),
+    #                                  "",
+    #                                  authorized_keys_content,
+    #                                  flags=re.MULTILINE)
+
+    authorized_keys_content = authorized_keys_content.replace(key, "")
+
+    write_to_file(authorized_keys_file, authorized_keys_content)
+
+#
+# Helpers
+#
+
+
+def _get_user_for_ssh(auth, username, attrs=None):
+    def ssh_root_login_status(auth):
+        # XXX temporary placed here for when the ssh_root commands are integrated
+        # extracted from https://github.com/YunoHost/yunohost/pull/345
+        # XXX should we support all the options?
+        # this is the content of "man sshd_config"
+        # PermitRootLogin
+        #     Specifies whether root can log in using ssh(1).  The argument must be
+        #     “yes”, “without-password”, “forced-commands-only”, or “no”.  The
+        #     default is “yes”.
+        sshd_config_content = read_file(SSHD_CONFIG_PATH)
+
+        if re.search("^ *PermitRootLogin +(no|forced-commands-only) *$",
+                     sshd_config_content, re.MULTILINE):
+            return {"PermitRootLogin": False}
+
+        return {"PermitRootLogin": True}
+
+    if username == "root":
+        root_unix = pwd.getpwnam("root")
+        return {
+            'username': 'root',
+            'fullname': '',
+            'mail': '',
+            'ssh_allowed': ssh_root_login_status(auth)["PermitRootLogin"],
+            'shell': root_unix.pw_shell,
+            'home_path': root_unix.pw_dir,
+        }
+
+    if username == "admin":
+        admin_unix = pwd.getpwnam("admin")
+        return {
+            'username': 'admin',
+            'fullname': '',
+            'mail': '',
+            'ssh_allowed': admin_unix.pw_shell.strip() != "/bin/false",
+            'shell': admin_unix.pw_shell,
+            'home_path': admin_unix.pw_dir,
+        }
+
+    # TODO escape input using https://www.python-ldap.org/doc/html/ldap-filter.html
+    user = auth.search('ou=users,dc=yunohost,dc=org',
+                       '(&(objectclass=person)(uid=%s))' % username,
+                       attrs)
+
+    assert len(user) in (0, 1)
+
+    if not user:
+        return None
+
+    return user[0]

src/yunohost/tests/test_backuprestore.py

@@ -101,9 +101,6 @@ def app_is_installed(app):
 
 def backup_test_dependencies_are_met():
 
-    # We need archivemount installed for the backup features to work
-    assert os.system("which archivemount >/dev/null") == 0
-
     # Dummy test apps (or backup archives)
     assert os.path.exists("./tests/apps/backup_wordpress_from_2p4")
     assert os.path.exists("./tests/apps/backup_legacy_app_ynh")
@@ -250,42 +247,6 @@ def test_backup_and_restore_all_sys():
     assert os.path.exists("/etc/ssowat/conf.json")
 
 
-def test_backup_and_restore_archivemount_failure(monkeypatch, mocker):
-
-    # Create the backup
-    backup_create(ignore_system=False, ignore_apps=True)
-
-    archives = backup_list()["archives"]
-    assert len(archives) == 1
-
-    archives_info = backup_info(archives[0], with_details=True)
-    assert archives_info["apps"] == {}
-    assert (len(archives_info["system"].keys()) ==
-            len(os.listdir("/usr/share/yunohost/hooks/backup/")))
-
-    # Remove ssowat conf
-    assert os.path.exists("/etc/ssowat/conf.json")
-    os.system("rm -rf /etc/ssowat/")
-    assert not os.path.exists("/etc/ssowat/conf.json")
-
-    def custom_subprocess_call(*args, **kwargs):
-        import subprocess as subprocess2
-        if args[0] and args[0][0]=="archivemount":
-            monkeypatch.undo()
-            return 1
-        return subprocess.call(*args, **kwargs)
-
-    monkeypatch.setattr("subprocess.call", custom_subprocess_call)
-    mocker.spy(m18n, "n")
-
-    # Restore the backup
-    backup_restore(auth, name=archives[0], force=True,
-                   ignore_system=False, ignore_apps=True)
-
-    # Check ssowat conf is back
-    assert os.path.exists("/etc/ssowat/conf.json")
-
-
 ###############################################################################
 #  System restore from 2.4                                                    #
 ###############################################################################
@@ -311,38 +272,6 @@ def test_restore_system_from_Ynh2p4(monkeypatch, mocker):
                              ignore_apps=True,
                              force=True)
 
-
-@pytest.mark.with_system_archive_from_2p4
-def test_restore_system_from_Ynh2p4_archivemount_failure(monkeypatch, mocker):
-
-    # Backup current system
-    backup_create(ignore_system=False, ignore_apps=True)
-    archives = backup_list()["archives"]
-    assert len(archives) == 2
-
-    def custom_subprocess_call(*args, **kwargs):
-        import subprocess as subprocess2
-        if args[0] and args[0][0]=="archivemount":
-            monkeypatch.undo()
-            return 1
-        return subprocess.call(*args, **kwargs)
-
-    monkeypatch.setattr("subprocess.call", custom_subprocess_call)
-
-    try:
-        # Restore system from 2.4
-        backup_restore(auth, name=backup_list()["archives"][1],
-                             ignore_system=False,
-                             ignore_apps=True,
-                             force=True)
-    finally:
-        # Restore system as it was
-        backup_restore(auth, name=backup_list()["archives"][0],
-                             ignore_system=False,
-                             ignore_apps=True,
-                             force=True)
-
-
 ###############################################################################
 #  App backup                                                                 #
 ###############################################################################
@@ -545,29 +474,6 @@ def test_restore_app_not_in_backup(mocker):
     assert not _is_installed("yoloswag")
 
 
-@pytest.mark.with_wordpress_archive_from_2p4
-def test_restore_app_archivemount_failure(monkeypatch, mocker):
-
-    def custom_subprocess_call(*args, **kwargs):
-        import subprocess as subprocess2
-        if args[0] and args[0][0]=="archivemount":
-            monkeypatch.undo()
-            return 1
-        return subprocess.call(*args, **kwargs)
-
-    monkeypatch.setattr("subprocess.call", custom_subprocess_call)
-    mocker.spy(m18n, "n")
-
-    assert not _is_installed("wordpress")
-
-    backup_restore(auth, name=backup_list()["archives"][0],
-                         ignore_system=True,
-                         ignore_apps=False,
-                         apps=["wordpress"])
-
-    assert _is_installed("wordpress")
-
-
 @pytest.mark.with_wordpress_archive_from_2p4
 def test_restore_app_already_installed(mocker):
 
@@ -643,7 +549,7 @@ def test_restore_archive_with_no_json(mocker):
     # Create a backup with no info.json associated
     os.system("touch /tmp/afile")
     os.system("tar -czvf /home/yunohost.backup/archives/badbackup.tar.gz /tmp/afile")
-    
+
     assert "badbackup" in backup_list()["archives"]
 
     mocker.spy(m18n, "n")

src/yunohost/tools.py

@@ -26,15 +26,15 @@
 import re
 import os
 import yaml
-import requests
 import json
 import errno
 import logging
 import subprocess
 import pwd
 import socket
-from collections import OrderedDict
+from xmlrpclib import Fault
 from importlib import import_module
+from collections import OrderedDict
 
 import apt
 import apt.progress
@@ -229,7 +229,7 @@ def _set_hostname(hostname, pretty_hostname=None):
             logger.warning(out)
             raise MoulinetteError(errno.EIO, m18n.n('domain_hostname_failed'))
         else:
-            logger.info(out)
+            logger.debug(out)
 
 
 def _is_inside_container():
@@ -301,6 +301,8 @@ def tools_postinstall(domain, password, ignore_dyndns=False):
 
     logger.info(m18n.n('yunohost_installing'))
 
+    service_regen_conf(['nslcd', 'nsswitch'], force=True)
+
     # Initialize LDAP for YunoHost
     # TODO: Improve this part by integrate ldapinit into conf_regen hook
     auth = tools_ldapinit()
@@ -324,7 +326,7 @@ def tools_postinstall(domain, password, ignore_dyndns=False):
     os.system('chmod 755 /home/yunohost.app')
 
     # Set hostname to avoid amavis bug
-    if os.system('hostname -d') != 0:
+    if os.system('hostname -d >/dev/null') != 0:
         os.system('hostname yunohost.yunohost.org')
 
     # Add a temporary SSOwat rule to redirect SSO to admin page
@@ -401,7 +403,7 @@ def tools_postinstall(domain, password, ignore_dyndns=False):
     _install_appslist_fetch_cron()
 
     # Init migrations (skip them, no need to run them on a fresh system)
-    tools_migrations_migrate(skip=True)
+    tools_migrations_migrate(skip=True, auto=True)
 
     os.system('touch /etc/yunohost/installed')
 
@@ -428,7 +430,7 @@ def tools_update(ignore_apps=False, ignore_packages=False):
         cache = apt.Cache()
 
         # Update APT cache
-        logger.info(m18n.n('updating_apt_cache'))
+        logger.debug(m18n.n('updating_apt_cache'))
         if not cache.update():
             raise MoulinetteError(errno.EPERM, m18n.n('update_cache_failed'))
 
@@ -442,7 +444,7 @@ def tools_update(ignore_apps=False, ignore_packages=False):
                 'fullname': pkg.fullname,
                 'changelog': pkg.get_changelog()
             })
-        logger.info(m18n.n('done'))
+        logger.debug(m18n.n('done'))
 
     # "apps" will list upgradable packages
     apps = []
@@ -580,7 +582,7 @@ def tools_diagnosis(auth, private=False):
     diagnosis['system'] = OrderedDict()
     try:
         disks = monitor_disk(units=['filesystem'], human_readable=True)
-    except MoulinetteError as e:
+    except (MoulinetteError, Fault) as e:
         logger.warning(m18n.n('diagnosis_monitor_disk_error', error=format(e)), exc_info=1)
     else:
         diagnosis['system']['disks'] = {}
@@ -677,7 +679,7 @@ def _check_if_vulnerable_to_meltdown():
                                 stderr=subprocess.STDOUT)
 
         output, _ = call.communicate()
-        assert call.returncode == 0
+        assert call.returncode in (0, 2, 3), "Return code: %s" % call.returncode
 
         CVEs = json.loads(output)
         assert len(CVEs) == 1
@@ -747,24 +749,39 @@ def tools_reboot(uo, force=False):
         subprocess.check_call(['systemctl', 'reboot'])
 
 
-def tools_migrations_list():
+def tools_migrations_list(pending=False, done=False):
     """
     List existing migrations
     """
 
-    migrations = {"migrations": []}
+    # Check for option conflict
+    if pending and done:
+        raise MoulinetteError(errno.EINVAL, m18n.n("migrations_list_conflict_pending_done"))
 
-    for migration in _get_migrations_list():
-        migrations["migrations"].append({
-            "number": int(migration.split("_", 1)[0]),
-            "name": migration.split("_", 1)[1],
-            "file_name": migration,
-        })
+    # Get all migrations
+    migrations = _get_migrations_list()
 
-    return migrations
+    # If asked, filter pending or done migrations
+    if pending or done:
+        last_migration = tools_migrations_state()["last_run_migration"]
+        last_migration = last_migration["number"] if last_migration else -1
+        if done:
+            migrations = [m for m in migrations if m.number <= last_migration]
+        if pending:
+            migrations = [m for m in migrations if m.number > last_migration]
+
+    # Reduce to dictionnaries
+    migrations = [{ "id": migration.id,
+                    "number": migration.number,
+                    "name": migration.name,
+                    "mode": migration.mode,
+                    "description": migration.description,
+                    "disclaimer": migration.disclaimer } for migration in migrations ]
+
+    return {"migrations": migrations}
 
 
-def tools_migrations_migrate(target=None, skip=False):
+def tools_migrations_migrate(target=None, skip=False, auto=False, accept_disclaimer=False):
     """
     Perform migrations
     """
@@ -781,26 +798,18 @@ def tools_migrations_migrate(target=None, skip=False):
 
     last_run_migration_number = state["last_run_migration"]["number"] if state["last_run_migration"] else 0
 
-    migrations = []
-
-    # loading all migrations
-    for migration in tools_migrations_list()["migrations"]:
-        migrations.append({
-            "number": migration["number"],
-            "name": migration["name"],
-            "module": _get_migration_module(migration),
-        })
-
-    migrations = sorted(migrations, key=lambda x: x["number"])
+    # load all migrations
+    migrations = _get_migrations_list()
+    migrations = sorted(migrations, key=lambda x: x.number)
 
     if not migrations:
         logger.info(m18n.n('migrations_no_migrations_to_run'))
         return
 
-    all_migration_numbers = [x["number"] for x in migrations]
+    all_migration_numbers = [x.number for x in migrations]
 
     if target is None:
-        target = migrations[-1]["number"]
+        target = migrations[-1].number
 
     # validate input, target must be "0" or a valid number
     elif target != 0 and target not in all_migration_numbers:
@@ -819,19 +828,41 @@ def tools_migrations_migrate(target=None, skip=False):
     if last_run_migration_number < target:
         logger.debug(m18n.n('migrations_forward'))
         # drop all already run migrations
-        migrations = filter(lambda x: target >= x["number"] > last_run_migration_number, migrations)
+        migrations = filter(lambda x: target >= x.number > last_run_migration_number, migrations)
         mode = "forward"
 
     # we need to go backward on already run migrations
     elif last_run_migration_number > target:
         logger.debug(m18n.n('migrations_backward'))
         # drop all not already run migrations
-        migrations = filter(lambda x: target < x["number"] <= last_run_migration_number, migrations)
+        migrations = filter(lambda x: target < x.number <= last_run_migration_number, migrations)
         mode = "backward"
 
     else:  # can't happen, this case is handle before
         raise Exception()
 
+    # If we are migrating in "automatic mode" (i.e. from debian
+    # configure during an upgrade of the package) but we are asked to run
+    # migrations is to be ran manually by the user
+    manual_migrations = [m for m in migrations if m.mode == "manual"]
+    if not skip and auto and manual_migrations:
+        for m in manual_migrations:
+            logger.warn(m18n.n('migrations_to_be_ran_manually',
+                               number=m.number,
+                               name=m.name))
+        return
+
+    # If some migrations have disclaimers, require the --accept-disclaimer
+    # option
+    migrations_with_disclaimer = [m for m in migrations if m.disclaimer]
+    if not skip and not accept_disclaimer and migrations_with_disclaimer:
+        for m in migrations_with_disclaimer:
+            logger.warn(m18n.n('migrations_need_to_accept_disclaimer',
+                               number=m.number,
+                               name=m.name,
+                               disclaimer=m.disclaimer))
+        return
+
     # effectively run selected migrations
     for migration in migrations:
 
@@ -840,7 +871,9 @@ def tools_migrations_migrate(target=None, skip=False):
         uo.start()
 
         if not skip:
-            logger.warn(m18n.n('migrations_show_currently_running_migration', **migration))
+
+            logger.warn(m18n.n('migrations_show_currently_running_migration',
+                               number=migration.number, name=migration.name))
 
             try:
                 if mode == "forward":
@@ -856,18 +889,23 @@ def tools_migrations_migrate(target=None, skip=False):
             except Exception as e:
                 # migration failed, let's stop here but still update state because
                 # we managed to run the previous ones
-                msg = m18n.n('migrations_migration_has_failed', exception=e, **migration)
+                msg = m18n.n('migrations_migration_has_failed',
+                                    exception=e,
+                                    number=migration.number,
+                                    name=migration.name)
                 logger.error(msg, exc_info=1)
                 uo.error(msg)
                 break
 
         else:  # if skip
-            logger.warn(m18n.n('migrations_skip_migration', **migration))
+            logger.warn(m18n.n('migrations_skip_migration',
+                               number=migration.number,
+                               name=migration.name))
 
         # update the state to include the latest run migration
         state["last_run_migration"] = {
-            "number": migration["number"],
-            "name": migration["name"],
+            "number": migration.number,
+            "name": migration.name
         }
 
         uo.success()
@@ -932,60 +970,79 @@ def _get_migrations_list():
         logger.warn(m18n.n('migrations_cant_reach_migration_file', migrations_path))
         return migrations
 
-    for migration in filter(lambda x: re.match("^\d+_[a-zA-Z0-9_]+\.py$", x), os.listdir(migrations_path)):
-        migrations.append(migration[:-len(".py")])
+    for migration_file in filter(lambda x: re.match("^\d+_[a-zA-Z0-9_]+\.py$", x), os.listdir(migrations_path)):
+        migrations.append(_load_migration(migration_file))
 
-    return sorted(migrations)
+    return sorted(migrations, key=lambda m: m.id)
 
 
-def _get_migration_by_name(migration_name, with_module=True):
+def _get_migration_by_name(migration_name):
     """
     Low-level / "private" function to find a migration by its name
     """
 
-    migrations = tools_migrations_list()["migrations"]
+    try:
+        import data_migrations
+    except ImportError:
+        raise AssertionError("Unable to find migration with name %s" % migration_name)
 
-    matches = [ m for m in migrations if m["name"] == migration_name ]
+    migrations_path = data_migrations.__path__[0]
+    migrations_found = filter(lambda x: re.match("^\d+_%s\.py$" % migration_name, x), os.listdir(migrations_path))
 
-    assert len(matches) == 1, "Unable to find migration with name %s" % migration_name
+    assert len(migrations_found) == 1, "Unable to find migration with name %s" % migration_name
 
-    migration = matches[0]
-
-    if with_module:
-        migration["module"] = _get_migration_module(migration)
-
-    return migration
+    return _load_migration(migrations_found[0])
 
 
-def _get_migration_module(migration):
+def _load_migration(migration_file):
+
+    migration_id = migration_file[:-len(".py")]
+
+    number, name = migration_id.split("_", 1)
 
     logger.debug(m18n.n('migrations_loading_migration',
-        number=migration["number"],
-        name=migration["name"],
-    ))
+        number=number, name=name))
 
     try:
         # this is python builtin method to import a module using a name, we
         # use that to import the migration as a python object so we'll be
         # able to run it in the next loop
-        return import_module("yunohost.data_migrations.{file_name}".format(**migration))
+        module = import_module("yunohost.data_migrations.{}".format(migration_id))
+        return module.MyMigration(migration_id)
     except Exception:
         import traceback
         traceback.print_exc()
 
         raise MoulinetteError(errno.EINVAL, m18n.n('migrations_error_failed_to_load_migration',
-            number=migration["number"],
-            name=migration["name"],
-        ))
+            number=number, name=name))
 
 
 class Migration(object):
 
-    def migrate(self):
-        self.forward()
+    # Those are to be implemented by daughter classes
+
+    mode = "auto"
 
     def forward(self):
         raise NotImplementedError()
 
     def backward(self):
         pass
+
+    @property
+    def disclaimer(self):
+        return None
+
+    # The followings shouldn't be overriden
+
+    def migrate(self):
+        self.forward()
+
+    def __init__(self, id_):
+        self.id = id_
+        self.number = int(self.id.split("_", 1)[0])
+        self.name = self.id.split("_", 1)[1]
+
+    @property
+    def description(self):
+        return m18n.n("migration_description_%s" % self.id)

src/yunohost/user.py

@@ -25,6 +25,7 @@
 """
 import os
 import re
+import pwd
 import json
 import errno
 import crypt
@@ -35,12 +36,12 @@ import subprocess
 from moulinette import m18n
 from moulinette.core import MoulinetteError
 from moulinette.utils.log import getActionLogger
+from moulinette.utils.filesystem import read_file
 from yunohost.service import service_status
 from yunohost.log import is_unit_operation
 
 logger = getActionLogger('yunohost.user')
 
-
 def user_list(auth, fields=None):
     """
     List users
@@ -57,6 +58,8 @@ def user_list(auth, fields=None):
         'cn': 'fullname',
         'mail': 'mail',
         'maildrop': 'mail-forward',
+        'loginShell': 'shell',
+        'homeDirectory': 'home_path',
         'mailuserquota': 'mailbox-quota'
     }
 
@@ -72,7 +75,7 @@ def user_list(auth, fields=None):
                 raise MoulinetteError(errno.EINVAL,
                                       m18n.n('field_invalid', attr))
     else:
-        attrs = ['uid', 'cn', 'mail', 'mailuserquota']
+        attrs = ['uid', 'cn', 'mail', 'mailuserquota', 'loginShell']
 
     result = auth.search('ou=users,dc=yunohost,dc=org',
                          '(&(objectclass=person)(!(uid=root))(!(uid=nobody)))',
@@ -82,6 +85,12 @@ def user_list(auth, fields=None):
         entry = {}
         for attr, values in user.items():
             if values:
+                if attr == "loginShell":
+                    if values[0].strip() == "/bin/false":
+                        entry["ssh_allowed"] = False
+                    else:
+                        entry["ssh_allowed"] = True
+
                 entry[user_attrs[attr]] = values[0]
 
         uid = entry[user_attrs['uid']]
@@ -438,6 +447,30 @@ def user_info(auth, username):
     else:
         raise MoulinetteError(167, m18n.n('user_info_failed'))
 
+#
+# SSH subcategory
+#
+#
+import yunohost.ssh
+
+def user_ssh_allow(auth, username):
+    return yunohost.ssh.user_ssh_allow(auth, username)
+
+def user_ssh_disallow(auth, username):
+    return yunohost.ssh.user_ssh_disallow(auth, username)
+
+def user_ssh_list_keys(auth, username):
+    return yunohost.ssh.user_ssh_list_keys(auth, username)
+
+def user_ssh_add_key(auth, username, key, comment):
+    return yunohost.ssh.user_ssh_add_key(auth, username, key, comment)
+
+def user_ssh_remove_key(auth, username, key):
+    return yunohost.ssh.user_ssh_remove_key(auth, username, key)
+
+#
+# End SSH subcategory
+#
 
 def _convertSize(num, suffix=''):
     for unit in ['K', 'M', 'G', 'T', 'P', 'E', 'Z']:
@@ -474,3 +507,6 @@ def _hash_user_password(password):
 
     salt = '$6$' + salt + '$'
     return '{CRYPT}' + crypt.crypt(str(password), salt)
+
+
+

src/yunohost/utils/filesystem.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+""" License
+
+    Copyright (C) 2018 YUNOHOST.ORG
+
+    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
+
+"""
+import os
+
+def free_space_in_directory(dirpath):
+    stat = os.statvfs(dirpath)
+    return stat.f_frsize * stat.f_bavail
+
+def space_used_by_directory(dirpath):
+    stat = os.statvfs(dirpath)
+    return stat.f_frsize * stat.f_blocks

src/yunohost/utils/network.py

@@ -19,10 +19,13 @@
 
 """
 import logging
+import re
+import subprocess
 from urllib import urlopen
 
 logger = logging.getLogger('yunohost.utils.network')
 
+
 def get_public_ip(protocol=4):
     """Retrieve the public IP address from ip.yunohost.org"""
 
@@ -37,3 +40,76 @@ def get_public_ip(protocol=4):
         return urlopen(url).read().strip()
     except IOError:
         return None
+
+
+def get_network_interfaces():
+
+    # Get network devices and their addresses (raw infos from 'ip addr')
+    devices_raw = {}
+    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_raw[m.group(1)] = m.group(2)
+
+    # Parse relevant informations for each of them
+    devices = {name: _extract_inet(addrs) for name, addrs in devices_raw.items() if name != "lo"}
+
+    return devices
+
+
+def get_gateway():
+
+    output = subprocess.check_output('ip route show'.split())
+    m = re.search('default via (.*) dev ([a-z]+[0-9]?)', output)
+    if not m:
+        return None
+
+    addr = _extract_inet(m.group(1), True)
+    return addr.popitem()[1] if len(addr) == 1 else None
+
+
+###############################################################################
+
+
+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

src/yunohost/vendor/acme_tiny/acme_tiny.py

@@ -1,21 +1,9 @@
 #!/usr/bin/env python
-import argparse
-import subprocess
-import json
-import os
-import sys
-import base64
-import binascii
-import time
-import hashlib
-import re
-import copy
-import textwrap
-import logging
+import argparse, subprocess, json, os, sys, base64, binascii, time, hashlib, re, copy, textwrap, logging
 try:
-    from urllib.request import urlopen  # Python 3
+    from urllib.request import urlopen # Python 3
 except ImportError:
-    from urllib2 import urlopen  # Python 2
+    from urllib2 import urlopen # Python 2
 
 #DEFAULT_CA = "https://acme-staging.api.letsencrypt.org"
 DEFAULT_CA = "https://acme-v01.api.letsencrypt.org"
@@ -24,7 +12,6 @@ LOGGER = logging.getLogger(__name__)
 LOGGER.addHandler(logging.StreamHandler())
 LOGGER.setLevel(logging.INFO)
 
-
 def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA):
     # helper function base64 encode for jose spec
     def _b64(b):
@@ -178,7 +165,6 @@ def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA):
     return """-----BEGIN CERTIFICATE-----\n{0}\n-----END CERTIFICATE-----\n""".format(
         "\n".join(textwrap.wrap(base64.b64encode(result).decode('utf8'), 64)))
 
-
 def main(argv):
     parser = argparse.ArgumentParser(
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -208,5 +194,5 @@ def main(argv):
     signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, log=LOGGER, CA=args.ca)
     sys.stdout.write(signed_crt)
 
-if __name__ == "__main__":  # pragma: no cover
+if __name__ == "__main__": # pragma: no cover
     main(sys.argv[1:])

src/yunohost/vendor/spectre-meltdown-checker/README.md

@@ -1,16 +1,57 @@
 Spectre & Meltdown Checker
 ==========================
 
-A simple shell script to tell if your Linux installation is vulnerable against the 3 "speculative execution" CVEs that were made public early 2018.
+A shell script to tell if your system is vulnerable against the 3 "speculative execution" CVEs that were made public early 2018.
 
-Without options, it'll inspect your currently running kernel. 
-You can also specify a kernel image on the command line, if you'd like to inspect a kernel you're not running.
+Supported operating systems:
+- Linux (all versions, flavors and distros)
+- BSD (FreeBSD, NetBSD, DragonFlyBSD)
 
-The script will do its best to detect mitigations, including backported non-vanilla patches, regardless of the advertised kernel version number.
+Supported architectures:
+- x86 (32 bits)
+- amd64/x86_64 (64 bits)
+- ARM and ARM64
+- other architectures will work, but mitigations (if they exist) might not always be detected
+
+For Linux systems, the script will detect mitigations, including backported non-vanilla patches, regardless of the advertised kernel version number and the distribution (such as Debian, Ubuntu, CentOS, RHEL, Fedora, openSUSE, Arch, ...), it also works if you've compiled your own kernel.
+
+For BSD systems, the detection will work as long as the BSD you're using supports `cpuctl` and `linprocfs` (this is not the case of OpenBSD for example).
+
+## Easy way to run the script
+
+- Get the latest version of the script using `curl` *or* `wget`
+
+```bash
+curl -L https://meltdown.ovh -o spectre-meltdown-checker.sh
+wget https://meltdown.ovh -O spectre-meltdown-checker.sh
+```
+
+- Inspect the script. You never blindly run scripts you downloaded from the Internet, do you?
+
+```bash
+vim spectre-meltdown-checker.sh
+```
+
+- When you're ready, run the script as root
+
+```bash
+chmod +x spectre-meltdown-checker.sh
+sudo ./spectre-meltdown-checker.sh
+```
 
 ## Example of script output
 
-![checker](https://framapic.org/6O4v4AAwMenv/M6J4CFWwsB3z.png)
+- Intel Haswell CPU running under Ubuntu 16.04 LTS
+
+![haswell](https://framapic.org/1kWmNwE6ll0p/ayTRX9JRlHJ7.png)
+
+- AMD Ryzen running under OpenSUSE Tumbleweed
+
+![ryzen](https://framapic.org/TkWbuh421YQR/6MAGUP3lL6Ne.png)
+
+- Batch mode (JSON flavor)
+
+![batch](https://framapic.org/HEcWFPrLewbs/om1LdufspWTJ.png)
 
 ## Quick summary of the CVEs
 
@@ -38,8 +79,10 @@ The script will do its best to detect mitigations, including backported non-vani
 This tool does its best to determine whether your system is immune (or has proper mitigations in place) for the collectively named "speculative execution" vulnerabilities. It doesn't attempt to run any kind of exploit, and can't guarantee that your system is secure, but rather helps you verifying whether your system has the known correct mitigations in place.
 However, some mitigations could also exist in your kernel that this script doesn't know (yet) how to detect, or it might falsely detect mitigations that in the end don't work as expected (for example, on backported or modified kernels).
 
-Your system exposure also depends on your CPU. As of now, AMD and ARM processors are marked as immune to some or all of these vulnerabilities (except some specific ARM models). All Intel processors manufactured since circa 1995 are thought to be vulnerable. Whatever processor one uses, one might seek more information from the manufacturer of that processor and/or of the device in which it runs.
+Your system exposure also depends on your CPU. As of now, AMD and ARM processors are marked as immune to some or all of these vulnerabilities (except some specific ARM models). All Intel processors manufactured since circa 1995 are thought to be vulnerable, except some specific/old models, such as some early Atoms. Whatever processor one uses, one might seek more information from the manufacturer of that processor and/or of the device in which it runs.
 
 The nature of the discovered vulnerabilities being quite new, the landscape of vulnerable processors can be expected to change over time, which is why this script makes the assumption that all CPUs are vulnerable, except if the manufacturer explicitly stated otherwise in a verifiable public announcement.
 
+Please also note that for Spectre vulnerabilities, all software can possibly be exploited, this tool only verifies that the kernel (which is the core of the system) you're using has the proper protections in place. Verifying all the other software is out of the scope of this tool. As a general measure, ensure you always have the most up to date stable versions of all the software you use, especially for those who are exposed to the world, such as network daemons and browsers.
+
 This tool has been released in the hope that it'll be useful, but don't use it to jump to conclusions about your security.