Compare commits

..

2 Commits

Author SHA1 Message Date
Alessandro
180ad94838
Move Manually generating Certificate & Key section in README.md (#216)
Move `Manually generating Certificate & Key` section from `Building BitBetter` to `Setting up BitBetter` and mark it as `Optional` instead of `Note`.

Co-authored-by: h44z <christoph.h@sprinternet.at>
2024-11-24 19:10:11 +01:00
vdmchkv
38c43a43c9
Prevent docker compose from attempting to pull BitBetter images from the Docker repository (#219)
Co-authored-by: Vadim Iouchkov <vadim.iouchkov@d-gl.de>
2024-11-24 19:02:48 +01:00
2 changed files with 18 additions and 14 deletions

View File

@ -14,8 +14,8 @@ Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/B
- [Getting Started](#getting-started) - [Getting Started](#getting-started)
- [Dependencies](#dependencies) - [Dependencies](#dependencies)
- [Setting up BitBetter](#setting-up-bitbetter) - [Setting up BitBetter](#setting-up-bitbetter)
- [Optional: Manually generating Certificate & Key](#optional-manually-generating-certificate--key)
- [Building BitBetter](#building-bitbetter) - [Building BitBetter](#building-bitbetter)
- [Note: Manually generating Certificate & Key](#note-manually-generating-certificate--key)
- [Updating Bitwarden and BitBetter](#updating-bitwarden-and-bitbetter) - [Updating Bitwarden and BitBetter](#updating-bitwarden-and-bitbetter)
- [Generating Signed Licenses](#generating-signed-licenses) - [Generating Signed Licenses](#generating-signed-licenses)
- [Note: Alternative Ways to Generate License](#note-alternative-ways-to-generate-license) - [Note: Alternative Ways to Generate License](#note-alternative-ways-to-generate-license)
@ -40,6 +40,21 @@ With your dependencies installed, begin the installation of BitBetter by downloa
git clone https://github.com/jakeswenson/BitBetter.git git clone https://github.com/jakeswenson/BitBetter.git
``` ```
### Optional: Manually generating Certificate & Key
If you wish to generate your self-signed cert & key manually, you can run the following commands.
```bash
cd .keys
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.cert -days 36500 -outform DER -passout pass:test
openssl x509 -inform DER -in cert.cert -out cert.pem
openssl pkcs12 -export -out cert.pfx -inkey key.pem -in cert.pem -passin pass:test -passout pass:test
```
> Note that the password here must be `test`.<sup>[1](#f1)</sup>
---
## Building BitBetter ## Building BitBetter
Now that you've set up your build environment, you can **run the main build script** to generate a modified version of the `bitwarden/api` and `bitwarden/identity` docker images. Now that you've set up your build environment, you can **run the main build script** to generate a modified version of the `bitwarden/api` and `bitwarden/identity` docker images.
@ -68,19 +83,6 @@ You'll also want to edit the `/path/to/bwdata/scripts/run.sh` file. In the `func
You can now start or restart Bitwarden as normal and the modified api will be used. **It is now ready to accept self-issued licenses.** You can now start or restart Bitwarden as normal and the modified api will be used. **It is now ready to accept self-issued licenses.**
---
### Note: Manually generating Certificate & Key
If you wish to generate your self-signed cert & key manually, you can run the following commands.
```bash
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.cert -days 36500 -outform DER -passout pass:test
openssl x509 -inform DER -in cert.cert -out cert.pem
openssl pkcs12 -export -out cert.pfx -inkey key.pem -in cert.pem -passin pass:test -passout pass:test
```
> Note that the password here must be `test`.<sup>[1](#f1)</sup>
--- ---
## Updating Bitwarden and BitBetter ## Updating Bitwarden and BitBetter

View File

@ -35,9 +35,11 @@ then
echo "services:" echo "services:"
echo " api:" echo " api:"
echo " image: bitbetter/api:$BW_VERSION" echo " image: bitbetter/api:$BW_VERSION"
echo " pull_policy: never"
echo "" echo ""
echo " identity:" echo " identity:"
echo " image: bitbetter/identity:$BW_VERSION" echo " image: bitbetter/identity:$BW_VERSION"
echo " pull_policy: never"
echo "" echo ""
} > $BITWARDEN_BASE/bwdata/docker/docker-compose.override.yml } > $BITWARDEN_BASE/bwdata/docker/docker-compose.override.yml
echo "BitBetter docker-compose override created!" echo "BitBetter docker-compose override created!"