Merge "Update Makefile configuration"
diff --git a/gerrit/files/gerrit.config b/gerrit/files/gerrit.config
index 61ecc78..2c53ba4 100644
--- a/gerrit/files/gerrit.config
+++ b/gerrit/files/gerrit.config
@@ -52,6 +52,12 @@
     {%- if server.auth.engine == 'OPENID_SSO' %}
     openIdSsoUrl = {{ server.auth.openid_sso_url }}
     {%- endif %}
+    {%- if server.auth.git_basic_auth is defined %}
+    gitBasicAuth = {{ server.auth.git_basic_auth }}
+    {%- endif %}
+    {%- if server.auth.git_basic_auth_policy is defined %}
+    gitBasicAuthPolicy = {{ server.auth.git_basic_auth_policy }}
+    {%- endif %}
 
 {%- if server.auth.engine == 'LDAP' %}
 [ldap]