Merge pull request #37 from stephenfuqua/AA-820

[AA-820] Admin App developer settings
Ed-Fi-Alliance-OSS · Jan 7, 2021 · e85a4a2 · e85a4a2
2 parents 1ab5800 + cb1d044
commit e85a4a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Web-Ods-AdminApp/appsettings.template.json b/Web-Ods-AdminApp/appsettings.template.json
@@ -28,6 +28,9 @@
     "Security": "host=$ADMIN_DB;port=5432;username=$POSTGRES_USER;password=$POSTGRES_PASSWORD;database=EdFi_Security;Application Name=EdFi.Ods.AdminApp",
     "ProductionOds": "host=$ODS_DB;port=5432;username=$POSTGRES_USER;password=$POSTGRES_PASSWORD;database=EdFi_Ods;Application Name=EdFi.Ods.AdminApp"   
   },
+  "Log4NetCore": {
+      "Log4NetConfigFileName": "./log4net.config"
+  },
   "Logging": {
       "LogLevel": {
           "Default": "Information",

diff --git a/compose-shared-instance-env-build.yml b/compose-shared-instance-env-build.yml
@@ -80,6 +80,7 @@ services:
       ODS_DB: db-ods
       ADMIN_DB: db-admin
       API_MODE: "SharedInstance"
+      ENCRYPTION_KEY: "${ENCRYPTION_KEY}"
     volumes:
       - ${LOGS_FOLDER}:/app/logs
       - adminapp-bulk-hashcache:/app/BulkUploadHashCache