nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 07:36:14 -05:00
Code Activity

new dir for docker env overrides dir

Browse Source
This commit is contained in:
Kyle Spearrin
2017-08-19 22:09:00 -04:00
parent aa56b51cb5
commit abcb63bf25
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/Setup/Helpers.cs
View File

@ -110,12 +110,12 @@ namespace Setup
public static string GetDatabasePasswordFronEnvFile()
{
if(!File.Exists("/bitwarden/docker/mssql.override.env"))
if(!File.Exists("/bitwarden/env/mssql.override.env"))
{
return null;
}
var lines = File.ReadAllLines("/bitwarden/docker/mssql.override.env");
var lines = File.ReadAllLines("/bitwarden/env/mssql.override.env");
foreach(var line in lines)
{
if(line.StartsWith("SA_PASSWORD="))

6
util/Setup/Program.cs
View File

@ -360,11 +360,11 @@ server {{
private static void BuildEnvironmentFiles()
{
Console.WriteLine("Building docker environment override files.");
Directory.CreateDirectory("/bitwarden/docker/");
Directory.CreateDirectory("/bitwarden/env/");
var dbPass = Helpers.SecureRandomString(32);
var dbConnectionString = Helpers.MakeSqlConnectionString("mssql", "vault", "sa", dbPass);
using(var sw = File.CreateText("/bitwarden/docker/global.override.env"))
using(var sw = File.CreateText("/bitwarden/env/global.override.env"))
{
sw.Write($@"globalSettings__baseServiceUri__vault={_url}
globalSettings__baseServiceUri__api={_url}/api
@ -389,7 +389,7 @@ globalSettings__pushRelayBaseUri=REPLACE");
}
}
using(var sw = File.CreateText("/bitwarden/docker/mssql.override.env"))
using(var sw = File.CreateText("/bitwarden/env/mssql.override.env"))
{
sw.Write($@"ACCEPT_EULA=Y
MSSQL_PID=Express