From 56151f7616d1eb114a68b3afe4bce8cc05cbf7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 8 Aug 2024 11:22:31 +0200 Subject: [PATCH 1/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0ea847d..d5cf275 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ demo = "https://send.vis.ee/" code = "https://github.com/timvisee/send" [integration] -yunohost = ">= 11.2.12" +yunohost = ">= 11.2.20" architectures = ["amd64", "arm64", "armhf"] multi_instance = true From 790c3217cb2d5a3e58537d619825254867523bb2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 8 Aug 2024 09:22:35 +0000 Subject: [PATCH 2/9] Auto-update READMEs --- ALL_README.md | 1 + README_id.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 README_id.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,5 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..0895c61 --- /dev/null +++ b/README_id.md @@ -0,0 +1,50 @@ + + +# Send untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg) + +[![Pasang Send dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang Send secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a community effort to keep the project up-to-date and alive. +Send is a file sharing experiment which allows you to send encrypted files to other users. + + +**Versi terkirim:** 3.4.23~ynh4 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada Send](./doc/screenshots/screenshot.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/send_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug +atau +sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** From 5f46cd0123429024e059051997af1b1375c423fa Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 31 Aug 2024 02:59:44 +0200 Subject: [PATCH 3/9] [autopatch] Automatic patch attempt for helpers 2.1 --- conf/systemd.service | 4 ++-- manifest.toml | 3 ++- scripts/_common.sh | 14 +---------- scripts/backup | 19 ++++----------- scripts/change_url | 32 +++++++++---------------- scripts/install | 48 +++++++++++++++++-------------------- scripts/remove | 20 ++++++---------- scripts/restore | 30 ++++++++++-------------- scripts/upgrade | 56 ++++++++++++++++++-------------------------- 9 files changed, 84 insertions(+), 142 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 3193880..5768eee 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,8 +8,8 @@ User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ Environment="NODE_ENV=production" -Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=__YNH_NODE__ __INSTALL_DIR__/server/bin/prod.js +Environment="PATH=__PATH_WITH_NODEJS__" +ExecStart=__NODEJS_DIR__/node __INSTALL_DIR__/server/bin/prod.js Restart=always # Sandboxing options to harden security diff --git a/manifest.toml b/manifest.toml index 0ea847d..281ecc7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,8 @@ demo = "https://send.vis.ee/" code = "https://github.com/timvisee/send" [integration] -yunohost = ">= 11.2.12" +yunohost = ">= 11.2.18" +helpers_version = "2.1" architectures = ["amd64", "arm64", "armhf"] multi_instance = true diff --git a/scripts/_common.sh b/scripts/_common.sh index b818f0f..eaae793 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,19 +1,7 @@ #!/bin/bash #================================================= -# COMMON VARIABLES +# COMMON VARIABLES AND CUSTOM HELPERS #================================================= nodejs_version=16 - -#================================================= -# PERSONAL HELPERS -#================================================= - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# FUTURE OFFICIAL HELPERS -#================================================= diff --git a/scripts/backup b/scripts/backup index 38d96c5..e73feeb 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,36 +1,27 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# DECLARE DATA AND CONF FILES TO BACKUP -#================================================= -ynh_print_info --message="Declaring files to be backed up..." +ynh_print_info "Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$install_dir" +ynh_backup "$install_dir" #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_backup --src_path="/etc/systemd/system/$app.service" +ynh_backup "/etc/systemd/system/$app.service" #================================================= # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 25000f2..503af51 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,55 +1,45 @@ #!/bin/bash -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD MODIFICATIONS #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 +ynh_script_progression "Stopping $app's systemd service..." -ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" +ynh_systemctl --service="$app" --action="stop" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 +ynh_script_progression "Updating NGINX web server configuration..." -ynh_change_url_nginx_config +ynh_config_change_url_nginx #================================================= # SPECIFIC MODIFICATIONS #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=2 +ynh_script_progression "Adding $app's configuration..." domain=$new_domain -ynh_add_config --template="../conf/config.js" --destination="$install_dir/server/config.js" +ynh_config_add --template="config.js" --destination="$install_dir/server/config.js" -chmod 400 "$install_dir/server/config.js" -chown "$app:$app" "$install_dir/server/config.js" +#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/server/config.js" +#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:$app" "$install_dir/server/config.js" -#================================================= -# GENERIC FINALISATION #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." # Start a systemd service -ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" +ynh_systemctl --service="$app" --action="start" --log_path="systemd" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression "Change of URL completed for $app" diff --git a/scripts/install b/scripts/install index 9d1fe35..0b52b05 100644 --- a/scripts/install +++ b/scripts/install @@ -1,88 +1,82 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=20 +ynh_script_progression "Installing dependencies..." -ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" +ynh_nodejs_install #================================================= # CREATE A REDIS DATABASE #================================================= -ynh_script_progression --message="Creating a Redis database..." --weight=5 +ynh_script_progression "Creating a Redis database..." # Configure redis redis_db=$(ynh_redis_get_free_db) -ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" +ynh_app_setting_set --key=redis_db --value="$redis_db" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=2 +ynh_script_progression "Setting up source files..." # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod -R o-rwx "$install_dir" -chown -R "$app:www-data" "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" chmod +x "$install_dir/server/bin/prod.js" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 +ynh_script_progression "Configuring NGINX web server..." # Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx # Create a dedicated systemd config -ynh_add_systemd_config +ynh_config_add_systemd yunohost service add "$app" --description="Simple, private file sharing" --log="/var/log/$app/$app.log" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=2 +ynh_script_progression "Adding $app's configuration..." -ynh_add_config --template="config.js" --destination="$install_dir/server/config.js" +ynh_config_add --template="config.js" --destination="$install_dir/server/config.js" -chmod 400 "$install_dir/server/config.js" -chown "$app:" "$install_dir/server/config.js" +#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/server/config.js" +#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:" "$install_dir/server/config.js" #================================================= # SPECIFIC SETUP #================================================= # BUILD APP #================================================= -ynh_script_progression --message="Building app... (this will take some time and resources!)" --weight=20 +ynh_script_progression "Building app... (this will take some time and resources!)" pushd "$install_dir" - ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" "$ynh_npm" install - ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" "$ynh_npm" run build + + ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm install + ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm run build popd #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=2 +ynh_script_progression "Starting $app's systemd service..." # Start a systemd service -ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" +ynh_systemctl --service="$app" --action="start" --log_path="systemd" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression "Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index a9a1baf..a2f9006 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,38 +1,32 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 +ynh_script_progression "Removing system configurations related to $app..." # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status "$app" >/dev/null +if ynh_hide_warnings yunohost service status "$app" >/dev/null then - ynh_script_progression --message="Removing $app service integration..." --weight=1 + ynh_script_progression "Removing $app service integration..." yunohost service remove "$app" fi # Remove the dedicated systemd config -ynh_remove_systemd_config +ynh_config_remove_systemd ynh_redis_remove_db "$redis_db" # Remove the dedicated NGINX config -ynh_remove_nginx_config +ynh_config_remove_nginx -ynh_remove_nodejs +ynh_nodejs_remove #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression "Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index 7f0a5b5..19b30e9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -13,12 +7,12 @@ source /usr/share/yunohost/helpers #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --weight=6 +ynh_script_progression "Restoring the app main directory..." -ynh_restore_file --origin_path="$install_dir" +ynh_restore "$install_dir" -chmod -R o-rwx "$install_dir" -chown -R "$app:www-data" "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" chmod +x "$install_dir/server/bin/prod.js" #================================================= @@ -26,13 +20,13 @@ chmod +x "$install_dir/server/bin/prod.js" #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=7 +ynh_script_progression "Reinstalling dependencies..." -ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" +ynh_nodejs_install -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_restore_file --origin_path="/etc/systemd/system/$app.service" +ynh_restore "/etc/systemd/system/$app.service" systemctl enable "$app.service" --quiet yunohost service add "$app" --description="Simple, private file sharing" --log="/var/log/$app/$app.log" @@ -40,14 +34,14 @@ yunohost service add "$app" --description="Simple, private file sharing" --log=" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." -ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" +ynh_systemctl --service="$app" --action="start" --log_path="systemd" -ynh_systemd_action --service_name=nginx --action=reload +ynh_systemctl --service=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression "Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index 501e89e..20f7e65 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,94 +1,84 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD UPGRADE STEPS #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 +ynh_script_progression "Stopping $app's systemd service..." -ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" +ynh_systemctl --service="$app" --action="stop" --log_path="systemd" #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." +ynh_script_progression "Ensuring downward compatibility..." -ynh_remove_logrotate +ynh_config_remove_logrotate #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Upgrading source files..." --weight=10 +ynh_script_progression "Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --keep="server/config.js" -chmod -R o-rwx "$install_dir" -chown -R "$app:www-data" "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" chmod +x "$install_dir/server/bin/prod.js" #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=18 +ynh_script_progression "Upgrading dependencies..." -ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" +ynh_nodejs_install #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 +ynh_script_progression "Upgrading NGINX web server configuration..." # Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx # Create a dedicated systemd config -ynh_add_systemd_config +ynh_config_add_systemd yunohost service add "$app" --description="Simple, private file sharing" --log="/var/log/$app/$app.log" #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." +ynh_script_progression "Updating configuration..." -ynh_add_config --template="config.js" --destination="$install_dir/server/config.js" +ynh_config_add --template="config.js" --destination="$install_dir/server/config.js" -chmod 400 "$install_dir/server/config.js" -chown "$app:" "$install_dir/server/config.js" +#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/server/config.js" +#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:" "$install_dir/server/config.js" -#================================================= -# SPECIFIC UPGRADE #================================================= # BUILD APP #================================================= -ynh_script_progression --message="Building app... (this will take some time and resources!)" --weight=16 +ynh_script_progression "Building app... (this will take some time and resources!)" pushd "$install_dir" - ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" "$ynh_npm" install - ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" "$ynh_npm" run build + + ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm install + ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm run build popd #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." -ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" +ynh_systemctl --service="$app" --action="start" --log_path="systemd" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression "Upgrade of $app completed" From 8b99ab94bae003fecb027ca63cce5222cd6ce9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 8 Sep 2024 16:27:08 +0200 Subject: [PATCH 4/9] cleaning --- manifest.toml | 2 +- scripts/backup | 1 - scripts/change_url | 7 ++----- scripts/install | 18 ++++++------------ scripts/remove | 3 --- scripts/restore | 5 ++--- scripts/upgrade | 18 +++++++----------- 7 files changed, 18 insertions(+), 36 deletions(-) diff --git a/manifest.toml b/manifest.toml index 281ecc7..be8cfc5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ demo = "https://send.vis.ee/" code = "https://github.com/timvisee/send" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.30" helpers_version = "2.1" architectures = ["amd64", "arm64", "armhf"] multi_instance = true diff --git a/scripts/backup b/scripts/backup index e73feeb..50e701d 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,6 +1,5 @@ #!/bin/bash -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/change_url b/scripts/change_url index 503af51..b851106 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -17,8 +17,6 @@ ynh_script_progression "Updating NGINX web server configuration..." ynh_config_change_url_nginx -#================================================= -# SPECIFIC MODIFICATIONS #================================================= # ADD A CONFIGURATION #================================================= @@ -27,15 +25,14 @@ ynh_script_progression "Adding $app's configuration..." domain=$new_domain ynh_config_add --template="config.js" --destination="$install_dir/server/config.js" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/server/config.js" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:$app" "$install_dir/server/config.js" +#chmod 400 "$install_dir/server/config.js" +#chown "$app:$app" "$install_dir/server/config.js" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression "Starting $app's systemd service..." -# Start a systemd service ynh_systemctl --service="$app" --action="start" --log_path="systemd" #================================================= diff --git a/scripts/install b/scripts/install index 0b52b05..8941a8c 100644 --- a/scripts/install +++ b/scripts/install @@ -15,7 +15,6 @@ ynh_nodejs_install #================================================= ynh_script_progression "Creating a Redis database..." -# Configure redis redis_db=$(ynh_redis_get_free_db) ynh_app_setting_set --key=redis_db --value="$redis_db" @@ -24,11 +23,10 @@ ynh_app_setting_set --key=redis_db --value="$redis_db" #================================================= ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" +#chmod -R o-rwx "$install_dir" +#chown -R "$app:www-data" "$install_dir" chmod +x "$install_dir/server/bin/prod.js" #================================================= @@ -36,10 +34,8 @@ chmod +x "$install_dir/server/bin/prod.js" #================================================= ynh_script_progression "Configuring NGINX web server..." -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add "$app" --description="Simple, private file sharing" --log="/var/log/$app/$app.log" @@ -51,8 +47,8 @@ ynh_script_progression "Adding $app's configuration..." ynh_config_add --template="config.js" --destination="$install_dir/server/config.js" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/server/config.js" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:" "$install_dir/server/config.js" +#chmod 400 "$install_dir/server/config.js" +#chown "$app:" "$install_dir/server/config.js" #================================================= # SPECIFIC SETUP @@ -62,9 +58,8 @@ ynh_config_add --template="config.js" --destination="$install_dir/server/config. ynh_script_progression "Building app... (this will take some time and resources!)" pushd "$install_dir" - - ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm install - ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm run build + ynh_hide_warnings ynh_exec_as_app npm install + ynh_hide_warnings ynh_exec_as_app npm run build popd #================================================= @@ -72,7 +67,6 @@ popd #================================================= ynh_script_progression "Starting $app's systemd service..." -# Start a systemd service ynh_systemctl --service="$app" --action="start" --log_path="systemd" #================================================= diff --git a/scripts/remove b/scripts/remove index a2f9006..8c66949 100644 --- a/scripts/remove +++ b/scripts/remove @@ -8,19 +8,16 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Removing system configurations related to $app..." -# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_hide_warnings yunohost service status "$app" >/dev/null then ynh_script_progression "Removing $app service integration..." yunohost service remove "$app" fi -# Remove the dedicated systemd config ynh_config_remove_systemd ynh_redis_remove_db "$redis_db" -# Remove the dedicated NGINX config ynh_config_remove_nginx ynh_nodejs_remove diff --git a/scripts/restore b/scripts/restore index 19b30e9..d787dc8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,5 @@ #!/bin/bash -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -11,8 +10,8 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" +#chmod -R o-rwx "$install_dir" +#chown -R "$app:www-data" "$install_dir" chmod +x "$install_dir/server/bin/prod.js" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 20f7e65..326aab4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,11 +22,10 @@ ynh_config_remove_logrotate #================================================= ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" --keep="server/config.js" +ynh_setup_source --dest_dir="$install_dir" --keep="server/config.js" --full_replace -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" +#chmod -R o-rwx "$install_dir" +#chown -R "$app:www-data" "$install_dir" chmod +x "$install_dir/server/bin/prod.js" #================================================= @@ -41,10 +40,8 @@ ynh_nodejs_install #================================================= ynh_script_progression "Upgrading NGINX web server configuration..." -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add "$app" --description="Simple, private file sharing" --log="/var/log/$app/$app.log" @@ -56,8 +53,8 @@ ynh_script_progression "Updating configuration..." ynh_config_add --template="config.js" --destination="$install_dir/server/config.js" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/server/config.js" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:" "$install_dir/server/config.js" +#chmod 400 "$install_dir/server/config.js" +#chown "$app:" "$install_dir/server/config.js" #================================================= # BUILD APP @@ -65,9 +62,8 @@ ynh_config_add --template="config.js" --destination="$install_dir/server/config. ynh_script_progression "Building app... (this will take some time and resources!)" pushd "$install_dir" - - ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm install - ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm run build + ynh_hide_warnings ynh_exec_as_app npm install + ynh_hide_warnings ynh_exec_as_app npm run build popd #================================================= From dec5037d52d6ac93ec5dbe103a39eb19281e34e2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 8 Sep 2024 16:55:30 +0000 Subject: [PATCH 5/9] Auto-update READMEs --- ALL_README.md | 1 + README_ru.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 README_ru.md diff --git a/ALL_README.md b/ALL_README.md index 4ed64dd..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -6,4 +6,5 @@ - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) - [Baca README dalam bahasa bahasa Indonesia](README_id.md) +- [Прочитать README на русский](README_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..b832eaf --- /dev/null +++ b/README_ru.md @@ -0,0 +1,50 @@ + + +# Send для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg) + +[![Установите Send с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить Send быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a community effort to keep the project up-to-date and alive. +Send is a file sharing experiment which allows you to send encrypted files to other users. + + +**Поставляемая версия:** 3.4.23~ynh4 + +**Демо-версия:** + +## Снимки экрана + +![Снимок экрана Send](./doc/screenshots/screenshot.png) + +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/send_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug +или +sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:** From e527c2abf181843b399fd9f8eacc9e0142496bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 20 Oct 2024 22:22:29 +0200 Subject: [PATCH 6/9] cleaning --- scripts/install | 7 ------- scripts/restore | 4 ---- scripts/upgrade | 5 ----- 3 files changed, 16 deletions(-) diff --git a/scripts/install b/scripts/install index 8941a8c..056a1a5 100644 --- a/scripts/install +++ b/scripts/install @@ -25,8 +25,6 @@ ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir" -#chmod -R o-rwx "$install_dir" -#chown -R "$app:www-data" "$install_dir" chmod +x "$install_dir/server/bin/prod.js" #================================================= @@ -47,11 +45,6 @@ ynh_script_progression "Adding $app's configuration..." ynh_config_add --template="config.js" --destination="$install_dir/server/config.js" -#chmod 400 "$install_dir/server/config.js" -#chown "$app:" "$install_dir/server/config.js" - -#================================================= -# SPECIFIC SETUP #================================================= # BUILD APP #================================================= diff --git a/scripts/restore b/scripts/restore index d787dc8..a8a434e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,12 +10,8 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#chmod -R o-rwx "$install_dir" -#chown -R "$app:www-data" "$install_dir" chmod +x "$install_dir/server/bin/prod.js" -#================================================= -# SPECIFIC RESTORATION #================================================= # REINSTALL DEPENDENCIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 326aab4..2aba8b3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,8 +24,6 @@ ynh_script_progression "Upgrading source files..." ynh_setup_source --dest_dir="$install_dir" --keep="server/config.js" --full_replace -#chmod -R o-rwx "$install_dir" -#chown -R "$app:www-data" "$install_dir" chmod +x "$install_dir/server/bin/prod.js" #================================================= @@ -53,9 +51,6 @@ ynh_script_progression "Updating configuration..." ynh_config_add --template="config.js" --destination="$install_dir/server/config.js" -#chmod 400 "$install_dir/server/config.js" -#chown "$app:" "$install_dir/server/config.js" - #================================================= # BUILD APP #================================================= From ce36806a8edffa1e190f968d7dc32477707f6cff Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 20 Oct 2024 22:22:34 +0200 Subject: [PATCH 7/9] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 2 +- README_nl.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 README_nl.md diff --git a/ALL_README.md b/ALL_README.md index e3c80d2..df3708b 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -6,5 +6,6 @@ - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) - [Baca README dalam bahasa bahasa Indonesia](README_id.md) +- [Lees de README in het Nederlands](README_nl.md) - [Прочитать README на русский](README_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README_es.md b/README_es.md index d0ae0f8..b5da952 100644 --- a/README_es.md +++ b/README_es.md @@ -37,7 +37,7 @@ Send is a file sharing experiment which allows you to send encrypted files to ot ## Información para desarrolladores -Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/send_ynh/tree/testing +Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/send_ynh/tree/testing). Para probar la rama `testing`, sigue asÍ: diff --git a/README_nl.md b/README_nl.md new file mode 100644 index 0000000..f464377 --- /dev/null +++ b/README_nl.md @@ -0,0 +1,50 @@ + + +# Send voor Yunohost + +[![Integratieniveau](https://dash.yunohost.org/integration/send.svg)](https://ci-apps.yunohost.org/ci/apps/send/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/send.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/send.maintain.svg) + +[![Send met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=send) + +*[Deze README in een andere taal lezen.](./ALL_README.md)* + +> *Met dit pakket kun je Send snel en eenvoudig op een YunoHost-server installeren.* +> *Als je nog geen YunoHost hebt, lees dan [de installatiehandleiding](https://yunohost.org/install), om te zien hoe je 'm installeert.* + +## Overzicht + +A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a community effort to keep the project up-to-date and alive. +Send is a file sharing experiment which allows you to send encrypted files to other users. + + +**Geleverde versie:** 3.4.23~ynh4 + +**Demo:** + +## Schermafdrukken + +![Schermafdrukken van Send](./doc/screenshots/screenshot.png) + +## Documentatie en bronnen + +- Officiele website van de app: +- Upstream app codedepot: +- YunoHost-store: +- Meld een bug: + +## Ontwikkelaarsinformatie + +Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/send_ynh/tree/testing). + +Om de `testing`-branch uit te proberen, ga als volgt te werk: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug +of +sudo yunohost app upgrade send -u https://github.com/YunoHost-Apps/send_ynh/tree/testing --debug +``` + +**Verdere informatie over app-packaging:** From 474c7e55e2127fc2ddd1e858d5045add59a35221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 21 Oct 2024 21:03:31 +0200 Subject: [PATCH 8/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index be8cfc5..e7c7220 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Send" description.en = "File sharing which allows to send encrypted files" description.fr = "Partage de fichiers qui permet d'envoyer des fichiers chiffrés" -version = "3.4.23~ynh4" +version = "3.4.23~ynh5" maintainers = [] From c98324b6ad7759707b1a7743df0db91468bcde1d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 21 Oct 2024 21:03:39 +0200 Subject: [PATCH 9/9] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index c558268..d5b34bd 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm Send is a file sharing experiment which allows you to send encrypted files to other users. -**Shipped version:** 3.4.23~ynh4 +**Shipped version:** 3.4.23~ynh5 **Demo:** diff --git a/README_es.md b/README_es.md index b5da952..b4ec874 100644 --- a/README_es.md +++ b/README_es.md @@ -20,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm Send is a file sharing experiment which allows you to send encrypted files to other users. -**Versión actual:** 3.4.23~ynh4 +**Versión actual:** 3.4.23~ynh5 **Demo:** diff --git a/README_eu.md b/README_eu.md index 5bf2d0f..1d7a393 100644 --- a/README_eu.md +++ b/README_eu.md @@ -20,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm Send is a file sharing experiment which allows you to send encrypted files to other users. -**Paketatutako bertsioa:** 3.4.23~ynh4 +**Paketatutako bertsioa:** 3.4.23~ynh5 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 6693cdc..63ff6aa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Un fork du Firefox Send de Mozilla. Mozilla a arrêté Send, et ce fork est un e Send est une expérience de partage de fichiers qui permet d'envoyer des fichiers chiffrés à d'autres utilisateurs. -**Version incluse :** 3.4.23~ynh4 +**Version incluse :** 3.4.23~ynh5 **Démo :** diff --git a/README_gl.md b/README_gl.md index c5dfa17..c1f0aac 100644 --- a/README_gl.md +++ b/README_gl.md @@ -20,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm Send is a file sharing experiment which allows you to send encrypted files to other users. -**Versión proporcionada:** 3.4.23~ynh4 +**Versión proporcionada:** 3.4.23~ynh5 **Demo:** diff --git a/README_id.md b/README_id.md index 0895c61..7b433c0 100644 --- a/README_id.md +++ b/README_id.md @@ -20,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm Send is a file sharing experiment which allows you to send encrypted files to other users. -**Versi terkirim:** 3.4.23~ynh4 +**Versi terkirim:** 3.4.23~ynh5 **Demo:** diff --git a/README_nl.md b/README_nl.md index f464377..6db9bbb 100644 --- a/README_nl.md +++ b/README_nl.md @@ -20,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm Send is a file sharing experiment which allows you to send encrypted files to other users. -**Geleverde versie:** 3.4.23~ynh4 +**Geleverde versie:** 3.4.23~ynh5 **Demo:** diff --git a/README_ru.md b/README_ru.md index b832eaf..78d45e9 100644 --- a/README_ru.md +++ b/README_ru.md @@ -20,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm Send is a file sharing experiment which allows you to send encrypted files to other users. -**Поставляемая версия:** 3.4.23~ynh4 +**Поставляемая версия:** 3.4.23~ynh5 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index e123946..425c230 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -20,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm Send is a file sharing experiment which allows you to send encrypted files to other users. -**分发版本：** 3.4.23~ynh4 +**分发版本：** 3.4.23~ynh5 **演示：**