notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests 1 Projects 2 Releases 9 Packages Wiki Activity Actions

a environment name for the cx string

Browse source
This commit is contained in:
Paul Schneider 2018-06-29 10:30:04 +02:00
commit d00a71e57a
6 changed files with 72 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Yavsc.Server/Constants.cs
View file

@ -29,7 +29,8 @@ namespace Yavsc
AvatarsPath = "/avatars", AvatarsPath = "/avatars",
GitPath = "/sources", GitPath = "/sources",
DefaultAvatar = "/images/Users/icon_user.png", DefaultAvatar = "/images/Users/icon_user.png",
AnonAvatar = "/images/Users/icon_anon_user.png"; AnonAvatar = "/images/Users/icon_anon_user.png",
YavscConnectionStringEnvName = "YAVSC_DB_CONNECTION";
public static readonly long DefaultFSQ = 1024*1024*500; public static readonly long DefaultFSQ = 1024*1024*500;

3
Yavsc/Models/ApplicationDbContext.cs
View file

@ -71,7 +71,8 @@ namespace Yavsc.Models
} }
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{ {
optionsBuilder.UseNpgsql((string) AppDomain.CurrentDomain.GetData("YAVSC_CONNECTION")); var appSetup = (string)AppDomain.CurrentDomain.GetData(Constants.YavscConnectionStringEnvName);
if (appSetup!=null) optionsBuilder.UseNpgsql(appSetup);
} }
public DbSet<Client> Applications { get; set; } public DbSet<Client> Applications { get; set; }

2
Yavsc/Startup/Startup.cs
View file

@ -78,7 +78,7 @@ namespace Yavsc
var auth = Configuration["Site:Authority"]; var auth = Configuration["Site:Authority"];
var cxstr = Configuration["Data:DefaultConnection:ConnectionString"]; var cxstr = Configuration["Data:DefaultConnection:ConnectionString"];
ConnectionString = cxstr; ConnectionString = cxstr;
AppDomain.CurrentDomain.SetData("YAVSC_CONNECTION", ConnectionString); AppDomain.CurrentDomain.SetData(Constants.YavscConnectionStringEnvName, ConnectionString);
} }
public static string ConnectionString { get; set; } public static string ConnectionString { get; set; }
public static GoogleAuthSettings GoogleSettings { get; set; } public static GoogleAuthSettings GoogleSettings { get; set; }

5
cli/appsettings.json
View file

@ -15,5 +15,10 @@
"System": "Warning", "System": "Warning",
"Microsoft": "Warning" "Microsoft": "Warning"
} }
},
"Data": {
"DefaultConnection": {
"ConnectionString": "Server=localhost;Port=5432;Database=YavscDev;Username=yavscdev;Password=admin;"
}
} }
} }

23
cli/project.json
View file

@ -1,4 +1,4 @@
{ {
"version": "1.0.5-*", "version": "1.0.5-*",
"commands": { "commands": {
"run": "run" "run": "run"
@ -32,21 +32,30 @@
"Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final", "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final",
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final", "Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final",
"Microsoft.Extensions.Localization": "1.0.0-rc1-final",
"Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging": "1.0.0-rc1-final", "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final", "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final", "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final", "Microsoft.Extensions.Localization": "1.0.0-rc1-final",
"Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Options": "0.0.1-alpha", "Microsoft.Extensions.Options": "0.0.1-alpha",
"Microsoft.Extensions.WebEncoders": "1.0.0-rc1-final", "Microsoft.Extensions.WebEncoders": "1.0.0-rc1-final",
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final", "Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final",
"Microsoft.Framework.Configuration.Json": "1.0.0-beta8", "Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4", "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
"Newtonsoft.Json": "9.0.1", "Newtonsoft.Json": "9.0.1",
"Yavsc": { "version": "1.0.5-rc21-beta4", "target": "package" }, "Yavsc": {
"Yavsc.Abstract": { "version": "1.0.5-rc21-beta4", "target": "package" }, "version": "1.0.5-rc21-beta5",
"Yavsc.Server": { "version": "1.0.5-rc21-beta4", "target": "package" } "target": "package"
},
"Yavsc.Abstract": {
"version": "1.0.5-rc21-beta5",
"target": "package"
},
"Yavsc.Server": {
"version": "1.0.5-rc21-beta5",
"target": "package"
},
"Yavsc.Lib.Portable": "1.0.2"
}, },
"frameworks": { "frameworks": {
"dnx451": { "dnx451": {

2
rc-num.txt
View file

@ -1 +1 @@
21-beta4 21-beta5