diff --git a/README.md b/README.md index 175bf24..d38d888 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Manage passwords and other sensitive informations -**Shipped version:** 1.22.2~ynh1 +**Shipped version:** 1.23.0~ynh1 **Demo:** https://vault.bitwarden.com/#/register diff --git a/README_fr.md b/README_fr.md index d825700..eb0f5f6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Gérez les mots de passe et autres informations sensibles -**Version incluse :** 1.22.2~ynh1 +**Version incluse :** 1.23.0~ynh1 **Démo :** https://vault.bitwarden.com/#/register diff --git a/check_process b/check_process index 7ca8da9..846f814 100644 --- a/check_process +++ b/check_process @@ -5,10 +5,10 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" + path="/path" + admin="john" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 @@ -37,3 +37,5 @@ Notification=all name=1.21.0~ynh1 ; commit=703d5a9cb86d127c7723bb380d7c392a8eb9e703 name=1.21.0~ynh2 + ; commit=c233d94d76cae449630c59ce228b7a3c72f8fa12 + name=1.22.2~ynh1 diff --git a/conf/app.src b/conf/app.src index 4362b3a..9b7dbd3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/dani-garcia/vaultwarden/archive/1.22.2.tar.gz -SOURCE_SUM=c0d6e30033f4660086a63462b2cecd245a4c314d6c4abbd5b3b4a6f721a912237e7b85fd2967ee58756da4713b19d08ca559be02c97e0e8ece65832558af61b6 +SOURCE_URL=https://github.com/dani-garcia/vaultwarden/archive/1.23.0.tar.gz +SOURCE_SUM=2ddfe1c1cb36ab008de98c9674ee127140268f8b44dbd82a2193a25caa461a0133261c970eb8d8276eb9d0db9f24e3fd0fe6deeee7cc55e2d980b8c7188011fb SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 5d8827b..aade80d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file client_max_body_size 100M; diff --git a/conf/web.src b/conf/web.src index c1b822e..33c13c2 100644 --- a/conf/web.src +++ b/conf/web.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://github.com/dani-garcia/bw_web_builds/releases/download/v2.21.1/bw_web_v2.21.1.tar.gz -SOURCE_SUM=93463160903769ef6a9f944f031f8bf76973cd664c11bfcb24af6856a7161ba5d3e55ac5534b22e3e88b61e18bb4ead0029e120f937c8945e2d49a76af68f290 +SOURCE_URL=https://github.com/dani-garcia/bw_web_builds/releases/download/v2.24.1/bw_web_v2.24.1.tar.gz +SOURCE_SUM=f883f3746d245ad15816db477af35fba626ada420103b4b7ef54f062033b80384c71aed873a7db6800f906a3dd9afd4d8a9a0677142675e7eeac0285a3a8426e SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 2a6adee..95ceadb 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage passwords and other sensitive informations", "fr": "Gérez les mots de passe et autres informations sensibles" }, - "version": "1.22.2~ynh1", + "version": "1.23.0~ynh1", "url": "https://github.com/dani-garcia/vaultwarden", "upstream": { "license": "GPL-3.0-or-later", @@ -20,7 +20,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -30,8 +30,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", @@ -41,8 +40,7 @@ }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "is_public", diff --git a/scripts/restore b/scripts/restore index 0154c46..4dbae76 100644 --- a/scripts/restore +++ b/scripts/restore @@ -36,10 +36,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS