diff --git a/src/Admin/Startup.cs b/src/Admin/Startup.cs index eba2d59c8a..ffb1f5204f 100644 --- a/src/Admin/Startup.cs +++ b/src/Admin/Startup.cs @@ -15,12 +15,14 @@ namespace Bit.Admin { public class Startup { - public Startup(IConfiguration configuration) + public Startup(IHostingEnvironment env, IConfiguration configuration) { Configuration = configuration; + Environment = env; } - public IConfiguration Configuration { get; } + public IConfiguration Configuration { get; private set; } + public IHostingEnvironment Environment { get; set; } public void ConfigureServices(IServiceCollection services) { @@ -31,6 +33,9 @@ namespace Bit.Admin var globalSettings = services.AddGlobalSettingsServices(Configuration); services.Configure(Configuration.GetSection("AdminSettings")); + // Data Protection + services.AddCustomDataProtectionServices(Environment, globalSettings); + // Stripe Billing StripeConfiguration.SetApiKey(globalSettings.StripeApiKey); diff --git a/util/Nginx/entrypoint.sh b/util/Nginx/entrypoint.sh index e701b0c5fc..272a36afad 100644 --- a/util/Nginx/entrypoint.sh +++ b/util/Nginx/entrypoint.sh @@ -19,5 +19,6 @@ chown -R bitwarden:bitwarden /etc/ssl touch /var/run/nginx.pid chown -R bitwarden:bitwarden /var/run/nginx.pid chown -R bitwarden:bitwarden /var/cache/nginx +chown -R bitwarden:bitwarden /var/log/nginx gosu bitwarden:bitwarden nginx -g 'daemon off;'