diff --git a/README.md b/README.md index f30be24..b3e40ff 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ *[Lire ce readme en français.](./README_fr.md)* > *This package allow you to install Etherpad-Lite quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* > :warning: This package installs Etherpad-Lite (without MyPads and plugins). It uses PostgreSQL as a database. >If you want to install Etherpad with the MyPads plugin, use the [Etherpad MyPads package](https://github.com/YunoHost-Apps/etherpad_mypads_ynh). diff --git a/README_fr.md b/README_fr.md index 8e95378..8f72fdc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,7 +6,7 @@ *[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer Etherpad-Lite rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/install_fr) pour savoir comment l'installer et en profiter.* +Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/install_fr) pour savoir comment l'installer et en profiter.* > :warning: Ce paquet installe Etherpad-Lite (sans MyPads et divers plugins). Il utilise PostgreSQL comme base de données. > Si vous souhaitez installer Etherpad avec MyPads, utilisez le paquet [Etherpad MyPads](https://github.com/YunoHost-Apps/etherpad_mypads_ynh). diff --git a/conf/app.src b/conf/app.src index 20e60a6..2e84639 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.12.tar.gz -SOURCE_SUM=a5d490e75aa7a710c28bcc9b88efce528713f83f70e8984b3f9bc661e997d04f +SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.13.tar.gz +SOURCE_SUM=c83052daf3b0af8aa3c19a8308e21fcbcfecca99aeb3e8047383875f855443f1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 33aee17..8ce994f 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "name": "eric_G" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 7164fba..7e89a48 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -27,7 +27,6 @@ libreoffice_app_dependencies="unoconv libreoffice-writer" # FUTURE OFFICIAL HELPERS #================================================= - ynh_maintenance_mode_ON () { # Load value of $path_url and $domain from the config if their not set if [ -z $path_url ]; then @@ -106,20 +105,3 @@ ynh_maintenance_mode_OFF () { systemctl reload nginx } - - -#================================================= - - -# Execute a command as another user -# usage: ynh_exec_as USER COMMAND [ARG ...] -ynh_exec_as() { - local USER=$1 - shift 1 - - if [[ $USER = $(whoami) ]]; then - eval "$@" - else - sudo -u "$USER" "$@" - fi -} diff --git a/scripts/restore b/scripts/restore index 5c747fd..3da0a65 100644 --- a/scripts/restore +++ b/scripts/restore @@ -99,6 +99,7 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name # Restore permissions on app files chown -R $app: $final_path +chmod o-rwx $final_path chmod 600 $final_path/credentials.json #=================================================