From 2669b8b41fe16a4198087f6b4a34b07b0d9b003d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 10 Dec 2023 15:14:58 +0100 Subject: [PATCH 1/4] Update install --- scripts/install | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/scripts/install b/scripts/install index 78dd45a..a48b89b 100755 --- a/scripts/install +++ b/scripts/install @@ -32,7 +32,6 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=rpc_secret --value=$rpc_secret ynh_app_setting_set --app=$app --key=bootstrap_peers --value=$bootstrap_peers - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -69,7 +68,7 @@ ynh_script_progression --message="Creating a data directory..." --weight=5 if [[ "$system_is_inside_container" == "true" ]] then - ynh_print_warn --message="This may take time regarding disk size…" + ynh_print_warn --message="This may take time regarding disk size..." # to be sure to not exceed size limit, i use a virtual disk with a fix size to have a max limit size. qemu-img create -f qcow2 $data_dir/garage_data.qcow2 "$weight"G @@ -93,22 +92,10 @@ ynh_script_progression --message="Configuring a systemd service..." # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Configuring log rotation..." - # Use logrotate to manage application logfile(s) ynh_use_logrotate -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." - -yunohost service add --needs_exposed_ports $port --description="s3 storage" --log="/var/log/$app/$app.log" $app +yunohost service add $app --description="s3 storage" --log="/var/log/$app/$app.log" --needs_exposed_ports $port #================================================= # START SYSTEMD SERVICE From a2cf57b4e94e2fa865381e3c592360f8ecfb161a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 10 Dec 2023 20:16:20 +0100 Subject: [PATCH 2/4] cleaning --- doc/{DISCLAIMER.md => ADMIN.md} | 0 manifest.toml | 1 - scripts/restore | 2 +- scripts/upgrade | 3 +-- 4 files changed, 2 insertions(+), 4 deletions(-) rename doc/{DISCLAIMER.md => ADMIN.md} (100%) diff --git a/doc/DISCLAIMER.md b/doc/ADMIN.md similarity index 100% rename from doc/DISCLAIMER.md rename to doc/ADMIN.md diff --git a/manifest.toml b/manifest.toml index 735f010..142ff9e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -32,7 +32,6 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - full_domain = true [install.rpc_secret] ask.en = "UUID of the network (rpc-secret) " diff --git a/scripts/restore b/scripts/restore index 69c72dc..82d142d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -83,7 +83,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add --needs_exposed_ports $port --description="s3 storage" --log="/var/log/$app/$app.log" $app +yunohost service add $app --description="s3 storage" --log="/var/log/$app/$app.log" --needs_exposed_ports $port #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 74305e6..bc5deea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,13 +77,12 @@ ynh_script_progression --message="Updating a configuration file..." ### ynh_add_config keeps track of the file's checksum) ynh_add_config --template="garage.toml" --destination="$install_dir/garage.toml" - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add --needs_exposed_ports $port --description="s3 storage" --log="/var/log/$app/$app.log" $app +yunohost service add $app --description="s3 storage" --log="/var/log/$app/$app.log" --needs_exposed_ports $port #================================================= # START SYSTEMD SERVICE From f432979eab4a0342f25807ea14ae2955d80e1643 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 10 Dec 2023 19:16:25 +0000 Subject: [PATCH 3/4] Auto-update README --- README.md | 15 --------------- README_fr.md | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/README.md b/README.md index 31f8f08..d8d339d 100644 --- a/README.md +++ b/README.md @@ -36,21 +36,6 @@ Garage is designed for storage clusters composed of nodes running at different p **Shipped version:** 0.8.2~ynh1 -## Disclaimers / important information - -* Limitations : - * This application is not usable if you're not part of a cluster with minimun 3 other nodes - * If you are behind a nat and use upnp to configure your port redirection, you may need to add peers via config panel instead of during installation and/or create a permanent redirection in your router/box - -* infos you should be aware of: - * This application provide a node that you can connect to a garage cluster. Few option are manageable by the config panel for the current node but IT DOESN'T offer simpler way to manage bucket and keys. You have to do it by command line or let an other node managing it. - * This application consider that the weight of the node is the size reserved to garage in G - * This application will try to create a virtual disk to ensure garage doesn't use more than allowed. If virtualisation is not available your responsible to check space used by garage. - -# How to run commands for Garage -1. Use `yunohost app shell garage` to use the command line in Garage own environnement (don't forget to `exit` at the end). You will be located in `/opt/yunohost/garage/` own directory. -2. Then for each use of the `garage` command, you need to specify the config file as a parameter `garage -c garage.toml [the actions you wish to run]`. - ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index ff14725..f24d3ff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -36,21 +36,6 @@ Garage is designed for storage clusters composed of nodes running at different p **Version incluse :** 0.8.2~ynh1 -## Avertissements / informations importantes - -* Limitations : - * This application is not usable if you're not part of a cluster with minimun 3 other nodes - * If you are behind a nat and use upnp to configure your port redirection, you may need to add peers via config panel instead of during installation and/or create a permanent redirection in your router/box - -* infos you should be aware of: - * This application provide a node that you can connect to a garage cluster. Few option are manageable by the config panel for the current node but IT DOESN'T offer simpler way to manage bucket and keys. You have to do it by command line or let an other node managing it. - * This application consider that the weight of the node is the size reserved to garage in G - * This application will try to create a virtual disk to ensure garage doesn't use more than allowed. If virtualisation is not available your responsible to check space used by garage. - -# How to run commands for Garage -1. Use `yunohost app shell garage` to use the command line in Garage own environnement (don't forget to `exit` at the end). You will be located in `/opt/yunohost/garage/` own directory. -2. Then for each use of the `garage` command, you need to specify the config file as a parameter `garage -c garage.toml [the actions you wish to run]`. - ## Documentations et ressources * Site officiel de l’app : From 71ef247b3d7a0675a3f195388c51487f29edbbc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 10 Dec 2023 20:16:49 +0100 Subject: [PATCH 4/4] Create tests.toml --- tests.toml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tests.toml diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..91daf17 --- /dev/null +++ b/tests.toml @@ -0,0 +1,7 @@ +test_format = 1.0 + +[default] + + # ------------ + # Tests to run + # ------------ \ No newline at end of file