Skip to content

Commit a757992

Browse files
DavidJGapCRDavidJGapCR
committed
Progress
1 parent ad61b75 commit a757992

4 files changed

Lines changed: 34 additions & 15 deletions

File tree

‎Application/EdFi.Ods.AdminApi/appsettings.Development.json‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"AppSettings": {
33
"MultiTenancy": false,
4-
"DatabaseEngine": "PostgreSql",
4+
"DatabaseEngine": "SqlServer",
55
"CreateDbInstancesSweepIntervalInMins": 5,
66
"CreateDbInstancesMaxRetryAttempts": 3,
77
"DeleteDbInstancesSweepIntervalInMins": 5,
88
"DeleteDbInstancesMaxRetryAttempts": 3,
99
"IgnoresCertificateErrors": true,
1010
"adminApiMode": "v2",
1111
"EncryptionKey": "TDMyNH0lJmo7aDRnNXYoSmAwSXQpV09nbitHSWJTKn0=",
12-
"SqlServerMinimalBakFile": "./backups/EdFi_Ods_Minimal_Template.bak",
13-
"SqlServerSampleBakFile": "./backups/EdFi_Ods_Populated_Template.bak"
12+
"SqlServerMinimalBakFile": "/var/opt/mssql/data/sql-backups/EdFi.Ods.Minimal.Template.bak",
13+
"SqlServerSampleBakFile": "/var/opt/mssql/data/sql-backups/EdFi.Ods.Populated.Template.bak"
1414
},
1515
"AdminConsoleSettings": {
1616
"CorsSettings": {
@@ -28,19 +28,20 @@
2828
"RoleClaimAttribute": "http://schemas.microsoft.com/ws/2008/06/identity/claims/role",
2929
"AllowRegistration": true
3030
},
31-
/// PGSQL
31+
/// PGSQL:
32+
//"ConnectionStrings": {
33+
// "EdFi_Admin": "host=localhost;port=5880;username=postgres;password=P@ssw0rd;database=EdFi_Admin;pooling=true",
34+
// "EdFi_Security": "host=localhost;port=5880;username=postgres;password=P@ssw0rd;database=EdFi_Security;pooling=true",
35+
// "EdFi_Ods": "host=localhost;port=5401;username=postgres;password=P@ssw0rd;database=EdFi_Ods;pooling=true",
36+
// "EdFi_Master": "host=localhost;port=5401;username=postgres;password=P@ssw0rd;database=postgres;pooling=true"
37+
//},
38+
/// MSSQL:
3239
"ConnectionStrings": {
33-
"EdFi_Admin": "host=localhost;port=5880;username=postgres;password=P@ssw0rd;database=EdFi_Admin;pooling=true",
34-
"EdFi_Security": "host=localhost;port=5880;username=postgres;password=P@ssw0rd;database=EdFi_Security;pooling=true",
35-
"EdFi_Ods": "host=localhost;port=5401;username=postgres;password=P@ssw0rd;database=EdFi_Ods;pooling=true",
36-
"EdFi_Master": "host=localhost;port=5401;username=postgres;password=P@ssw0rd;database=postgres;pooling=true"
40+
"EdFi_Admin": "Data Source=localhost,1435;Initial Catalog=EdFi_Admin;Integrated Security=False;User Id=sa;Password=P@55w0rd;Encrypt=True;TrustServerCertificate=True",
41+
"EdFi_Security": "Data Source=localhost,1435;Initial Catalog=EdFi_Security;Integrated Security=False;User Id=sa;Password=P@55w0rd;Encrypt=True;TrustServerCertificate=True",
42+
"EdFi_Ods": "Data Source=localhost,1434;Initial Catalog=EdFi_Ods;Integrated Security=False;User Id=sa;Password=P@55w0rd;Encrypt=True;TrustServerCertificate=True",
43+
"EdFi_Master": "Data Source=localhost,1434;Initial Catalog=master;Integrated Security=False;User Id=sa;Password=P@55w0rd;Encrypt=True;TrustServerCertificate=True"
3744
},
38-
//"ConnectionStrings": { /// MSSQL
39-
// "EdFi_Admin": "Data Source=localhost,1435;Initial Catalog=EdFi_Admin;Integrated Security=False;User Id=sa;Password=P@55w0rd;Encrypt=True;TrustServerCertificate=True",
40-
// "EdFi_Security": "Data Source=localhost,1435;Initial Catalog=EdFi_Security;Integrated Security=False;User Id=sa;Password=P@55w0rd;Encrypt=True;TrustServerCertificate=True",
41-
// "EdFi_Ods": "Data Source=localhost,1434;Initial Catalog=EdFi_Ods;Integrated Security=False;User Id=sa;Password=P@55w0rd;Encrypt=True;TrustServerCertificate=True",
42-
// "EdFi_Master": "Data Source=localhost,1434;Initial Catalog=master;Integrated Security=False;User Id=sa;Password=P@55w0rd;Encrypt=True;TrustServerCertificate=True"
43-
//},
4445
"SwaggerSettings": {
4546
"EnableSwagger": true,
4647
"DefaultTenant": "tenant1"

‎Docker/V2/Compose/mssql/SingleTenant/compose-build-ods.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
MINIMAL_BAK_PATH: "${MINIMAL_BAK_PATH:-/sql-backups/EdFi.Ods.Minimal.Template.bak}"
1919
POPULATED_BAK_PATH: "${POPULATED_BAK_PATH:-/sql-backups/EdFi.Ods.Populated.Template.bak}"
2020
volumes:
21-
- ${SQL_BACKUPS_FOLDER:-./sql-backups}:/sql-backups:ro
21+
- ${SQL_BACKUPS_FOLDER:-C:/mssqlBac/}:/var/opt/mssql/data/sql-backups/:ro
2222
- vol-db-ods:/var/opt/mssql/data
2323
- vol-db-ods:/var/opt/mssql/log
2424
restart: always

‎Docker/V2/Compose/mssql/env.example‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,12 @@ KEYCLOAK_ADMIN_CONSOLE_REALM=edfi-admin-console
5656
TAG=7.3
5757
API_HEALTHCHECK_TEST="curl -f http://localhost/health"
5858
ODS_CONNECTION_STRING_ENCRYPTION_KEY=<Create a new string as symmetric encryption key>
59+
60+
61+
# Instance Management database templates. - pgsql
62+
MINIMAL_SQL_PATH=C:/pgsqlBak/EdFi.Ods.Minimal.Template.sql
63+
POPULATED_SQL_PATH=C:/pgsqlBak/EdFi.Ods.Populated.Template.sql
64+
65+
# Instance Management database templates. - mssqp
66+
MINIMAL_BAK_PATH=C:/mssqlBac/EdFi.Ods.Minimal.Template.bak
67+
POPULATED_BAK_PATH=C:/mssqlBac/EdFi.Ods.Populated.Template.bak

‎Docker/V2/Compose/pgsql/env.example‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,12 @@ ADMIN_API_HEALTHCHECK_TEST="wget -nv -t1 --spider http://${ADMIN_API_VIRTUAL_NAM
4545
TAG=7.3
4646
API_HEALTHCHECK_TEST="curl -f http://localhost/health"
4747
ODS_CONNECTION_STRING_ENCRYPTION_KEY=<Create a new string as symmetric encryption key>
48+
49+
50+
# Instance Management database templates. - pgsql
51+
MINIMAL_SQL_PATH=C:/pgsqlBak/EdFi.Ods.Minimal.Template.sql
52+
POPULATED_SQL_PATH=C:/pgsqlBak/EdFi.Ods.Populated.Template.sql
53+
54+
# Instance Management database templates. - mssqp
55+
MINIMAL_BAK_PATH=C:/mssqlBac/EdFi.Ods.Minimal.Template.bak
56+
POPULATED_BAK_PATH=C:/mssqlBac/EdFi.Ods.Populated.Template.bak

0 commit comments

Comments
 (0)