Commit Graph

97 Commits

Author SHA1 Message Date
Michiel Hazelhof
ab8eed492c
Cleanup 2025-08-12 15:23:49 +02:00
Michiel Hazelhof
7203354204
Upgrade dnlib 2025-08-12 15:18:46 +02:00
Michiel Hazelhof
9ca720af8c
Remove NewtonSoft.Json 2025-08-12 15:16:59 +02:00
Michiel Hazelhof
6ba14a7134
Cleanup 2025-08-12 15:15:31 +02:00
Michiel Hazelhof
d8098cb560
Cleanup 2025-08-12 15:03:54 +02:00
Michiel Hazelhof
c72fbf5b1c
Reuse code 2025-08-12 15:03:48 +02:00
Michiel Hazelhof
0b0512570f
Clarify language 2025-08-12 15:02:49 +02:00
Michiel Hazelhof
dfc364e7f3
Simplify call 2025-08-12 15:02:30 +02:00
Michiel Hazelhof
48c67fc66e
Make call consistent 2025-08-12 15:02:21 +02:00
Michiel Hazelhof
80fcf0cfc6
Copy files only when needed 2025-08-12 15:01:57 +02:00
Michiel Hazelhof
e87bc81a9c
Copy all files 2025-08-12 15:01:26 +02:00
Michiel Hazelhof
93cae61d66
Refactor and fixes 2025-08-12 13:42:08 +02:00
Michiel Hazelhof
52fabd9a95
Cleanup code 2025-08-12 13:11:12 +02:00
Michiel Hazelhof
ddf67ec706
Cleanup code 2025-08-12 12:35:54 +02:00
Michiel Hazelhof
7786c4406c
Cleanup code 2025-08-12 12:18:28 +02:00
Michiel Hazelhof
f360f54e46
Update class path 2025-08-12 12:10:31 +02:00
Michiel Hazelhof
273ac7b4eb
Fix ps1 script and update language 2025-08-12 12:09:48 +02:00
Michiel Hazelhof
d34041c1e3
Test generating user and organization licenses during build check (#252) 2025-08-05 12:05:05 +02:00
Michiel Hazelhof
de61195d19
Fix license generator according to upstream changes (#245) (#249) 2025-08-05 12:03:30 +02:00
Michiel Hazelhof
a97f6f3e49
Upstream patches 2025-07-15 10:52:18 +02:00
Joseph Gigantino
3d4c10d6f6
Update Program.cs (#236)
Set three new license options to true: UseRiskInsights, UseOrganizationDomains, and UseAdminSponsoredFamilies.

As mentioned in #229, licenses had to be regenerated starting in 2025.5.0. It looks like new options were added which default to false unless we set them to true here. I am not sure if the version needs to be bumped or not. I tested locally and I can now access the Claimed Domains page in my organization.

Signed-off-by: Joseph Gigantino <128943406+Jgigantino31@users.noreply.github.com>
2025-06-25 12:40:00 +00:00
Joseph Gigantino
1597800b89
Update serverlist.txt so that by default all lines are comments (#228) 2025-06-25 12:34:10 +00:00
juliokele
02740e84b6
build.sh: fix line endings in serverlist.txt before executing commands (#232)
Co-authored-by: Gyula Kelemen <kgydevelopement@gmail.com>
2025-06-10 20:47:53 +02:00
Joseph Gigantino
d71aa84e52
Update Unified branch to account for move from Docker Hub to GHCR (#227)
* Update build.sh to reflect move to GHCR

* Update build.ps1 to reflect move to GHCR

* Update README.md to reflect move to GHCR

* Update Dockerfile-bitwarden-patch to reflect move to GHCR
2025-03-29 17:15:16 +00:00
Michiel Hazelhof
770dcd33f6
Move Manually generating Certificate & Key section in README.md for unified (#220)
* Update Dockerfile

See #215 and #207

* Move Manually generating Certificate & Key section in README.md

See #216
2025-01-12 12:14:30 +01:00
Michiel Hazelhof
b6d2c9244c
Update Dockerfile (#217)
See #215 and #207
2024-11-24 19:05:26 +01:00
Michiel Hazelhof
b47fe37279
Update license to version 15 (#211) (#212)
Co-authored-by: captainhook <16797541+captainhook@users.noreply.github.com>
2024-10-15 11:12:55 +01:00
Michiel Hazelhof
f75731633c
Use new location (#201) 2024-06-30 01:30:58 +00:00
Michiel Hazelhof
0a45513872
Follow master updates and general improvements (#194)
* Use correct framework

* Upgrade packages

* Remove unused variable

* Migrate away from deprecated package

* Improve naming

* Fix typo

* Simplify constructors
2024-03-31 11:13:05 +01:00
Michiel Hazelhof
c8192610dc
Properly fix Dockerfiles (#189) 2024-03-04 21:16:30 +00:00
Michiel Hazelhof
e4da85d46e
Updated the unified branch (#180)
* Updated license version to 12, added SM options, increased max seats (short to int) (#172)

* - 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

* Add extra ignore

* Code cleanup

* Ignore more VS cruft

* Bring up to date with upstream

(Update License to use Secrets Manager fully)

* Update to .NET 8.0
2024-02-23 14:44:27 +00:00
Michiel Hazelhof
38e6ebc5f9
Update licenseGen with latest version and options (#165) (#166)
Co-authored-by: Michiel Hazelhof <m.hazelhof@fyn.nl>
2023-04-23 12:41:27 +00:00
Michiel Hazelhof
d4abc9e5b7
Full Unified support including Linux and Windows (#155 / #154)
* Initial work

* Fix typo

* Fix typo

* Fix stupid issue

* Add comments and fix minor issues

* Add extra information

* Add Linux script for generating keys

* Add circleci

* Add comments

* Add extra option

* Add missing permissions and empty script for now

* Fix line endings

* Add missing mount point

* Simplify patch

* Fix scripts

* Reduce complexity

* Fix circleci

* Remove useless line

* Move to src folder and improve image creation
2023-01-16 21:13:43 +01:00
h44z
b819fe0c7d
update to dotnet 6.0 (#148) (#150) 2022-09-01 14:43:34 -07:00
h44z
960894cff4
update/remove json lib (#146)
* update/remove json lib

* remove json lib
2022-08-16 13:34:17 -07:00
h44z
6038a8668b
License gen fixes (#145)
* set default storage space to max (#122)

* update license fields to newest version

* strange characters for non-interactive mode (#123)
2022-08-16 22:32:39 +02:00
Alexander Detsch
101f078a98
Update README, E-Mail Verification constraint (#140)
thanks =)
2022-06-27 22:01:37 +02:00
Grommish
338ea68b08
BitBetter: update build.sh / update-bitwarden.sh (#135)
* 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
2022-04-08 21:49:08 -07:00
h44z
a58baf0186
Update README (#132)
- Update tested version
 - Add hint for upgrading from versions prior to 1.46.2
 - Add hint for Families Organization license
2022-03-22 11:49:13 +00:00
h44z
50cdb10b2c
Fix #128 (#129)
Fix #128
2022-03-21 21:20:32 +01:00
Reliacon Developer
d2377d0f84
Update bitwarden.sh path (#127)
* Update bitwarden.sh path

* Update update-bitwarden.sh

Co-authored-by: Alex Pearce <alexpearce92@gmail.com>
2022-03-03 19:28:02 +01:00
Grommish
0f2f9274cf
update-bitwarden.sh: Fix relative path (#111)
* 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>
2021-08-31 11:40:37 +02:00
clanto007
af2d744061
fix '3.1.0' was not found (#116)
* Update build.sh

* Update Dockerfile

* Update bitBetter.csproj

* Update Dockerfile

* Update Dockerfile

* Update licenseGen.csproj

* Apply suggestions from code review

Co-authored-by: h44z <christoph.h@sprinternet.at>

* Update src/licenseGen/Dockerfile

Co-authored-by: h44z <christoph.h@sprinternet.at>

* Update src/licenseGen/Dockerfile

Co-authored-by: h44z <christoph.h@sprinternet.at>
2021-08-31 10:18:29 +02:00
captainhook
a17681e82b
fix integer type (#110)
fix integer type for GenerateOrgLicense's "Seats" value
2021-08-09 18:10:49 +02:00
captainhook
21bffcf262
Update update-bitwarden.sh (#95)
Prune Docker images to reclaim space
2021-03-17 10:38:54 +01:00
p0thi
59ee2e3c3a
Make update-bitwarden.sh able to run non-interactive (#90)
* make update-bitwarden.sh able to run non-interactive

* changed script to be runnable by bash 3.x & README entry edited
2021-01-27 14:51:13 +01:00
kerenon
7ddf01fdf6
MaxStorageGb customization (#88)
* MaxStorageGb customization

* Defaulting to short.MaxValue if user entry is blank

* Update text prompt
2020-11-26 13:04:18 +00:00
captainhook
46934b0ddd
Update README.md (#84)
Correct licenseGen build step

Co-authored-by: h44z <christoph.h@sprinternet.at>
2020-10-06 14:52:55 +01:00
Joe S
a5516220fd
Fix wrong directory mistake, fix grammer (#83)
Fixed the license generator section
2020-10-06 15:49:47 +02:00
h44z
91d0155725
Fix build.sh and update script (#75) (#77)
* possible fix for #75

* Remove outdated bitbetter images as suggested by Ayitaka

* Fix exit status if no old images have been removed
2020-09-19 23:36:15 +01:00