From 007e053e2fdac2327b657c38193da6a3478c4b6a Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Thu, 23 Aug 2018 11:06:32 +0100 Subject: [PATCH 1/2] Update the build instruction for new Vault --- BUILD.md | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/BUILD.md b/BUILD.md index 0dcc89f..b8d5fa5 100644 --- a/BUILD.md +++ b/BUILD.md @@ -19,26 +19,20 @@ When run, the server is accessible in [http://localhost:80](http://localhost:80) ### Install the web-vault Download the latest official release from the [releases page](https://github.com/bitwarden/web/releases) and extract it. -Modify `web-vault/settings.Production.json` to look like this: -```json -{ - "appSettings": { - "apiUri": "/api", - "identityUri": "/identity", - "iconsUri": "/icons", - "stripeKey": "", - "braintreeKey": "" - } -} -``` - -Then, run the following from the `web-vault` directory: +Apply the patch file from `docker/set-vault-baseurl.patch`: ```sh -npm install -npx gulp dist:selfHosted +# In the Vault repository directory +git apply /path/to/bitwarden_rs/docker/set-vault-baseurl.patch ``` -Finally copy the contents of the `web-vault/dist` folder into the `bitwarden_rs/web-vault` folder. +Then, build the Vault: +```sh +npm run sub:init +npm install +npm run dist +``` + +Finally copy the contents of the `build` folder into the `bitwarden_rs/web-vault` folder. # Configuration The available configuration options are documented in the default `.env` file, and they can be modified by uncommenting the desired options in that file or by setting their respective environment variables. Look at the README file for the main configuration options available. From 9fad541c87436ca96325a05c22e9fcc72ee90f15 Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Thu, 23 Aug 2018 12:08:54 +0100 Subject: [PATCH 2/2] Clone repository instead of downloading as suggested by @mqus --- BUILD.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/BUILD.md b/BUILD.md index b8d5fa5..2750124 100644 --- a/BUILD.md +++ b/BUILD.md @@ -17,7 +17,14 @@ cargo build --release When run, the server is accessible in [http://localhost:80](http://localhost:80). ### Install the web-vault -Download the latest official release from the [releases page](https://github.com/bitwarden/web/releases) and extract it. +Clone the git repository at [bitwarden/web](https://github.com/bitwarden/web) and checkout the latest release tag (e.g. v2.1.1): +```sh +# clone the repository +git clone https://github.com/bitwarden/web.git web-vault +cd web-vault +# switch to the latest tag +git checkout "$(git tag | tail -n1)" +``` Apply the patch file from `docker/set-vault-baseurl.patch`: ```sh