From 1bd015c8d59e75cc44f4e5f6afa5116c34762328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 Sep 2021 12:21:58 +0200 Subject: [PATCH 01/13] Create updater.yml --- .github/workflows/updater.yml | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml new file mode 100644 index 0000000..ca77fed --- /dev/null +++ b/.github/workflows/updater.yml @@ -0,0 +1,48 @@ +# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. +# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. +# This file should be enough by itself, but feel free to tune it to your needs. +# It calls updater.sh, which is where you should put the app-specific update steps. +name: Check for new upstream releases +on: + # Allow to manually trigger the workflow + workflow_dispatch: + # Run it every day at 6:00 UTC + schedule: + - cron: '0 6 * * *' +jobs: + updater: + runs-on: ubuntu-latest + steps: + - name: Fetch the source code + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: Run the updater script + id: run_updater + run: | + # Setting up Git user + git config --global user.name 'yunohost-bot' + git config --global user.email 'yunohost-bot@users.noreply.github.com' + # Run the updater script + /bin/bash .github/workflows/updater.sh + - name: Commit changes + id: commit + if: ${{ env.PROCEED == 'true' }} + run: | + git commit -am "Upgrade to v$VERSION" + - name: Create Pull Request + id: cpr + if: ${{ env.PROCEED == 'true' }} + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: Update to version ${{ env.VERSION }} + committer: 'yunohost-bot ' + author: 'yunohost-bot ' + signoff: false + branch: ci-auto-update-v${{ env.VERSION }} + delete-branch: true + title: 'Upgrade to version ${{ env.VERSION }}' + body: | + Upgrade to v${{ env.VERSION }} + draft: false From b53b5830e5c3521db00fe2f4c8b8c1d953e5664a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 16 Sep 2021 12:25:29 +0200 Subject: [PATCH 02/13] Add bot --- .github/workflows/updater.sh | 129 +++++++++++++++++++++++++++++++++++ conf/app.src | 1 - 2 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/updater.sh diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh new file mode 100644 index 0000000..137b156 --- /dev/null +++ b/.github/workflows/updater.sh @@ -0,0 +1,129 @@ +#!/bin/bash + +#================================================= +# PACKAGE UPDATING HELPER +#================================================= + +# This script is meant to be run by GitHub Actions +# The YunoHost-Apps organisation offers a template Action to run this script periodically +# Since each app is different, maintainers can adapt its contents so as to perform +# automatic actions when a new upstream release is detected. + +# Remove this exit command when you are ready to run this Action +#exit 1 + +#================================================= +# FETCHING LATEST RELEASE AND ITS ASSETS +#================================================= + +# Fetching information +current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') +repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') +# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) +version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) +assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) + +if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then + version=${version:1} +fi + +# Setting up the environment variables +echo "Current version: $current_version" +echo "Latest release from upstream: $version" +echo "VERSION=$version" >> $GITHUB_ENV +# For the time being, let's assume the script will fail +echo "PROCEED=false" >> $GITHUB_ENV + +# Proceed only if the retrieved version is greater than the current one +if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then + echo "::warning ::No new version available" + exit 0 +# Proceed only if a PR for this new version does not already exist +elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then + echo "::warning ::A branch already exists for this update" + exit 0 +fi + +# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) +echo "${#assets[@]} available asset(s)" + +#================================================= +# UPDATE SOURCE FILES +#================================================= + +# Here we use the $assets variable to get the resources published in the upstream release. +# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. + +# Let's loop over the array of assets URLs +for asset_url in ${assets[@]}; do + +echo "Handling asset at $asset_url" + +# Assign the asset to a source file in conf/ directory +# Here we base the source file name upon a unique keyword in the assets url (admin vs. update) +# Leave $src empty to ignore the asset +case $asset_url in + *".tar.gz"*) + src="app" + ;; +esac + +# If $src is not empty, let's process the asset +if [ ! -z "$src" ]; then + +# Create the temporary directory +tempdir="$(mktemp -d)" + +# Download sources and calculate checksum +filename=${asset_url##*/} +curl --silent -4 -L $asset_url -o "$tempdir/$filename" +checksum=$(sha256sum "$tempdir/$filename" | head -c 64) + +# Delete temporary directory +rm -rf $tempdir + +# Get extension +if [[ $filename == *.tar.gz ]]; then + extension=tar.gz +else + extension=${filename##*.} +fi + +# Rewrite source file +cat < conf/$src.src +SOURCE_URL=$asset_url +SOURCE_SUM=$checksum +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=$extension +SOURCE_IN_SUBDIR=true +EOT +echo "... conf/$src.src updated" + +else +echo "... asset ignored" +fi + +done + +#================================================= +# SPECIFIC UPDATE STEPS +#================================================= + +# Any action on the app's source code can be done. +# The GitHub Action workflow takes care of committing all changes after this script ends. + +#================================================= +# GENERIC FINALIZATION +#================================================= + +# Install moreutils, needed for sponge +sudo apt-get install moreutils + +# Replace new version in manifest +echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json + +# No need to update the README, yunohost-bot takes care of it + +# The Action will proceed only if the PROCEED environment variable is set to true +echo "PROCEED=true" >> $GITHUB_ENV +exit 0 diff --git a/conf/app.src b/conf/app.src index 3df6ff5..c72712b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,4 +3,3 @@ SOURCE_SUM=5404035675fb5ee9349d42927895bb3933590823612ebe31ca4cc523afdac49e SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= From 5a16e4cd7447a4f76bfd8e48e5ef363b17c56bf1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 16 Sep 2021 13:50:54 +0200 Subject: [PATCH 03/13] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index e7ee13c..6073ce2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -42,8 +42,6 @@ ynh_print_OFF; password=$(ynh_app_setting_get --app=$app --key=password); ynh_pr #================================================= ynh_script_progression --message="Validating restoration parameters..." -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " From c1989a97e5b38a885bb34869090333edfbb6b45a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 28 Sep 2021 22:31:37 +0200 Subject: [PATCH 04/13] Do not add authentication headers from the SSO to the admin page It conflicts with Etherpad's own login system --- scripts/install | 4 ++-- scripts/upgrade | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index fef4106..799366a 100644 --- a/scripts/install +++ b/scripts/install @@ -300,11 +300,11 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failrege ynh_script_progression --message="Configuring permissions..." --weight=2 if [ $is_public -eq 1 ]; then - ynh_permission_update --permission="main" --add="visitors" + ynh_permission_update --permission="main" --add="visitors" fi # Only the admin can access the admin panel of the app (if the app has an admin panel) -ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin +ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin --auth_header=false #================================================= # RELOAD NGINX diff --git a/scripts/upgrade b/scripts/upgrade index dfe4f87..c811618 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -135,6 +135,10 @@ fi if ! ynh_permission_exists --permission="admin"; then # Create the required permissions ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin +else + # Make sure the admin panel is not exposed to the SSO's authentication headers + # AFAIK there is no helper to check if that flag is up or not, so let's force it. + ynh_permission_url --permission="admin" --auth_header=false fi #================================================= From 54ee286a76a4258475ac6eef8eb5a6fe828e0d52 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 28 Sep 2021 23:27:43 +0200 Subject: [PATCH 05/13] Fix linter warning --- manifest.json | 10 +++------- scripts/_common.sh | 2 -- scripts/install | 8 ++------ scripts/restore | 4 +--- scripts/upgrade | 2 +- 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/manifest.json b/manifest.json index c2afcbd..836091f 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,6 @@ "website": "http://etherpad.org", "demo": "https://video.etherpad.com", "admindoc": "http://etherpad.org/doc/v1.8.14", - "userdoc": "https://yunohost.org/en/app_etherpad_mypads", "code": "https://github.com/ether/etherpad-lite" }, "license": "Apache-2.0", @@ -37,8 +36,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "sub.domain.org" + "type": "domain" }, { "name": "path", @@ -48,13 +46,11 @@ }, { "name": "admin", - "type": "user", - "example": "john" + "type": "user" }, { "name": "password", - "type": "password", - "example": "Choose a password" + "type": "password" }, { "name": "language", diff --git a/scripts/_common.sh b/scripts/_common.sh index abc4bcc..77760cc 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,6 @@ # COMMON VARIABLES #================================================= -#!/bin/bash - # Dependencies for AbiWord abiword_app_depencencies="abiword" diff --git a/scripts/install b/scripts/install index fef4106..ed9e12c 100644 --- a/scripts/install +++ b/scripts/install @@ -32,7 +32,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN -ynh_print_OFF; password=$YNH_APP_ARG_PASSWORD; ynh_print_ON +password=$YNH_APP_ARG_PASSWORD language=$YNH_APP_ARG_LANGUAGE is_public=$YNH_APP_ARG_IS_PUBLIC export=$YNH_APP_ARG_EXPORT @@ -46,12 +46,10 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." -ynh_print_OFF if [ "${#password}" -lt 8 ] || [ "${#password}" -gt 30 ] then ynh_die --message="The password must be between 8 and 30 characters." fi -ynh_print_ON final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" @@ -67,7 +65,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=3 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_print_OFF; ynh_app_setting_set --app=$app --key=password --value=$password; ynh_print_ON +ynh_app_setting_set --app=$app --key=password --value=$password ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=export --value=$export ynh_app_setting_set --app=$app --key=mypads --value=$mypads @@ -344,7 +342,6 @@ else Informations="You can access the admin panel by accessing https://$domain${path_url%/}/admin." fi -ynh_print_OFF echo "$Informations You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json. @@ -354,7 +351,6 @@ You can also find some specific actions for this app by using the experimental a If you are facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/etherpad_mypads_ynh" > mail_to_send ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=install -ynh_print_ON #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 6073ce2..592082d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -35,7 +35,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) export=$(ynh_app_setting_get --app=$app --key=export) mypads=$(ynh_app_setting_get --app=$app --key=mypads) admin=$(ynh_app_setting_get --app=$app --key=admin) -ynh_print_OFF; password=$(ynh_app_setting_get --app=$app --key=password); ynh_print_ON +password=$(ynh_app_setting_get --app=$app --key=password) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -191,14 +191,12 @@ else Informations="You can access to the admin panel, by accessing https://$domain${path_url%/}/admin." fi -ynh_print_OFF echo "$Informations You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json. If you are facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/etherpad_mypads_ynh" > mail_to_send ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=restore -ynh_print_ON #================================================= # END OF SCRIPT diff --git a/scripts/upgrade b/scripts/upgrade index dfe4f87..ccc7e5b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,7 +27,7 @@ export=$(ynh_app_setting_get --app=$app --key=export) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_print_OFF; password=$(ynh_app_setting_get --app=$app --key=password); ynh_print_ON +password=$(ynh_app_setting_get --app=$app --key=password) mypads=$(ynh_app_setting_get --app=$app --key=mypads) useldap=$(ynh_app_setting_get --app=$app --key=useldap) overwrite_settings=$(ynh_app_setting_get --app=$app --key=overwrite_settings) From afddfdf13e70f13ef21ba8ef13c326b35818dc68 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 28 Sep 2021 21:27:52 +0000 Subject: [PATCH 06/13] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 33df9ef..b2f67d9 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,6 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether ## Documentation and resources * Official app website: http://etherpad.org -* Official user documentation: https://yunohost.org/en/app_etherpad_mypads * Official admin documentation: http://etherpad.org/doc/v1.8.14 * Upstream app code repository: https://github.com/ether/etherpad-lite * YunoHost documentation for this app: https://yunohost.org/app_etherpad_mypads diff --git a/README_fr.md b/README_fr.md index 343e1b8..23d5543 100644 --- a/README_fr.md +++ b/README_fr.md @@ -59,7 +59,6 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa ## Documentations et ressources * Site officiel de l'app : http://etherpad.org -* Documentation officielle utilisateur : https://yunohost.org/en/app_etherpad_mypads * Documentation officielle de l'admin : http://etherpad.org/doc/v1.8.14 * Dépôt de code officiel de l'app : https://github.com/ether/etherpad-lite * Documentation YunoHost pour cette app : https://yunohost.org/app_etherpad_mypads From 68f9b51d74430265d7fc6bcd6902a24dea4089d9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 29 Sep 2021 08:43:01 +0200 Subject: [PATCH 07/13] Update systemd.service --- conf/systemd.service | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/conf/systemd.service b/conf/systemd.service index 8b27b8c..2e6be3b 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -14,5 +14,35 @@ StandardOutput=append:/var/log/__APP__/etherpad.log StandardError=inherit Restart=always +# Sandboxing options to harden security +# Depending on specificities of your service/app, you may need to tweak these +# .. but this should be a good baseline +# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html +NoNewPrivileges=yes +PrivateTmp=yes +PrivateDevices=yes +RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 +RestrictNamespaces=yes +RestrictRealtime=yes +DevicePolicy=closed +ProtectSystem=full +ProtectControlGroups=yes +ProtectKernelModules=yes +ProtectKernelTunables=yes +LockPersonality=yes +SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap + +# Denying access to capabilities that should not be relevant for webapps +# Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html +CapabilityBoundingSet=~CAP_RAWIO CAP_MKNOD +CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE +CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_TIME CAP_SYS_MODULE CAP_SYS_PACCT +CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK +CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM +CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG +CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE +CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW +CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG + [Install] WantedBy=multi-user.target From ee73602959dd1dbee5719a24e7f04458417b7120 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 30 Sep 2021 23:31:59 +0200 Subject: [PATCH 08/13] Update change_url --- scripts/change_url | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index 5db8dbf..7d26331 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -6,6 +6,10 @@ # IMPORT GENERIC HELPERS #================================================= +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + sleep 60 +fi + source _common.sh source /usr/share/yunohost/helpers From 0389dd8255bd87c145693f7e4e5f387aaf4688ab Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 1 Oct 2021 09:24:03 +0200 Subject: [PATCH 09/13] Fix --- .github/workflows/updater.sh | 3 --- .github/workflows/updater.yml | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 137b156..478d4a6 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -117,9 +117,6 @@ done #================================================= # Install moreutils, needed for sponge -sudo apt-get install moreutils - -# Replace new version in manifest echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json # No need to update the README, yunohost-bot takes care of it diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index ca77fed..4508553 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -41,8 +41,9 @@ jobs: author: 'yunohost-bot ' signoff: false branch: ci-auto-update-v${{ env.VERSION }} + base: testing delete-branch: true title: 'Upgrade to version ${{ env.VERSION }}' body: | - Upgrade to v${{ env.VERSION }} + Upgrade etherpad_mypads to v${{ env.VERSION }} draft: false From 83cbe9511a95d385ed2b1d6ea64ad61ab9389834 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 1 Oct 2021 12:57:06 +0200 Subject: [PATCH 10/13] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2211760..afbc54b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ Changelog ========= + +## [1.8.14~ynh2]() - 2021-10-01 + +#### Changed +* [Harden systemd]() +* [Fix login to admin page]() +* [Add autoupdate mecanism]() +* [Code clean up]() + ## [1.8.14~ynh1]() - 2021-06-04 #### Changed From 93d7e5f4efcd1b76be3b17484ecb5d91691db909 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 3 Oct 2021 19:38:33 +0200 Subject: [PATCH 11/13] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afbc54b..d7ef744 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,10 @@ Changelog ## [1.8.14~ynh2]() - 2021-10-01 #### Changed -* [Harden systemd]() -* [Fix login to admin page]() -* [Add autoupdate mecanism]() -* [Code clean up]() +* [Harden systemd](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/149/commits/5900064ea950d98c0bf28e336a5e2d85012e5e52) +* [Fix login to admin page](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/149/commits/3659fb84bcd52d16937a25998395e7889a731412) +* [Add autoupdate mecanism](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/149/commits/b53b5830e5c3521db00fe2f4c8b8c1d953e5664a) +* [Code clean up](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/149/commits/e4168cde0a8611a09ff5bfea6059bdc98a36af38) ## [1.8.14~ynh1]() - 2021-06-04 From 8166672be2b80dec41f9e3620071b7e67ed0edbb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 4 Oct 2021 19:55:20 +0200 Subject: [PATCH 12/13] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 836091f..720f65d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online editor providing collaborative editing in real-time", "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel" }, - "version": "1.8.14~ynh1", + "version": "1.8.14~ynh2", "url": "http://etherpad.org", "upstream": { "license": "Apache-2.0", From f9ee0af620a8d043b49aa3ecaf2e6928517d47e0 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 4 Oct 2021 17:55:27 +0000 Subject: [PATCH 13/13] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b2f67d9..78585e7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Online editor providing collaborative editing in real-time -**Shipped version:** 1.8.14~ynh1 +**Shipped version:** 1.8.14~ynh2 **Demo:** https://video.etherpad.com diff --git a/README_fr.md b/README_fr.md index 23d5543..bac5a16 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Éditeur en ligne fournissant l'édition collaborative en temps réel -**Version incluse :** 1.8.14~ynh1 +**Version incluse :** 1.8.14~ynh2 **Démo :** https://video.etherpad.com