mirror of
https://github.com/bitwarden/server.git
synced 2025-06-30 23:52:50 -05:00
Feature/self hosted development (#1921)
* Add self-host option to migration runner * Add Self-host launch options * Add self-hosted settings override Let's a single secrets/env config file control both cloud and self-hosted settings by allowing overrides to cloud settings with self-hosted * Allow dev-signed licenses on dev self-hosted * Allow setting bitwarden cloud api url Useful for testing api integration between installations and cloud * Remove testing echoes * Remove run config property groups * Use `getopts` for options * Pass in full environment
This commit is contained in:
@ -15,6 +15,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="licensing.cer" />
|
||||
<EmbeddedResource Include="licensing_dev.cer" />
|
||||
<EmbeddedResource Include="MailTemplates\Handlebars\**\*.hbs" />
|
||||
</ItemGroup>
|
||||
|
||||
|
@ -45,12 +45,12 @@ namespace Bit.Core.Services
|
||||
_logger = logger;
|
||||
_globalSettings = globalSettings;
|
||||
|
||||
var certThumbprint = environment.IsDevelopment() && !_globalSettings.SelfHosted ?
|
||||
var certThumbprint = environment.IsDevelopment() ?
|
||||
"207E64A231E8AA32AAF68A61037C075EBEBD553F" :
|
||||
"B34876439FCDA2846505B2EFBBA6C4A951313EBE";
|
||||
if (_globalSettings.SelfHosted)
|
||||
{
|
||||
_certificate = CoreHelpers.GetEmbeddedCertificateAsync("licensing.cer", null)
|
||||
_certificate = CoreHelpers.GetEmbeddedCertificateAsync(environment.IsDevelopment() ? "licensing_dev.cer" : "licensing.cer", null)
|
||||
.GetAwaiter().GetResult();
|
||||
}
|
||||
else if (CoreHelpers.SettingHasValue(_globalSettings.Storage?.ConnectionString) &&
|
||||
|
@ -424,6 +424,7 @@ namespace Bit.Core.Settings
|
||||
public class InstallationSettings
|
||||
{
|
||||
private string _identityUri;
|
||||
private string _apiUri;
|
||||
|
||||
public Guid Id { get; set; }
|
||||
public string Key { get; set; }
|
||||
@ -432,6 +433,10 @@ namespace Bit.Core.Settings
|
||||
get => string.IsNullOrWhiteSpace(_identityUri) ? "https://identity.bitwarden.com" : _identityUri;
|
||||
set => _identityUri = value;
|
||||
}
|
||||
public string ApiUri
|
||||
{
|
||||
get => string.IsNullOrWhiteSpace(_apiUri) ? "https://api.biwarden.com" : _apiUri;
|
||||
}
|
||||
}
|
||||
|
||||
public class AmazonSettings
|
||||
|
BIN
src/Core/licensing_dev.cer
Normal file
BIN
src/Core/licensing_dev.cer
Normal file
Binary file not shown.
Reference in New Issue
Block a user