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

chown nginx logs and data protect admin

Browse Source
This commit is contained in:
Kyle Spearrin
2018-03-27 21:37:35 -04:00
parent 02403596b5
commit d6e84a1212
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Admin/Startup.cs
View File

@ -15,12 +15,14 @@ namespace Bit.Admin
{ {
public class Startup public class Startup
{ {
public Startup(IConfiguration configuration) public Startup(IHostingEnvironment env, IConfiguration configuration)
{ {
Configuration = 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) public void ConfigureServices(IServiceCollection services)
{ {
@ -31,6 +33,9 @@ namespace Bit.Admin
var globalSettings = services.AddGlobalSettingsServices(Configuration); var globalSettings = services.AddGlobalSettingsServices(Configuration);
services.Configure<AdminSettings>(Configuration.GetSection("AdminSettings")); services.Configure<AdminSettings>(Configuration.GetSection("AdminSettings"));
// Data Protection
services.AddCustomDataProtectionServices(Environment, globalSettings);
// Stripe Billing // Stripe Billing
StripeConfiguration.SetApiKey(globalSettings.StripeApiKey); StripeConfiguration.SetApiKey(globalSettings.StripeApiKey);

1
util/Nginx/entrypoint.sh
View File

@ -19,5 +19,6 @@ chown -R bitwarden:bitwarden /etc/ssl
touch /var/run/nginx.pid touch /var/run/nginx.pid
chown -R bitwarden:bitwarden /var/run/nginx.pid chown -R bitwarden:bitwarden /var/run/nginx.pid
chown -R bitwarden:bitwarden /var/cache/nginx chown -R bitwarden:bitwarden /var/cache/nginx
chown -R bitwarden:bitwarden /var/log/nginx
gosu bitwarden:bitwarden nginx -g 'daemon off;' gosu bitwarden:bitwarden nginx -g 'daemon off;'