Merge pull request #18 from YunoHost-Apps/0.9.0

0.9.0

README.md

@@ -35,7 +35,7 @@ Garage is designed for storage clusters composed of nodes running at different p
 - K2V API (experimental)
 
 
-**Shipped version:** 0.8.2~ynh1
+**Shipped version:** 0.9.0~ynh1
 ## Documentation and resources
 
 * Official app website: <https://garagehq.deuxfleurs.fr/>

README_fr.md

@@ -35,7 +35,7 @@ Garage is designed for storage clusters composed of nodes running at different p
 - K2V API (experimental)
 
 
-**Version incluse :** 0.8.2~ynh1
+**Version incluse :** 0.9.0~ynh1
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://garagehq.deuxfleurs.fr/>

check_process

@@ -1,32 +0,0 @@
-# See here for more information
-# https://github.com/YunoHost/package_check#syntax-check_process-file
-
-# Move this file from check_process.default to check_process when you have filled it.
-
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		rpc_secret=""
-		bootstrap_peers=""
-		weight="10"
-		datadir=""
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=0
-		setup_root=0
-		setup_nourl=1
-		setup_private=0
-		setup_public=0
-		upgrade=1
-		upgrade=0	from_commit=CommitHash
-		backup_restore=1
-		multi_instance=1
-		port_already_use=0
-		change_url=1
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=CommitHash
-		name=Name and date of the commit.
-		manifest_arg=domain=DOMAIN&rpc_secret=RPC_SECRET&bootstrap_peers=BOOTSTRAP_PEERS&weight=WEIGHT&datadir=DATADIR

manifest.toml

@@ -5,7 +5,7 @@ name = "Garage"
 description.en = "S3 storage"
 description.fr = "stockage S3"
 
-version = "0.8.2~ynh1"
+version = "0.9.0~ynh1"
 
 maintainers = ["oiseauroch"]
 
@@ -33,6 +33,10 @@ ram.runtime = "50M"
     [install.domain]
     type = "domain"
 
+    [install.init_main_permission]
+    type = "group"
+    default = "visitors"
+
     [install.rpc_secret]
     ask.en = "UUID of the network (rpc-secret) "
     ask.fr = "UUID de l'ilot (rpc-secret)"
@@ -58,14 +62,15 @@ ram.runtime = "50M"
 
     [resources.sources.main]
     in_subdir = false
-    amd64.url = "https://garagehq.deuxfleurs.fr/_releases/v0.8.2/x86_64-unknown-linux-musl/garage"
+    extract = false
-    amd64.sha256 = "c15aa223b0fffb856c6e16276d1e77b0e94eb783a26eaeb7de80324f7c8b23c5"
+    amd64.url = "https://garagehq.deuxfleurs.fr/_releases/v0.9.0/x86_64-unknown-linux-musl/garage"
-    arm64.url = "https://garagehq.deuxfleurs.fr/_releases/v0.8.2/aarch64-unknown-linux-musl/garage"
+    amd64.sha256 = "3ae4ecb2a75610ab7bfe77bfac7a5c7a8834a0544158ac8ee37723e6d8fd1859"
-    arm64.sha256 = "9c419d47e87ac254a96cda6476e3c5c9102a9a2ea1ec1dc65d338bb46e415d78"
+    arm64.url = "https://garagehq.deuxfleurs.fr/_releases/v0.9.0/aarch64-unknown-linux-musl/garage"
-    i386.url = "https://garagehq.deuxfleurs.fr/_releases/v0.8.2/i686-unknown-linux-musl/garage"
+    arm64.sha256 = "b4db67a618ed493e1803d8bae83e8ea091703763b182d4c62fa1896179b17b9b"
-    i386.sha256 = "a733fcd9b0a0f6271960f0d65978b8a8474317fa41325595aa4825764b71f089"
+    i386.url = "https://garagehq.deuxfleurs.fr/_releases/v0.9.0/i686-unknown-linux-musl/garage"
-    armhf.url = "https://garagehq.deuxfleurs.fr/_releases/v0.8.2/armv6l-unknown-linux-musleabihf/garage"
+    i386.sha256 = "fcec4c6918ac5ae04829ed9c4f20c7eef0966194eabfe961e6d7f8aee14b0108"
-    armhf.sha256 = "1eb79aa8fff6c00bd1dd5da53dedd04685fe28b3402476a3b10b1b66aa10f80a"
+    armhf.url = "https://garagehq.deuxfleurs.fr/_releases/v0.9.0/armv6l-unknown-linux-musleabihf/garage"
+    armhf.sha256 = "8f04a38fcafc2ccda652738f2e80b0d2b6443150db0d7165db2de6c75035b4e3"
 
     [resources.ports]
     main.default = 4000

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-GARAGE_VERSION="0.8.2"
+GARAGE_VERSION="0.9.0"
 
 if systemd-detect-virt  -c -q
 then
@@ -52,6 +52,7 @@ apply_layout() {
 		return 0
 	fi
 }
+
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================

scripts/install

@@ -38,7 +38,8 @@ ynh_app_setting_set --app=$app --key=bootstrap_peers --value=$bootstrap_peers
 ynh_script_progression --message="Setting up source files..." --weight=1
 
 ynh_setup_source --dest_dir="$install_dir"
-# chmod +x $install_dir/garage # this file doesnt seem to exist ... remove this line ?
+
+chmod +x $install_dir/garage
 
 #=================================================
 # NGINX CONFIGURATION

scripts/restore

@@ -31,7 +31,6 @@ then
 	$install_dir/mount_disk.sh true
 fi
 
-chmod -R o-rwx "$data_dir"
 chown -R $app:$app "$data_dir"
 
 #=================================================

scripts/upgrade

@@ -54,6 +54,8 @@ ynh_add_systemd_config
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append
 
+yunohost service add $app --description="s3 storage" --log="/var/log/$app/$app.log" --needs_exposed_ports $port
+
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
@@ -61,13 +63,6 @@ ynh_script_progression --message="Updating a configuration file..."
 
 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 $app --description="s3 storage" --log="/var/log/$app/$app.log" --needs_exposed_ports $port
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================