nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-22 12:04:27 -05:00
Code

only add push setting when installing

Browse Source
This commit is contained in:
Kyle Spearrin 2017-11-07 11:43:26 -05:00
parent bf8e5e392d
commit cf06cd76d5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/Setup/EnvironmentFileBuilder.cs
View File

@ -21,19 +21,19 @@ namespace Bit.Setup
public void BuildForInstaller() public void BuildForInstaller()
{ {
Directory.CreateDirectory("/bitwarden/env/"); Directory.CreateDirectory("/bitwarden/env/");
Init(); Init(true);
Build(); Build();
} }
public void BuildForUpdater() public void BuildForUpdater()
{ {
Init(); Init(false);
LoadExistingValues(_globalValues, "/bitwarden/env/global.override.env"); LoadExistingValues(_globalValues, "/bitwarden/env/global.override.env");
LoadExistingValues(_mssqlValues, "/bitwarden/env/mssql.override.env"); LoadExistingValues(_mssqlValues, "/bitwarden/env/mssql.override.env");
Build(); Build();
} }
private void Init() private void Init(bool forInstall)
{ {
var dbConnectionString = Helpers.MakeSqlConnectionString("mssql", "vault", "sa", DatabasePassword); var dbConnectionString = Helpers.MakeSqlConnectionString("mssql", "vault", "sa", DatabasePassword);
_globalValues = new Dictionary<string, string> _globalValues = new Dictionary<string, string>
@ -63,7 +63,7 @@ namespace Bit.Setup
["globalSettings__disableUserRegistration"] = "false", ["globalSettings__disableUserRegistration"] = "false",
}; };
if(!Push) if(!forInstall && !Push)
{ {
_globalValues.Add("globalSettings__pushRelayBaseUri", "REPLACE"); _globalValues.Add("globalSettings__pushRelayBaseUri", "REPLACE");
} }