From 8e6ede4ac7a788f48e2ae0317d0b54dbff16c0aa Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Tue, 20 Mar 2018 13:35:26 -0400
Subject: [PATCH] Small fixes for config schema validator in response to
 customer logs

---
 util/config/schema.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/config/schema.py b/util/config/schema.py
index 4cc4a825d..5ba7ae21c 100644
--- a/util/config/schema.py
+++ b/util/config/schema.py
@@ -406,7 +406,7 @@ CONFIG_SCHEMA = {
     'GITHUB_LOGIN_CONFIG': {
       'type': ['object', 'null'],
       'description': 'Configuration for using GitHub (Enterprise) as an external login provider',
-      'required': ['GITHUB_ENDPOINT', 'CLIENT_ID', 'CLIENT_SECRET'],
+      'required': ['CLIENT_ID', 'CLIENT_SECRET'],
       'x-reference': 'https://coreos.com/quay-enterprise/docs/latest/github-auth.html',
       'properties': {
         'GITHUB_ENDPOINT': {
@@ -738,11 +738,11 @@ CONFIG_SCHEMA = {
       'x-reference': 'https://www.google.com/recaptcha/intro/',
     },
     'RECAPTCHA_SITE_KEY': {
-      'type': 'string',
+      'type': ['string', 'null'],
       'description': 'If recaptcha is enabled, the site key for the Recaptcha service',
     },
     'RECAPTCHA_SECRET_KEY': {
-      'type': 'string',
+      'type': ['string', 'null'],
       'description': 'If recaptcha is enabled, the secret key for the Recaptcha service',
     },