From 4b8296c6eac517fa2c2edfab544935b37b285b3c Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Thu, 7 Nov 2019 16:45:11 -0500
Subject: [PATCH 1/3] Remove unused configuration values from base.ini

---
 .secrets.baseline | 21 +++------------------
 config/base.ini   |  2 --
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 1060e869..a91a62c1 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$|^.*pgsslrootcert.yml$",
     "lines": null
   },
-  "generated_at": "2019-11-06T21:35:23Z",
+  "generated_at": "2019-11-07T21:45:03Z",
   "plugins_used": [
     {
       "base64_limit": 4.5,
@@ -17,7 +17,6 @@
       "name": "HexHighEntropyString"
     },
     {
-      "keyword_exclude": null,
       "name": "KeywordDetector"
     },
     {
@@ -94,25 +93,11 @@
       }
     ],
     "config/base.ini": [
-      {
-        "hashed_secret": "aa419433d95be86df254d499243bee1d5173f1ae",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 8,
-        "type": "Secret Keyword"
-      },
       {
         "hashed_secret": "afc848c316af1a89d49826c5ae9d00ed769415f3",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 21,
-        "type": "Secret Keyword"
-      },
-      {
-        "hashed_secret": "abcdb568713c255c81376829da20004ba9463fd3",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 29,
+        "line_number": 20,
         "type": "Secret Keyword"
       }
     ],
@@ -189,7 +174,7 @@
       }
     ]
   },
-  "version": "0.13.0",
+  "version": "0.12.7",
   "word_list": {
     "file": null,
     "hash": null
diff --git a/config/base.ini b/config/base.ini
index 7fcdd19f..31157749 100644
--- a/config/base.ini
+++ b/config/base.ini
@@ -5,7 +5,6 @@ CA_CHAIN = ssl/server-certs/ca-chain.pem
 CLASSIFIED = false
 CONTRACT_START_DATE = 2019-09-14
 CONTRACT_END_DATE = 2022-09-14
-COOKIE_SECRET = some-secret-please-replace
 DISABLE_CRL_CHECK = false
 CRL_FAIL_OPEN = false
 CRL_STORAGE_CONTAINER = crls
@@ -26,7 +25,6 @@ PGUSER = postgres
 PORT=8000
 REDIS_URI = redis://localhost:6379
 RQ_QUEUES = atat_%(ENVIRONMENT)s
-SECRET = change_me_into_something_secret
 SECRET_KEY = change_me_into_something_secret
 SERVER_NAME
 SESSION_COOKIE_NAME=atat

From 4a66bf4d29597c715a0f6c179d8376ec8b275d63 Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Thu, 7 Nov 2019 16:45:31 -0500
Subject: [PATCH 2/3] Remove prod.ini, becase it's useless

---
 config/prod.ini | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 config/prod.ini

diff --git a/config/prod.ini b/config/prod.ini
deleted file mode 100644
index ebc1dc40..00000000
--- a/config/prod.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[default]
-SESSION_COOKIE_SECURE=True
-SESSION_COOKIE_DOMAIN=atat.codes
-LIMIT_CONCURRENT_SESSIONS=True

From 6a1e1b8de88a8ecc2984da1718f93c9cab19d7fd Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Tue, 12 Nov 2019 16:42:49 -0500
Subject: [PATCH 3/3] Remove STORAGE_PROVIDER from test config

---
 .secrets.baseline | 5 +++--
 config/test.ini   | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index a91a62c1..532960ab 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$|^.*pgsslrootcert.yml$",
     "lines": null
   },
-  "generated_at": "2019-11-07T21:45:03Z",
+  "generated_at": "2019-11-12T21:42:30Z",
   "plugins_used": [
     {
       "base64_limit": 4.5,
@@ -17,6 +17,7 @@
       "name": "HexHighEntropyString"
     },
     {
+      "keyword_exclude": null,
       "name": "KeywordDetector"
     },
     {
@@ -174,7 +175,7 @@
       }
     ]
   },
-  "version": "0.12.7",
+  "version": "0.13.0",
   "word_list": {
     "file": null,
     "hash": null
diff --git a/config/test.ini b/config/test.ini
index 37a9e629..7336a510 100644
--- a/config/test.ini
+++ b/config/test.ini
@@ -4,6 +4,5 @@ ENVIRONMENT = test
 PGDATABASE = atat_test
 CRL_STORAGE_CONTAINER = tests/fixtures/crl
 WTF_CSRF_ENABLED = false
-STORAGE_PROVIDER=LOCAL
 PRESERVE_CONTEXT_ON_EXCEPTION = false
 CSP=mock-test