Add commands to build check to build licensegen image as well and test if the created licensegen image can actually generate user and organization licenses. run.sh will print the generated license to stdout and return zero if successful. If an error occurs, a non zero error code is returned which should cause a build error.
Signed-off-by: Joseph Gigantino <128943406+Jgigantino31@users.noreply.github.com>
Fix for this error:
unable to load certificate
140067633099200:error:0909006C:PEM routines:get_name:no start line:../crypto/pem/pem_lib.c:745:Expecting: TRUSTED CERTIFICATE
* Build image from source
* Clone only current version tag
* remove obsolete project
* support loading Core.dll from single file application
* pass single file application to license gen
* remove loose file parameter
* fix executable parameter
* Remove unnecessary changes in LicensingService.cs
* Revert "Remove unnecessary changes in LicensingService.cs"
This reverts commit d8465e1aec.
* Changed comment
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>
* - Updated license version to 12
- Added new SM license options
* Change seats, smseats, smserviceaccounts from short to int, like they are in the Bitwarden server code, to allow for the accurate maximum amount of seats
* BitBetter: update build.sh / update-bitwarden.sh
Bitwarden has changed the way they report version numbers for
self-hosted installations.
Fixes https://github.com/jakeswenson/BitBetter/issues/134
Credit to @Ayitaka for the fix
Tested and Verified, Updated install to 1.47.1
Signed-off-by: Donald Hoskins <grommish@gmail.com>
* Update build.sh
Remove extraneous comment
* update-bitwarden.sh: Fix relative path
update-bitwarden.sh attempted to update BitBetter via
./build.sh, but if run via crontab, you aren't in
the BitBetter directory.
Fixed to find it correctly.
Signed-off-by: Donald Hoskins <grommish@gmail.com>
* Update update-bitwarden.sh
Co-authored-by: h44z <christoph.h@sprinternet.at>
Co-authored-by: h44z <christoph.h@sprinternet.at>
* Use latest release of bitwarden as base image (#67, #66)
* Add a script which simplifies Bitwarden updates
* fix typo
* Add UseApi
* Updated version, created update section
* Workaround for docker-compose --ignore-pull-failures bugs (4377 and 7127)
* use version from docker script
* check if bitbetter images are outdated
Co-authored-by: Lework <kuailemy123@163.com>
Co-authored-by: Jake Swenson <jakeswenson@users.noreply.github.com>
Co-authored-by: Jeff Alyanak <jeff@alyanak.ca>
* Exclude cert.cert from git
* Use latest release of bitwarden as base image (#67, #66)
* Add a script which simplifies Bitwarden updates
* fix typo
* Add UseApi
* Updated version, created update section
* Workaround for docker-compose --ignore-pull-failures bugs (4377 and 7127)
* use version from docker script
* check if bitbetter images are outdated
* Make Sso available in org license
Add `UseSso` var and enable
* Update README.md
Co-authored-by: Christoph Haas <christoph.h@sprinternet.at>
Co-authored-by: Lework <kuailemy123@163.com>
Co-authored-by: Captainhook <ec14018@qmul.ac.uk>
* Make policies available in generated org licenses.
* Change license version to current value used in BitWarden. Add info about compatibility in README file.
Co-authored-by: Michiel Hazelhof <m.hazelhof@fyn.nl>
Due to compatibility issues laid out in issue #53:
Update from .net core 2.0 to 3.1 and newtonsoft.json 12.0.1 to 12.0.3.
* Update README.md
Added note that testing has been done up to Bitwarden 1.32.0.
Replaced editing of `docker-compose.yml` with the update-resistant usage
of `docker-compose.override.yml`
* Updated Readme
Better description of dependencies, updated readme.
* Fixed default key directory
Script was not looking in the right place for the auto-generated key directory. This patch fixes issue #35.
* Cleans up Key Directory Patch
Key directory path fix was echoing the directory when run.
* Fixed default key directory
Script was not looking in the right place for the auto-generated key directory. This patch fixes issue #35.
* Cleans up Key Directory Patch
Key directory path fix was echoing the directory when run.
* Use absolute path rather than relative path in scripts
* Remove src/bitBetter/.keys/cert.cert
* Build licenseGen in Docker
This way we don't have to install dotnet sdk on the host
* Build bitBetter in Docker
This way we don't have to install dotnet sdk on the host
* Change DIR in run.sh to point to the project root
* Replace echo in Dockerfiles by set -x and set -e
* Use same Dockerfile for api and identity images
* Update README.md
* Update CircleCI config
The Docker Executor can't mount volume.
https://support.circleci.com/hc/en-us/articles/360007324514https://circleci.com/docs/2.0/executor-types/#using-machine
* Make scripts work with sh
* Remove the container used to build bitBetter
* Added a Key Generating script
To make the keygen process a bit easier I've added a `generate-keys.sh` script that can be found in the `.keys` directory. It will generate the key & cert and bundle them into the required pkcs#12 file.
I've updated the readme to include instructions on the script.
* Generate bitbetter/identiry container with modified Core.dll
Added the generation of a second modified container, bitbetter/identity, which contains the modified dll. Fixes#12.
This works on my testing environment but has not gone through extensive testing. I'd recommend a review and cleanup of this commit before it is merged into the develop or master branches.
* Updated Docs
I've taken the steps written out by @online-stuff and consolidated/organized them into the README. This closes#13.
In a future update it might be worth adding a docs/ directory and breaking the readme into several docs that link to one another.
* Updated build.sh
Build now checks for and creates missing .keys directories.
* Added subj to allow for non-interactive use.
* Generate keys on build.
* Circle-ci needs to gen keys to test build
* Generate keys if they don't exist.
Don't overwrite if keys already exist.
* Generate keys online in the .keys directory
* Updated README.md
* Added initial interactive options
* Functional implementation of licensegen interactive mode.
* Bumped Newtonson.Json version
Never versions of the dotnet-sdk have issues with older Newtonsoft versions. 12.0.1 seems to satisfy the widest variety of sdk versions.
* Removing old readme
* Removed Duplicate Section
* Fixed typo
This fixes and closes issue #24.
* Added a Key Generating script
To make the keygen process a bit easier I've added a `generate-keys.sh` script that can be found in the `.keys` directory. It will generate the key & cert and bundle them into the required pkcs#12 file automatically when running the build script if none already exist.
* Generate bitbetter/identiry container with modified Core.dll
Added the generation of a second modified container, bitbetter/identity, which contains the modified dll. Fixes#12.
This works on my testing environment but has not gone through extensive testing. I'd recommend a review and cleanup of this commit before it is merged into the develop or master branches.
* Updated Docs
I've taken the steps written out by @online-stuff and consolidated/organized them into the README. This closes#13.
In a future update it might be worth adding a docs/ directory and breaking the readme into several docs that link to one another.
* Fixed Broken section Links
