Merge pull request #393 from YunoHost-Apps/testing

Testing

README.md

@@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 
 [Nextcloud](https://nextcloud.com) gives you freedom and control over your own data. A personal cloud which runs on your own server. With Nextcloud you can synchronize your files over your devices.
 
-**Shipped version:** 20.0.7
+**Shipped version:** 20.0.8
 
 ## Screenshots
 

README_fr.md

@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 [Nextcloud](https://nextcloud.com) vous donne la liberté et le contrôle sur vos données. Un nuage personnel qui tourne sur votre serveur.
 Avec NextCloud vous pouvez synchroniser vos fichiers sur vos appareils.
 
-**Version incluse :** 20.0.7
+**Version incluse :** 20.0.8
 
 ## Captures d'écran
 

conf/config.json

@@ -24,9 +24,10 @@
       "ldap_email_attr": "mail",
       "ldap_expert_username_attr": "uid",
       "ldap_group_display_name": "cn",
-      "ldap_group_filter": "objectClass=posixGroup",
+      "ldap_group_filter": "(&(objectclass=top)(memberUid=*))",
       "ldap_group_filter_mode": "0",
       "ldap_groupfilter_objectclass": "posixGroup",
+      "ldap_group_member_assoc_attribute": "memberUid",
       "ldap_host": "localhost",
       "ldap_login_filter": "(&(|(objectclass=posixAccount))(uid=%uid))",
       "ldap_login_filter_mode": "0",

conf/nginx.conf

@@ -93,6 +93,10 @@ location ^~ __PATH__/ {
   # then Nginx will encounter an infinite rewriting loop when it prepends
   # `/nextcloud/index.php` to the URI, resulting in a HTTP 500 error response.
   location ~ \.php(?:$|/) {
+    # Required for legacy support
+    # https://github.com/nextcloud/documentation/pull/2197#issuecomment-721432337
+    # This line fix the ldap admin page
+    rewrite ^__PATH__/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) __PATH__/index.php$request_uri;
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     set $path_info $fastcgi_path_info;
     try_files $fastcgi_script_name =404;

manifest.json

@@ -6,12 +6,12 @@
         "en": "Online storage, file sharing platform and various other applications",
         "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
     },
-    "version": "20.0.7~ynh1",
+    "version": "20.0.8~ynh1",
     "url": "https://nextcloud.com",
     "license": "AGPL-3.0",
     "maintainer": {
-        "name": "YunoHost Contributors",
+        "name": "Kay0u",
-        "email": "apps@yunohost.org"
+        "email": "pierre@kayou.io"
     },
     "requirements": {
         "yunohost": ">= 4.1.6"

scripts/_common.sh

@@ -59,251 +59,6 @@ is_url_handled() {
     fi
 }
 
-#=================================================
-
-# Make the main steps to migrate an app to its fork.
-#
-# This helper has to be used for an app which needs to migrate to a new name or a new fork
-# (like owncloud to nextcloud or zerobin to privatebin).
-#
-# This helper will move the files of an app to its new name
-# or recreate the things it can't move.
-#
-# To specify which files it has to move, you have to create a "migration file", stored in ../conf
-# This file is a simple list of each file it has to move,
-# except that file names must reference the $app variable instead of the real name of the app,
-# and every instance-specific variables (like $domain).
-# $app is especially important because it's this variable which will be used to identify the old place and the new one for each file.
-#
-# If a database exists for this app, it will be dumped and then imported in a newly created database, with a new name and new user.
-# Don't forget you have to then apply these changes to application-specific settings (depends on the packaged application)
-#
-# Same things for an existing user, a new one will be created.
-# But the old one can't be removed unless it's not used. See below.
-#
-# If you have some dependencies for your app, it's possible to change the fake debian package which manages them.
-# You have to fill the $pkg_dependencies variable, and then a new fake package will be created and installed,
-# and the old one will be removed.
-# If you don't have a $pkg_dependencies variable, the helper can't know what the app dependencies are.
-#
-# The app settings.yml will be modified as follows:
-# - finalpath will be changed according to the new name (but only if the existing $final_path contains the old app name)
-# - The checksums of php-fpm and nginx config files will be updated too.
-# - If there is a $db_name value, it will be changed.
-# - And, of course, the ID will be changed to the new name too.
-#
-# Finally, the $app variable will take the value of the new name.
-# The helper will set the $migration_process variable to 1 if a migration has been successfully handled.
-#
-# You have to handle by yourself all the migrations not done by this helper, like configuration or special values in settings.yml
-# Also, at the end of the upgrade script, you have to add a post_migration script to handle all the things the helper can't do during YunoHost upgrade (mostly for permission reasons),
-# especially remove the old user, move some hooks and remove the old configuration directory
-# To launch this script, you have to move it elsewhere and start it after the upgrade script.
-# `cp ../conf/$script_post_migration /tmp`
-# `(cd /tmp; echo "/tmp/$script_post_migration" | at now + 2 minutes)`
-#
-# usage: ynh_handle_app_migration migration_id migration_list
-# | arg: migration_id  - ID from which to migrate
-# | arg: migration_list - File specifying every file to move (one file per line)
-ynh_handle_app_migration ()  {
-  #=================================================
-  # LOAD SETTINGS
-  #=================================================
-
-  old_app=$YNH_APP_INSTANCE_NAME
-  local old_app_id=$YNH_APP_ID
-  local old_app_number=$YNH_APP_INSTANCE_NUMBER
-
-  # Get the id from which to migrate
-  local migration_id="$1"
-  # And the file with the paths to move
-  local migration_list="$2"
-
-  # Get the new app id in the manifest
-  local new_app_id=$(grep \"id\": ../manifest.json | cut -d\" -f4)
-  if [ $old_app_number -eq 1 ]; then
-    local new_app=$new_app_id
-  else
-    local new_app=${new_app_id}__${old_app_number}
-  fi
-
-  #=================================================
-  # CHECK IF IT HAS TO MIGRATE
-  #=================================================
-
-  migration_process=0
-
-  if [ "$old_app_id" == "$new_app_id" ]
-  then
-    # If the 2 id are the same
-    # No migration to do.
-    echo 0
-    return 0
-  else
-    if [ "$old_app_id" != "$migration_id" ]
-    then
-        # If the new app is not the authorized id, fail.
-        ynh_die "Incompatible application for migration from $old_app_id to $new_app_id"
-    fi
-
-    echo "Migrate from $old_app_id to $new_app_id" >&2
-
-    #=================================================
-    # CHECK IF THE MIGRATION CAN BE DONE
-    #=================================================
-
-    # TODO Handle multi instance apps...
-    # Check that there is not already an app installed for this id.
-    yunohost app list | grep -q 'id: $appname' \
-    && ynh_die "$new_app is already installed"
-
-    #=================================================
-    # CHECK THE LIST OF FILES TO MOVE
-    #=================================================
-
-    local temp_migration_list="$(tempfile)"
-
-    # Build the list by removing blank lines and comment lines
-    sed '/^#.*\|^$/d' "../conf/$migration_list" > "$temp_migration_list"
-
-    # Check if there is no file in the destination
-    local file_to_move=""
-    while read file_to_move
-    do
-        # Replace all occurences of $app by $new_app in each file to move.
-        local move_to_destination="${file_to_move//\$app/$new_app}"
-        test -e "$move_to_destination" && ynh_die "A file named $move_to_destination already exists."
-    done < "$temp_migration_list"
-
-    #=================================================
-    # COPY YUNOHOST SETTINGS FOR THIS APP
-    #=================================================
-
-    local settings_dir="/etc/yunohost/apps"
-    cp -a "$settings_dir/$old_app" "$settings_dir/$new_app"
-
-    # Replace the old id by the new one
-    ynh_replace_string "\(^id: .*\)$old_app" "\1$new_app" "$settings_dir/$new_app/settings.yml"
-    # INFO: There a special behavior with yunohost app setting:
-    # if the id given in argument does not match with the id
-    # stored in the config file, the config file will be purged.
-    # That's why we use sed instead of app setting here.
-    # https://github.com/YunoHost/yunohost/blob/c6b5284be8da39cf2da4e1036a730eb5e0515096/src/yunohost/app.py#L1316-L1321
-
-    # Change the label if it's simply the name of the app
-    old_label=$(ynh_app_setting_get $new_app label)
-    if [ "${old_label,,}" == "$old_app_id" ]
-    then
-        # Build the new label from the id of the app. With the first character as upper case
-        new_label=$(echo $new_app_id | cut -c1 | tr [:lower:] [:upper:])$(echo $new_app_id | cut -c2-)
-        ynh_app_setting_set $new_app label $new_label
-    fi
-
-    #=================================================
-    # MOVE FILES TO THE NEW DESTINATION
-    #=================================================
-
-    while read file_to_move
-    do
-        # Replace all occurence of $app by $new_app in each file to move.
-        move_to_destination="$(eval echo "${file_to_move//\$app/$new_app}")"
-        local real_file_to_move="$(eval echo "${file_to_move//\$app/$old_app}")"
-        echo "Move file $real_file_to_move to $move_to_destination" >&2
-        mv "$real_file_to_move" "$move_to_destination"
-    done < "$temp_migration_list"
-
-    #=================================================
-    # UPDATE SETTINGS KNOWN ENTRIES
-    #=================================================
-
-    # Replace nginx checksum
-    ynh_replace_string "\(^checksum__etc_nginx.*\)_$old_app" "\1_$new_app/" "$settings_dir/$new_app/settings.yml"
-
-    # Replace php5-fpm checksums
-    ynh_replace_string "\(^checksum__etc_php5.*[-_]\)$old_app" "\1$new_app/" "$settings_dir/$new_app/settings.yml"
-
-    # Replace final_path
-    ynh_replace_string "\(^final_path: .*\)$old_app" "\1$new_app" "$settings_dir/$new_app/settings.yml"
-
-    #=================================================
-    # MOVE THE DATABASE
-    #=================================================
-
-    db_pwd=$(ynh_app_setting_get $old_app mysqlpwd)
-    db_name=$(ynh_app_setting_get $old_app db_name)
-
-    # Check if a database exists before trying to move it
-    local mysql_root_password=$(cat $MYSQL_ROOT_PWD_FILE)
-    if [ -n "$db_name" ] && mysqlshow -u root -p$mysql_root_password | grep -q "^| $db_name"
-    then
-        new_db_name=$(ynh_sanitize_dbid $new_app)
-        echo "Rename the database $db_name to $new_db_name" >&2
-
-        local sql_dump="/tmp/${db_name}-$(date '+%s').sql"
-
-        # Dump the old database
-        ynh_mysql_dump_db "$db_name" > "$sql_dump"
-
-        # Create a new database
-        ynh_mysql_setup_db $new_db_name $new_db_name $db_pwd
-        # Then restore the old one into the new one
-        ynh_mysql_connect_as $new_db_name $db_pwd $new_db_name < "$sql_dump"
-
-        # Remove the old database
-        ynh_mysql_remove_db $db_name $db_name
-        # And the dump
-        ynh_secure_remove "$sql_dump"
-
-        # Update the value of $db_name
-        db_name=$new_db_name
-        ynh_app_setting_set $new_app db_name $db_name
-    fi
-
-    #=================================================
-    # CREATE A NEW USER
-    #=================================================
-
-    # Check if the user exists on the system
-    if ynh_system_user_exists "$old_app"
-    then
-      echo "Create a new user $new_app to replace $old_app" >&2
-      ynh_system_user_create $new_app
-    fi
-
-    #=================================================
-    # CHANGE THE FAKE DEPENDENCIES PACKAGE
-    #=================================================
-
-    # Check if a variable $pkg_dependencies exists
-    # If this variable doesn't exist, this part shall be managed in the upgrade script.
-    if [ -n "${pkg_dependencies:-}" ]
-    then
-      # Define the name of the package
-      local old_package_name="${old_app//_/-}-ynh-deps"
-      local new_package_name="${new_app//_/-}-ynh-deps"
-
-      if ynh_package_is_installed "$old_package_name"
-      then
-        # Install a new fake package
-        app=$new_app
-        ynh_install_app_dependencies $pkg_dependencies
-        # Then remove the old one
-        app=$old_app
-        ynh_remove_app_dependencies
-      fi
-    fi
-
-    #=================================================
-    # UPDATE THE ID OF THE APP
-    #=================================================
-
-    app=$new_app
-
-
-    # Set migration_process to 1 to inform that an upgrade has been made
-    migration_process=1
-  fi
-}
 
 #=================================================
 

scripts/upgrade.d/upgrade.last.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Last available Nextcloud version
-next_version="20.0.7"
+next_version="20.0.8"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="8ced82b772bf0af67d5be1323e40f977429bc0a2bcc864095efc78767500b72b"
+nextcloud_source_sha256="85746a4bda87bf754be5834cdb6489c365dc847653bab8ff3afccdaac3b356b5"