From 98eb597c9ac30179715276b2f54ece0b60918465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 14 May 2023 21:24:14 +0200 Subject: [PATCH 01/41] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 32f9098..f4a590d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ cpe = "cpe:2.3:a:simplex:simplex_chat" fund = "https://opencollective.com/simplex-chat" [integration] -yunohost = ">= 11.1.18" +yunohost = ">= 11.1.19" architectures = ["amd64"] multi_instance = false ldap = "not_relevant" From 8dbc6950a515aa282b70b463a286e10ee27fb2aa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 May 2023 12:03:35 +0000 Subject: [PATCH 02/41] 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 9769761..6633016 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. -**Shipped version:** 5.0.0~ynh1 +**Shipped version:** 5.0.0~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 35c6a26..91d9689 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'utilisateur d'aucune sorte - 100 % privée de par sa conception ! -**Version incluse :** 5.0.0~ynh1 +**Version incluse :** 5.0.0~ynh2 ## Captures d’écran From 8f304ddbd34e5ca8966f504ef9e1a13113e5d1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 23 May 2023 19:34:10 +0200 Subject: [PATCH 03/41] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3e2f086..67bc3f8 100755 --- a/scripts/install +++ b/scripts/install @@ -41,7 +41,7 @@ public_ip4="$(curl -s ip.yunohost.org)" || true ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4 pushd "$install_dir" - ./smp-server init --no-password --ip $public_ip4 -y + ./smp-server init --no-password --ip $public_ip4 --store-log --yes ./xftp-server init --ip $public_ip4 --quota '20gb' --store-log --path $data_dir popd From 22c17083a453e61593b0aebc9f557d0714bade25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 23 May 2023 19:35:50 +0200 Subject: [PATCH 04/41] Update backup --- scripts/backup | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/backup b/scripts/backup index 9fae3cc..336583e 100755 --- a/scripts/backup +++ b/scripts/backup @@ -21,7 +21,11 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" -ynh_backup --src_path="/etc/opt/simplex" +ynh_secure_remove --file="/etc/opt/simplex" +ynh_secure_remove --file="/etc/opt/simplex-xftp" + +ynh_secure_remove --file="/var/opt/simplex" +ynh_secure_remove --file="/var/opt/simplex-xftp" #================================================= # BACKUP SYSTEMD From cb1e18a57f7cfccc502bbb22dd08b6953de50c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 23 May 2023 19:36:14 +0200 Subject: [PATCH 05/41] Update restore --- scripts/restore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index fcc6eb2..a87faaf 100755 --- a/scripts/restore +++ b/scripts/restore @@ -38,7 +38,12 @@ chown -R $app:www-data "$data_dir" ynh_script_progression --message="Restoring system configurations related to $app..." --weight=4 ynh_restore_file --origin_path="/etc/opt/simplex" -chown -R $app:$app "/etc/opt/simplex" +ynh_restore_file --origin_path="/etc/opt/simplex-xftp" + +ynh_restore_file --origin_path="/var/opt/simplex" +ynh_restore_file --origin_path="/var/opt/simplex-xftp" + +chown -R $app:$app /var/opt/simplex-xftp /var/opt/simplex /etc/opt/simplex-xftp /etc/opt/simplex ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet From 73ef481408d68e93ca963730a729db1ae9746060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 23 May 2023 22:42:28 +0200 Subject: [PATCH 06/41] Update backup --- scripts/backup | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/backup b/scripts/backup index 336583e..92ad672 100755 --- a/scripts/backup +++ b/scripts/backup @@ -21,11 +21,11 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" -ynh_secure_remove --file="/etc/opt/simplex" -ynh_secure_remove --file="/etc/opt/simplex-xftp" +ynh_backup --src_path="/etc/opt/simplex" +ynh_backup --src_path="/etc/opt/simplex-xftp" -ynh_secure_remove --file="/var/opt/simplex" -ynh_secure_remove --file="/var/opt/simplex-xftp" +ynh_backup --src_path="/var/opt/simplex" +ynh_backup --src_path="/var/opt/simplex-xftp" #================================================= # BACKUP SYSTEMD From 776f69e5f3f2dbef2fff0d7595eb8ce1518fb0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 23 May 2023 22:48:57 +0200 Subject: [PATCH 07/41] Update upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 54ae51d..8836b1a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,12 +70,12 @@ chmod +x $install_dir/xftp-server #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +#ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/file-server.ini" --destination="/etc/opt/simplex-xftp/file-server.ini" +#ynh_add_config --template="../conf/file-server.ini" --destination="/etc/opt/simplex-xftp/file-server.ini" -chmod 400 "/etc/opt/simplex-xftp/file-server.ini" -chown $app:$app "/etc/opt/simplex-xftp/file-server.ini" +#chmod 400 "/etc/opt/simplex-xftp/file-server.ini" +#chown $app:$app "/etc/opt/simplex-xftp/file-server.ini" #================================================= # REAPPLY SYSTEM CONFIGURATIONS From 65838035e36648c10a932ce1d7875134b1d60662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 24 May 2023 10:55:49 +0200 Subject: [PATCH 08/41] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 52202f3..d557ed6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -13,7 +13,7 @@ maintainers = ["eric_G"] license = "AGPL-3.0" website = "https://simplex.chat/" admindoc = "https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md" -code = "https://github.com/simplex-chat/simplex-chat" +code = "https://github.com/simplex-chat/simplexmq" cpe = "cpe:2.3:a:simplex:simplex_chat" fund = "https://opencollective.com/simplex-chat" From c94d6dffebd4831e0bf7e1bc4937e2ff23255fc2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 24 May 2023 08:55:54 +0000 Subject: [PATCH 09/41] 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 6633016..8f329fd 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ SimpleX - the first messaging platform operating without user identifiers of any * Official app website: * Official admin documentation: -* Upstream app code repository: +* Upstream app code repository: * YunoHost documentation for this app: * Report a bug: diff --git a/README_fr.md b/README_fr.md index 91d9689..58db5e0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'uti * Site officiel de l’app : * Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : From ef5e5ff55b49df230215462da166ac52d7b9f44a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 24 May 2023 10:58:02 +0200 Subject: [PATCH 10/41] Update systemd.service --- conf/systemd.service | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/systemd.service b/conf/systemd.service index 0db7783..2c11a46 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,6 @@ [Unit] Description=SimpleX: Messaging Protocol Server +Documentation=https://simplex.chat/docs/server.html After=network.target [Service] From e8f6cc958a4ddf3381360860334ce59fa18119fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 May 2023 23:39:20 +0200 Subject: [PATCH 11/41] Update manifest.toml --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index d557ed6..f657ce4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "SimpleX" description.en = "Messaging platform operating without user identifiers" description.fr = "Plate-forme de messagerie fonctionnant sans identifiants d'utilisateurs" -version = "5.0.0~ynh2" +version = "5.1.0~ynh1" maintainers = ["eric_G"] @@ -33,8 +33,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.0.0.1/smp-server_amd64" - amd64.sha256 = "fd5c88355496ae09aad7dba582be99307813a18550d870b742c12b8a17f41b71" + amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.1.0/smp-server_amd64" + amd64.sha256 = "017071d4f6126c8aba1c11bc6624a32ec78c3e337ee04ad5c0c508eeb827f5ef" arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.0.0.1/smp-server_arm64" arm64.sha256 = "b59f26e4ad1a5a8b1e0e6d564c01a713d26c4b01dd6f1e27dea8961df2468002" in_subdir = false @@ -42,8 +42,8 @@ ram.runtime = "50M" rename = "smp-server" [resources.sources.xftp] - amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.0.0.1/xftp-server_amd64" - amd64.sha256 = "24535308621ff9e46d4630fde74cc2f1c8892f1ce1230ce6a538892be64d34f6" + amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.1.0/xftp-server_amd64" + amd64.sha256 = "4c58fe2944cb448fecc70a07e6b3a01d06964da344108019cc9e3eb015c8cbbf" arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.0.0.1/xftp-server_arm64" arm64.sha256 = "e48e2a57e1992616e33be2b1bda564a978f8bdef3a5e30dce55712bc66278348" in_subdir = false From c12ceec4bf275c2e16d8b221e86337e77e255169 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 May 2023 21:39:24 +0000 Subject: [PATCH 12/41] 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 8f329fd..1cdca24 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. -**Shipped version:** 5.0.0~ynh2 +**Shipped version:** 5.1.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 58db5e0..0a92191 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'utilisateur d'aucune sorte - 100 % privée de par sa conception ! -**Version incluse :** 5.0.0~ynh2 +**Version incluse :** 5.1.0~ynh1 ## Captures d’écran From 956dd45fd6fae4f6aa0580c80a0a6f88e886ddce Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 30 May 2023 09:18:14 +0200 Subject: [PATCH 13/41] fix --- scripts/install | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 40 +++++++++++++++++++++++++--------------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/scripts/install b/scripts/install index 67bc3f8..165b160 100755 --- a/scripts/install +++ b/scripts/install @@ -84,8 +84,8 @@ yunohost service add xftp --description="Messaging platform" --log="/var/log/$ap ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -ynh_systemd_action --service_name="xftp" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +ynh_systemd_action --service_name="xftp" --action="start" --log_path="systemd" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index a87faaf..52cb464 100755 --- a/scripts/restore +++ b/scripts/restore @@ -58,8 +58,8 @@ yunohost service add xftp --description="Messaging platform" --log="/var/log/$ap #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -ynh_systemd_action --service_name=xftp --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +ynh_systemd_action --service_name=xftp --action="start" --log_path="systemd" #================================================= # END OF SCRIPT diff --git a/scripts/upgrade b/scripts/upgrade index 8836b1a..9abe129 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,17 +15,6 @@ source /usr/share/yunohost/helpers upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# STORE SETTINGS -#================================================= - -public_ip4="$(curl -s ip.yunohost.org)" || true -fingerprint=$(cat /etc/opt/simplex/fingerprint) -xftp_fingerprint=$(cat /etc/opt/simplex-xftp/fingerprint) -ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4 -ynh_app_setting_set --app=$app --key=fingerprint --value=$fingerprint -ynh_app_setting_set --app=$app --key=xftp_fingerprint --value=$xftp_fingerprint - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -33,8 +22,8 @@ ynh_app_setting_set --app=$app --key=xftp_fingerprint --value=$xftp_fingerprint #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" -ynh_systemd_action --service_name=xftp --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=xftp --action="stop" --log_path="systemd" #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -67,6 +56,27 @@ chown -R $app:www-data "$install_dir" chmod +x $install_dir/smp-server chmod +x $install_dir/xftp-server +#================================================= +# SPECIFIC SETUP +#================================================= + +public_ip4="$(curl -s ip.yunohost.org)" || true +ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4 + +if [ -z "/etc/opt/simplex-xftp/fingerprint" ]; then + pushd "$install_dir" + ./xftp-server init --ip $public_ip4 --quota '20gb' --store-log --path $data_dir + popd + + xftp_fingerprint=$(cat /etc/opt/simplex-xftp/fingerprint) + ynh_app_setting_set --app=$app --key=xftp_fingerprint --value=$xftp_fingerprint + + ynh_replace_string --match_string="port: 443" --replace_string="port: $port_xftp" --target_file="/etc/opt/simplex-xftp/file-server.ini" + + chown -R $app:$app "/etc/opt/simplex" + chown -R $app:$app "/etc/opt/simplex-xftp" +fi + #================================================= # ADD A CONFIGURATION #================================================= @@ -94,8 +104,8 @@ yunohost service add xftp --description="Messaging platform" --log="/var/log/$ap #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -ynh_systemd_action --service_name=xftp --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +ynh_systemd_action --service_name=xftp --action="start" --log_path="systemd" #================================================= # END OF SCRIPT From 27f0445ded135407828a7b6a75d46e7a78cfe200 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 30 May 2023 09:19:53 +0200 Subject: [PATCH 14/41] Update xftp.systemd.service --- conf/xftp.systemd.service | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/xftp.systemd.service b/conf/xftp.systemd.service index 744dd01..12c0092 100644 --- a/conf/xftp.systemd.service +++ b/conf/xftp.systemd.service @@ -9,7 +9,6 @@ User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ ExecStart=__INSTALL_DIR__/xftp-server start +RTS -N -RTS -#ExecStopPost=/usr/bin/env sh -c '[ -e "/var/opt/simplex-xftp/file-server-store.log" ] && cp "/var/opt/simplex-xftp/file-server-store.log" "/var/opt/simplex-xftp/file-server-store.log.$(date +'%FT%T')"' LimitNOFILE=65535 KillSignal=SIGINT TimeoutStopSec=infinity From f2dd7a96279e1ea7efb4bf366359e53c5e7aedf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 08:58:45 +0200 Subject: [PATCH 15/41] Update remove --- scripts/remove | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/remove b/scripts/remove index 4d2c80a..b20c4ca 100755 --- a/scripts/remove +++ b/scripts/remove @@ -38,9 +38,6 @@ ynh_remove_systemd_config --service=xftp ynh_secure_remove --file="/etc/opt/simplex" ynh_secure_remove --file="/etc/opt/simplex-xftp" -ynh_secure_remove --file="/var/opt/simplex" -ynh_secure_remove --file="/var/opt/simplex-xftp" - #================================================= # END OF SCRIPT #================================================= From ed9bce3f0bdbc34639fc993aa7319009a498d6f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 09:08:39 +0200 Subject: [PATCH 16/41] fix --- scripts/backup | 3 --- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/backup b/scripts/backup index 92ad672..4d66d2e 100755 --- a/scripts/backup +++ b/scripts/backup @@ -24,9 +24,6 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="/etc/opt/simplex" ynh_backup --src_path="/etc/opt/simplex-xftp" -ynh_backup --src_path="/var/opt/simplex" -ynh_backup --src_path="/var/opt/simplex-xftp" - #================================================= # BACKUP SYSTEMD #================================================= diff --git a/scripts/install b/scripts/install index 165b160..3acb56b 100755 --- a/scripts/install +++ b/scripts/install @@ -25,8 +25,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir" --source_id="xftp" -mkdir -p /var/opt/simplex-xftp /var/opt/simplex /etc/opt/simplex-xftp /etc/opt/simplex -chown -R $app:$app /var/opt/simplex-xftp /var/opt/simplex /etc/opt/simplex-xftp /etc/opt/simplex +mkdir -p /etc/opt/simplex-xftp /etc/opt/simplex #/var/opt/simplex-xftp /var/opt/simplex +chown -R $app:$app /etc/opt/simplex-xftp /etc/opt/simplex #/var/opt/simplex-xftp /var/opt/simplex chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index 9abe129..809e97f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,8 +48,8 @@ then ynh_setup_source --dest_dir="$install_dir" --source_id="xftp" fi -mkdir -p /var/opt/simplex-xftp /etc/opt/simplex-xftp -chown -R $app:$app /var/opt/simplex-xftp /etc/opt/simplex-xftp +mkdir -p /etc/opt/simplex-xftp #/var/opt/simplex-xftp +chown -R $app:$app /etc/opt/simplex-xftp #/var/opt/simplex-xftp chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From 18127c7eaf08f48b9ecfb8e2c6d496e149a35811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 09:22:14 +0200 Subject: [PATCH 17/41] fix --- scripts/backup | 2 ++ scripts/remove | 2 ++ scripts/upgrade | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/backup b/scripts/backup index 4d66d2e..04a1a6c 100755 --- a/scripts/backup +++ b/scripts/backup @@ -23,6 +23,8 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="/etc/opt/simplex" ynh_backup --src_path="/etc/opt/simplex-xftp" +ynh_backup --src_path="/var/opt/simplex" +ynh_backup --src_path="/var/opt/simplex-xftp" #================================================= # BACKUP SYSTEMD diff --git a/scripts/remove b/scripts/remove index b20c4ca..0284b9b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -37,6 +37,8 @@ ynh_remove_systemd_config --service=xftp # Remove the app directory securely ynh_secure_remove --file="/etc/opt/simplex" ynh_secure_remove --file="/etc/opt/simplex-xftp" +ynh_secure_remove --file="/var/opt/simplex" +ynh_secure_remove --file="/var/opt/simplex-xftp" #================================================= # END OF SCRIPT diff --git a/scripts/upgrade b/scripts/upgrade index 809e97f..3a67aba 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,8 +48,8 @@ then ynh_setup_source --dest_dir="$install_dir" --source_id="xftp" fi -mkdir -p /etc/opt/simplex-xftp #/var/opt/simplex-xftp -chown -R $app:$app /etc/opt/simplex-xftp #/var/opt/simplex-xftp +mkdir -p /etc/opt/simplex-xftp /var/opt/simplex-xftp +chown -R $app:$app /etc/opt/simplex-xftp /var/opt/simplex-xftp chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From 02c7d0b439fb96d903bf4e9e86a4a1fb11527e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 09:34:25 +0200 Subject: [PATCH 18/41] fix --- manifest.toml | 2 +- scripts/install | 4 ++-- scripts/upgrade | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index f657ce4..ee4ee89 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ cpe = "cpe:2.3:a:simplex:simplex_chat" fund = "https://opencollective.com/simplex-chat" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.1.21" architectures = ["amd64", "arm64"] multi_instance = false ldap = "not_relevant" diff --git a/scripts/install b/scripts/install index 3acb56b..3764039 100755 --- a/scripts/install +++ b/scripts/install @@ -25,8 +25,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir" --source_id="xftp" -mkdir -p /etc/opt/simplex-xftp /etc/opt/simplex #/var/opt/simplex-xftp /var/opt/simplex -chown -R $app:$app /etc/opt/simplex-xftp /etc/opt/simplex #/var/opt/simplex-xftp /var/opt/simplex +mkdir -p /etc/opt/simplex-xftp /etc/opt/simplex /var/opt/simplex-xftp /var/opt/simplex +chown -R $app:$app /etc/opt/simplex-xftp /etc/opt/simplex /var/opt/simplex-xftp /var/opt/simplex chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index 3a67aba..2f0552e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -73,7 +73,6 @@ if [ -z "/etc/opt/simplex-xftp/fingerprint" ]; then ynh_replace_string --match_string="port: 443" --replace_string="port: $port_xftp" --target_file="/etc/opt/simplex-xftp/file-server.ini" - chown -R $app:$app "/etc/opt/simplex" chown -R $app:$app "/etc/opt/simplex-xftp" fi From 7a1b062bc72f5ad5071bc11a3f96a65a0f22ca8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 10:08:08 +0200 Subject: [PATCH 19/41] Update upgrade --- scripts/upgrade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2f0552e..62a32f3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,7 +48,7 @@ then ynh_setup_source --dest_dir="$install_dir" --source_id="xftp" fi -mkdir -p /etc/opt/simplex-xftp /var/opt/simplex-xftp +#mkdir -p /etc/opt/simplex-xftp /var/opt/simplex-xftp chown -R $app:$app /etc/opt/simplex-xftp /var/opt/simplex-xftp chmod -R o-rwx "$install_dir" @@ -63,7 +63,8 @@ chmod +x $install_dir/xftp-server public_ip4="$(curl -s ip.yunohost.org)" || true ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4 -if [ -z "/etc/opt/simplex-xftp/fingerprint" ]; then +if [ -z "/etc/opt/simplex-xftp" ]; then + mkdir -p "/etc/opt/simplex-xftp" pushd "$install_dir" ./xftp-server init --ip $public_ip4 --quota '20gb' --store-log --path $data_dir popd From b415ce09de1626ee5118f634ad057de249426406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 10:30:52 +0200 Subject: [PATCH 20/41] Update upgrade --- scripts/upgrade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 62a32f3..12ad5d8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,7 +49,7 @@ then fi #mkdir -p /etc/opt/simplex-xftp /var/opt/simplex-xftp -chown -R $app:$app /etc/opt/simplex-xftp /var/opt/simplex-xftp +#chown -R $app:$app /etc/opt/simplex-xftp /var/opt/simplex-xftp chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -74,7 +74,8 @@ if [ -z "/etc/opt/simplex-xftp" ]; then ynh_replace_string --match_string="port: 443" --replace_string="port: $port_xftp" --target_file="/etc/opt/simplex-xftp/file-server.ini" - chown -R $app:$app "/etc/opt/simplex-xftp" + #chown -R $app:$app "/etc/opt/simplex-xftp" + chown -R $app:$app /etc/opt/simplex-xftp /var/opt/simplex-xftp fi #================================================= From d615232122c01ce57f69b25d7b82ca7647a1a041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 10:32:09 +0200 Subject: [PATCH 21/41] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 12ad5d8..7993507 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -63,7 +63,7 @@ chmod +x $install_dir/xftp-server public_ip4="$(curl -s ip.yunohost.org)" || true ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4 -if [ -z "/etc/opt/simplex-xftp" ]; then +#if [ -z "/etc/opt/simplex-xftp" ]; then mkdir -p "/etc/opt/simplex-xftp" pushd "$install_dir" ./xftp-server init --ip $public_ip4 --quota '20gb' --store-log --path $data_dir @@ -76,7 +76,7 @@ if [ -z "/etc/opt/simplex-xftp" ]; then #chown -R $app:$app "/etc/opt/simplex-xftp" chown -R $app:$app /etc/opt/simplex-xftp /var/opt/simplex-xftp -fi +#fi #================================================= # ADD A CONFIGURATION From 23e33ad350eb85ab4cc79a935e27a3241f071dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 10:36:58 +0200 Subject: [PATCH 22/41] Update upgrade --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7993507..e944428 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -63,7 +63,8 @@ chmod +x $install_dir/xftp-server public_ip4="$(curl -s ip.yunohost.org)" || true ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4 -#if [ -z "/etc/opt/simplex-xftp" ]; then +if [ ! -f /etc/opt/simplex-xftp ]; then + mkdir -p "/etc/opt/simplex-xftp" pushd "$install_dir" ./xftp-server init --ip $public_ip4 --quota '20gb' --store-log --path $data_dir @@ -74,9 +75,8 @@ ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4 ynh_replace_string --match_string="port: 443" --replace_string="port: $port_xftp" --target_file="/etc/opt/simplex-xftp/file-server.ini" - #chown -R $app:$app "/etc/opt/simplex-xftp" chown -R $app:$app /etc/opt/simplex-xftp /var/opt/simplex-xftp -#fi +fi #================================================= # ADD A CONFIGURATION From b2e3620da85b6f6197e0bb0ed020b1ab9bd4d9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 10:38:53 +0200 Subject: [PATCH 23/41] fix --- scripts/upgrade | 3 --- tests.toml | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index e944428..11a9a00 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,9 +48,6 @@ then ynh_setup_source --dest_dir="$install_dir" --source_id="xftp" fi -#mkdir -p /etc/opt/simplex-xftp /var/opt/simplex-xftp -#chown -R $app:$app /etc/opt/simplex-xftp /var/opt/simplex-xftp - chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chmod +x $install_dir/smp-server diff --git a/tests.toml b/tests.toml index 3b883e2..9c38b61 100644 --- a/tests.toml +++ b/tests.toml @@ -7,3 +7,9 @@ test_format = 1.0 # ------------ exclude = ["change_url"] + + # ------------------------------- + # Commits to test upgrade from + # ------------------------------- + + test_upgrade_from.00a1a6e7.name = "Upgrade from 5.4" From 9c151c6f00916de203f840870a348c148c2b65dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 10:39:28 +0200 Subject: [PATCH 24/41] Update tests.toml --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 9c38b61..34e157d 100644 --- a/tests.toml +++ b/tests.toml @@ -12,4 +12,4 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.00a1a6e7.name = "Upgrade from 5.4" + test_upgrade_from.5f452d7acda69f4897ce1344678d0f59ccb162ca.name = "Upgrade from 5.0.0~ynh2" From 370b824d0be523565c67ed5f79510b721ae0c001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 10:49:22 +0200 Subject: [PATCH 25/41] Update upgrade --- scripts/upgrade | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 11a9a00..6c762e7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,12 +57,13 @@ chmod +x $install_dir/xftp-server # SPECIFIC SETUP #================================================= -public_ip4="$(curl -s ip.yunohost.org)" || true -ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4 - if [ ! -f /etc/opt/simplex-xftp ]; then mkdir -p "/etc/opt/simplex-xftp" + + public_ip4="$(curl -s ip.yunohost.org)" || true + ynh_app_setting_set --app=$app --key=public_ip4 --value=$public_ip4 + pushd "$install_dir" ./xftp-server init --ip $public_ip4 --quota '20gb' --store-log --path $data_dir popd From 96981e50d3dc2cffa750a18f1840a0dc184d2776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 11:14:30 +0200 Subject: [PATCH 26/41] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6c762e7..6df7ce4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,7 +57,7 @@ chmod +x $install_dir/xftp-server # SPECIFIC SETUP #================================================= -if [ ! -f /etc/opt/simplex-xftp ]; then +if [ ! -d /etc/opt/simplex-xftp ]; then mkdir -p "/etc/opt/simplex-xftp" From 0c027ce9e9c30c05a3cb1884906700dcb00b429b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 31 Oct 2023 14:35:12 +0000 Subject: [PATCH 27/41] 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 1cdca24..d14856e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ SimpleX - the first messaging platform operating without user identifiers of any * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 0a92191..61bdfe5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'uti * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From bf20dca513a6200e85e85b103e35b8d192589d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 Nov 2023 13:47:30 +0100 Subject: [PATCH 28/41] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ee4ee89..e60c19f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ cpe = "cpe:2.3:a:simplex:simplex_chat" fund = "https://opencollective.com/simplex-chat" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = ["amd64", "arm64"] multi_instance = false ldap = "not_relevant" From 147aa7f45a2afba3eaadf2238791e94c761db937 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 9 Nov 2023 12:47:36 +0000 Subject: [PATCH 29/41] 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 1cdca24..d14856e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ SimpleX - the first messaging platform operating without user identifiers of any * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 0a92191..61bdfe5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'uti * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 0253dcfc5c1fdf7fbb92a1beefa700b83213cae8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 18 Nov 2023 11:28:32 +0100 Subject: [PATCH 30/41] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index e60c19f..689a15c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -35,8 +35,8 @@ ram.runtime = "50M" [resources.sources.main] amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.1.0/smp-server_amd64" amd64.sha256 = "017071d4f6126c8aba1c11bc6624a32ec78c3e337ee04ad5c0c508eeb827f5ef" - arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.0.0.1/smp-server_arm64" - arm64.sha256 = "b59f26e4ad1a5a8b1e0e6d564c01a713d26c4b01dd6f1e27dea8961df2468002" + arm64.url = "https://github.com/skyuk3000/simplex_ynh/releases/download/5.2.0/smp-server_arm64" + arm64.sha256 = "2a5a6f34230443212d3166ec7c706440eb2748c6cd2b4e47526a4ccf45717584" in_subdir = false extract = false rename = "smp-server" @@ -44,8 +44,8 @@ ram.runtime = "50M" [resources.sources.xftp] amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.1.0/xftp-server_amd64" amd64.sha256 = "4c58fe2944cb448fecc70a07e6b3a01d06964da344108019cc9e3eb015c8cbbf" - arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.0.0.1/xftp-server_arm64" - arm64.sha256 = "e48e2a57e1992616e33be2b1bda564a978f8bdef3a5e30dce55712bc66278348" + arm64.url = "https://github.com/skyuk3000/simplex_ynh/releases/download/5.2.0/xftp-server_arm64" + arm64.sha256 = "a8f4118610efca9bd7b2d687c04f95a9cf52114d1941c8f94441d80c1c04d92a" in_subdir = false extract = false rename = "xftp-server" From 7ced43e743f4dbcfd2dc217499267a66822397f0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 18 Nov 2023 11:28:51 +0100 Subject: [PATCH 31/41] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index 689a15c..183509e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -21,8 +21,11 @@ fund = "https://opencollective.com/simplex-chat" yunohost = ">= 11.2" architectures = ["amd64", "arm64"] multi_instance = false + ldap = "not_relevant" + sso = "not_relevant" + disk = "50M" ram.build = "150M" ram.runtime = "50M" From b990951b70916035e967ac56f82f4dc90c183c0e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 18 Nov 2023 11:29:10 +0100 Subject: [PATCH 32/41] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 183509e..a235aa5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "SimpleX" description.en = "Messaging platform operating without user identifiers" description.fr = "Plate-forme de messagerie fonctionnant sans identifiants d'utilisateurs" -version = "5.1.0~ynh1" +version = "5.1.0~ynh2" maintainers = ["eric_G"] From e6ef0c3e987a3ba928f88e0d1763bc89d17646b7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 18 Nov 2023 10:29:15 +0000 Subject: [PATCH 33/41] 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 d14856e..5f42392 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. -**Shipped version:** 5.1.0~ynh1 +**Shipped version:** 5.1.0~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 61bdfe5..57f9dd1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'utilisateur d'aucune sorte - 100 % privée de par sa conception ! -**Version incluse :** 5.1.0~ynh1 +**Version incluse :** 5.1.0~ynh2 ## Captures d’écran From 927bc432eb2065da1e022038a3fe1f242ab7a0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:10:43 +0100 Subject: [PATCH 34/41] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index a235aa5..612b1a4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Plate-forme de messagerie fonctionnant sans identifiants d'uti version = "5.1.0~ynh2" -maintainers = ["eric_G"] +maintainers = [] [upstream] license = "AGPL-3.0" From cf862c7053b7d5d31c9f0589a1759b707d6dd777 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 29 Mar 2024 07:23:17 +0100 Subject: [PATCH 35/41] Auto-update README --- ALL_README.md | 6 ++++++ README.md | 24 ++++++++++++------------ README_fr.md | 30 +++++++++++++++--------------- README_gl.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ README_it.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 127 insertions(+), 27 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_gl.md create mode 100644 README_it.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..3d6c579 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,6 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [Leggi il “README” in italiano](README_it.md) diff --git a/README.md b/README.md index 5f42392..5a1ae50 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install SimpleX with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README is other languages.](./ALL_README.md)* -> *This package allows you to install SimpleX quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install SimpleX quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -26,19 +26,19 @@ SimpleX - the first messaging platform operating without user identifiers of any ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug or sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug diff --git a/README_fr.md b/README_fr.md index 57f9dd1..0b85afb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # SimpleX pour YunoHost @@ -9,16 +9,16 @@ It shall NOT be edited by hand. [![Installer SimpleX avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer SimpleX rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer SimpleX rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'utilisateur d'aucune sorte - 100 % privée de par sa conception ! -**Version incluse :** 5.1.0~ynh2 +**Version incluse :** 5.1.0~ynh2 ## Captures d’écran @@ -26,22 +26,22 @@ SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'uti ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug ou sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..57b8253 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,47 @@ + + +# SimpleX para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/simplex.svg)](https://dash.yunohost.org/appci/app/simplex) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/simplex.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/simplex.maintain.svg) + +[![Instalar SimpleX con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar SimpleX de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. + +**Versión proporcionada:** 5.1.0~ynh2 + +## Capturas de pantalla + +![Captura de pantalla de SimpleX](./doc/screenshots/conversation.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug +ou +sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_it.md b/README_it.md new file mode 100644 index 0000000..208fe34 --- /dev/null +++ b/README_it.md @@ -0,0 +1,47 @@ + + +# SimpleX per YunoHost + +[![Livello di integrazione](https://dash.yunohost.org/integration/simplex.svg)](https://dash.yunohost.org/appci/app/simplex) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/simplex.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/simplex.maintain.svg) + +[![Installa SimpleX con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex) + +*[Leggi questo README in altre lingue.](./ALL_README.md)* + +> *Questo pacchetto ti permette di installare SimpleX su un server YunoHost in modo semplice e veloce.* +> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.* + +## Panoramica + +SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. + +**Versione pubblicata:** 5.1.0~ynh2 + +## Screenshot + +![Screenshot di SimpleX](./doc/screenshots/conversation.png) + +## Documentazione e risorse + +- Sito web ufficiale dell’app: +- Documentazione ufficiale per gli amministratori: +- Repository upstream del codice dell’app: +- Store di YunoHost: +- Segnala un problema: + +## Informazioni per sviluppatori + +Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing). + +Per provare la branch di `testing`, si prega di procedere in questo modo: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug +o +sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug +``` + +**Maggiori informazioni riguardo il pacchetto di quest’app:** From 4cd3803681800e7683cfcabf85d8568ba0ed1c58 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 5 May 2024 19:01:08 +0000 Subject: [PATCH 36/41] Auto-update READMEs --- ALL_README.md | 3 ++- README.md | 2 +- README_eu.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 README_eu.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..a01b345 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,7 @@ # All available README files by language - [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) -- [Leggi il “README” in italiano](README_it.md) +- [阅读中文(简体)的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 5a1ae50..ef96fab 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install SimpleX with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install SimpleX quickly and simply on a YunoHost server.* > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..6b768b8 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,47 @@ + + +# SimpleX YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/simplex.svg)](https://dash.yunohost.org/appci/app/simplex) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/simplex.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/simplex.maintain.svg) + +[![Instalatu SimpleX YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek SimpleX YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. + +**Paketatutako bertsioa:** 5.1.0~ynh2 + +## Pantaila-argazkiak + +![SimpleX(r)en pantaila-argazkia](./doc/screenshots/conversation.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug +edo +sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..a411f86 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,47 @@ + + +# YunoHost 的 SimpleX + +[![集成程度](https://dash.yunohost.org/integration/simplex.svg)](https://dash.yunohost.org/appci/app/simplex) ![工作状态](https://ci-apps.yunohost.org/ci/badges/simplex.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/simplex.maintain.svg) + +[![使用 YunoHost 安装 SimpleX](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplex) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包,您可以在 YunoHost 服务器上快速、简单地安装 SimpleX。* +> *如果您还没有 YunoHost,请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. + +**分发版本:** 5.1.0~ynh2 + +## 截图 + +![SimpleX 的截图](./doc/screenshots/conversation.png) + +## 文档与资源 + +- 官方应用网站: +- 官方管理文档: +- 上游应用代码库: +- YunoHost 商店: +- 报告 bug: + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/simplex_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支,请这样操作: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug +或 +sudo yunohost app upgrade simplex -u https://github.com/YunoHost-Apps/simplex_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息:** From 5b14a80c59fca2a63d9b5506503725f3d86e3a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 5 May 2024 21:02:22 +0200 Subject: [PATCH 37/41] Update upgrade --- scripts/upgrade | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6df7ce4..e869c8d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -38,15 +32,11 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" - ynh_setup_source --dest_dir="$install_dir" --source_id="xftp" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" +ynh_setup_source --dest_dir="$install_dir" --source_id="xftp" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From a54e221d6292c2cd86a38d1fcecb193d3d613c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 5 May 2024 22:31:05 +0200 Subject: [PATCH 38/41] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 612b1a4..34d9dd0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "SimpleX" description.en = "Messaging platform operating without user identifiers" description.fr = "Plate-forme de messagerie fonctionnant sans identifiants d'utilisateurs" -version = "5.1.0~ynh2" +version = "5.6.2~ynh1" maintainers = [] @@ -36,7 +36,7 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.1.0/smp-server_amd64" + amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.6.2/smp-server_amd64" amd64.sha256 = "017071d4f6126c8aba1c11bc6624a32ec78c3e337ee04ad5c0c508eeb827f5ef" arm64.url = "https://github.com/skyuk3000/simplex_ynh/releases/download/5.2.0/smp-server_arm64" arm64.sha256 = "2a5a6f34230443212d3166ec7c706440eb2748c6cd2b4e47526a4ccf45717584" @@ -45,7 +45,7 @@ ram.runtime = "50M" rename = "smp-server" [resources.sources.xftp] - amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.1.0/xftp-server_amd64" + amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.6.2/xftp-server_amd64" amd64.sha256 = "4c58fe2944cb448fecc70a07e6b3a01d06964da344108019cc9e3eb015c8cbbf" arm64.url = "https://github.com/skyuk3000/simplex_ynh/releases/download/5.2.0/xftp-server_arm64" arm64.sha256 = "a8f4118610efca9bd7b2d687c04f95a9cf52114d1941c8f94441d80c1c04d92a" From 624cba66eebbbd32e1fd4c0f8d3456cc214a7fdd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 5 May 2024 20:31:10 +0000 Subject: [PATCH 39/41] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ef96fab..45ebb4f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. -**Shipped version:** 5.1.0~ynh2 +**Shipped version:** 5.6.2~ynh1 ## Screenshots diff --git a/README_eu.md b/README_eu.md index 6b768b8..3fa64f1 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. -**Paketatutako bertsioa:** 5.1.0~ynh2 +**Paketatutako bertsioa:** 5.6.2~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 0b85afb..b997823 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'utilisateur d'aucune sorte - 100 % privée de par sa conception ! -**Version incluse :** 5.1.0~ynh2 +**Version incluse :** 5.6.2~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 57b8253..1a35e8b 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. -**Versión proporcionada:** 5.1.0~ynh2 +**Versión proporcionada:** 5.6.2~ynh1 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a411f86..65c04b0 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released. -**分发版本:** 5.1.0~ynh2 +**分发版本:** 5.6.2~ynh1 ## 截图 From 7dfa79b236eb7c89a39278abb1adf0e0c475adc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 5 May 2024 22:35:19 +0200 Subject: [PATCH 40/41] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 34d9dd0..6d73df8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,7 +37,7 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.6.2/smp-server_amd64" - amd64.sha256 = "017071d4f6126c8aba1c11bc6624a32ec78c3e337ee04ad5c0c508eeb827f5ef" + amd64.sha256 = "d711cc5bddddf4abd01d971d7d4cda879bc4d4d2beb455154031589ffcb0c891" arm64.url = "https://github.com/skyuk3000/simplex_ynh/releases/download/5.2.0/smp-server_arm64" arm64.sha256 = "2a5a6f34230443212d3166ec7c706440eb2748c6cd2b4e47526a4ccf45717584" in_subdir = false @@ -46,7 +46,7 @@ ram.runtime = "50M" [resources.sources.xftp] amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.6.2/xftp-server_amd64" - amd64.sha256 = "4c58fe2944cb448fecc70a07e6b3a01d06964da344108019cc9e3eb015c8cbbf" + amd64.sha256 = "6febc49aa989a02ad8cfc27b657c30acc425878e88a995beca864afeaaff7b3e" arm64.url = "https://github.com/skyuk3000/simplex_ynh/releases/download/5.2.0/xftp-server_arm64" arm64.sha256 = "a8f4118610efca9bd7b2d687c04f95a9cf52114d1941c8f94441d80c1c04d92a" in_subdir = false From 18900f9d6cbd64885cfaf2fddc7b5ed1a27357df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 5 May 2024 22:39:06 +0200 Subject: [PATCH 41/41] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e869c8d..daeef2d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,7 +71,7 @@ fi #================================================= #ynh_script_progression --message="Adding a configuration file..." --weight=1 -#ynh_add_config --template="../conf/file-server.ini" --destination="/etc/opt/simplex-xftp/file-server.ini" +#ynh_add_config --template="file-server.ini" --destination="/etc/opt/simplex-xftp/file-server.ini" #chmod 400 "/etc/opt/simplex-xftp/file-server.ini" #chown $app:$app "/etc/opt/simplex-xftp/file-server.ini"