notazof/yavsc
1
1
Fork 0
Code Issues Pull requests Projects 1 Releases 4 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; }

7
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;"
}
} }
} }

111
cli/project.json
View file

@ -1,56 +1,65 @@
{ {
"version": "1.0.5-*", "version": "1.0.5-*",
"commands": { "commands": {
"run": "run" "run": "run"
},
"resource": "Resources/**/*.resx",
"buildOptions": {
"debugType": "full",
"emitEntryPoint": true,
"compile": {
"include": "*.cs",
"exclude": [
"contrib"
]
}, },
"resource": "Resources/**/*.resx", "embed": [
"buildOptions": { "Resources/**/*.resx"
"debugType": "full", ]
"emitEntryPoint": true, },
"compile": { "dependencies": {
"include": "*.cs", "EntityFramework7.Npgsql": "3.1.0-rc1-3",
"exclude": [ "MailKit": "1.12.0",
"contrib" "Microsoft.AspNet.Hosting": "1.0.0-rc1-final",
] "Microsoft.AspNet.Identity": "3.0.0-rc1-*",
}, "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
"embed": [ "Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
"Resources/**/*.resx" "Microsoft.CodeAnalysis": "1.1.0-rc1-20151109-01",
] "Microsoft.Extensions.CodeGeneration": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final",
"Microsoft.Extensions.DependencyInjection": "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.Logging": "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.Localization": "1.0.0-rc1-final",
"Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Options": "0.0.1-alpha",
"Microsoft.Extensions.WebEncoders": "1.0.0-rc1-final",
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final",
"Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
"Newtonsoft.Json": "9.0.1",
"Yavsc": {
"version": "1.0.5-rc21-beta5",
"target": "package"
}, },
"dependencies": { "Yavsc.Abstract": {
"EntityFramework7.Npgsql": "3.1.0-rc1-3", "version": "1.0.5-rc21-beta5",
"MailKit": "1.12.0", "target": "package"
"Microsoft.AspNet.Hosting": "1.0.0-rc1-final",
"Microsoft.AspNet.Identity": "3.0.0-rc1-*",
"Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
"Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
"Microsoft.CodeAnalysis": "1.1.0-rc1-20151109-01",
"Microsoft.Extensions.CodeGeneration": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final",
"Microsoft.Extensions.DependencyInjection": "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.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.Console": "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.Options": "0.0.1-alpha",
"Microsoft.Extensions.WebEncoders": "1.0.0-rc1-final",
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final",
"Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
"Newtonsoft.Json": "9.0.1",
"Yavsc": { "version": "1.0.5-rc21-beta4", "target": "package" },
"Yavsc.Abstract": { "version": "1.0.5-rc21-beta4", "target": "package" },
"Yavsc.Server": { "version": "1.0.5-rc21-beta4", "target": "package" }
}, },
"frameworks": { "Yavsc.Server": {
"dnx451": { "version": "1.0.5-rc21-beta5",
"System.Net": "4.0.0" "target": "package"
} },
"Yavsc.Lib.Portable": "1.0.2"
},
"frameworks": {
"dnx451": {
"System.Net": "4.0.0"
} }
}
} }

2
rc-num.txt
View file

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