From 7b8f8f7615a35026d2969896afffca78d977317a Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 8 Aug 2019 12:15:16 +0200 Subject: [PATCH 1/3] Fix config file --- conf/bitwarden_rs.env | 2 +- scripts/install | 1 + scripts/upgrade | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/bitwarden_rs.env b/conf/bitwarden_rs.env index e8b5541..7b2c125 100644 --- a/conf/bitwarden_rs.env +++ b/conf/bitwarden_rs.env @@ -30,7 +30,7 @@ WEBSOCKET_ENABLED=true ## Controls the WebSocket server address and port WEBSOCKET_ADDRESS=127.0.0.1 -WEBSOCKET_PORT=__WEBSOCKET__PORT__ +WEBSOCKET_PORT=__WEBSOCKET_PORT__ ## Enable extended logging ## This shows timestamps and allows logging to file and to syslog diff --git a/scripts/install b/scripts/install index 6732e6a..a879e2d 100644 --- a/scripts/install +++ b/scripts/install @@ -150,6 +150,7 @@ ynh_replace_string --match_string="__ADMIN_TOKEN__" --replace_string="$admin_tok ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config" ynh_replace_string --match_string="__WEBSOCKET_PORT__" --replace_string="$websocket_port" --target_file="$config" ynh_replace_string --match_string="__ROCKET_PORT__" --replace_string="$rocket_port" --target_file="$config" +ynh_replace_string --match_string="__APP__" --replace_string="$rocket_port" --target_file="$config" #================================================= # STORE THE CONFIG FILE CHECKSUM diff --git a/scripts/upgrade b/scripts/upgrade index 4992dc6..7b8a2eb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -155,6 +155,7 @@ ynh_replace_string --match_string="__ADMIN_TOKEN__" --replace_string="$admin_tok ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config" ynh_replace_string --match_string="__WEBSOCKET_PORT__" --replace_string="$websocket_port" --target_file="$config" ynh_replace_string --match_string="__ROCKET_PORT__" --replace_string="$rocket_port" --target_file="$config" +ynh_replace_string --match_string="__APP__" --replace_string="$rocket_port" --target_file="$config" #================================================= # STORE THE CONFIG FILE CHECKSUM From 43562ced2f1c0a67036f7904d2d36c1d65dfc87c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 8 Aug 2019 20:47:26 +0200 Subject: [PATCH 2/3] Fix config file --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index a879e2d..5bbfd68 100644 --- a/scripts/install +++ b/scripts/install @@ -150,7 +150,7 @@ ynh_replace_string --match_string="__ADMIN_TOKEN__" --replace_string="$admin_tok ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config" ynh_replace_string --match_string="__WEBSOCKET_PORT__" --replace_string="$websocket_port" --target_file="$config" ynh_replace_string --match_string="__ROCKET_PORT__" --replace_string="$rocket_port" --target_file="$config" -ynh_replace_string --match_string="__APP__" --replace_string="$rocket_port" --target_file="$config" +ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$config" #================================================= # STORE THE CONFIG FILE CHECKSUM diff --git a/scripts/upgrade b/scripts/upgrade index 7b8a2eb..277de0a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -155,7 +155,7 @@ ynh_replace_string --match_string="__ADMIN_TOKEN__" --replace_string="$admin_tok ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config" ynh_replace_string --match_string="__WEBSOCKET_PORT__" --replace_string="$websocket_port" --target_file="$config" ynh_replace_string --match_string="__ROCKET_PORT__" --replace_string="$rocket_port" --target_file="$config" -ynh_replace_string --match_string="__APP__" --replace_string="$rocket_port" --target_file="$config" +ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$config" #================================================= # STORE THE CONFIG FILE CHECKSUM From b016db358d48770c5d9e70fe4ae83cab824cb661 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 9 Aug 2019 22:46:01 +0200 Subject: [PATCH 3/3] Upgrade version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index e4c6b35..7bddaa0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source password management solutions.", "fr": "Solutions de gestion de mots de passe open source." }, - "version": "1.9.1~ynh1", + "version": "1.9.1~ynh2", "url": "https://github.com/dani-garcia/bitwarden_rs", "license": "GPL-3.0-or-later", "maintainer": {