Fix #2807: Merge openmetadata.yaml and openmetadata-server.yaml

conf/openmetadata.yaml

@@ -113,6 +113,23 @@ database:
 migrationConfiguration:
   path: "./bootstrap/sql/mysql"
 
+# Authorizer Configuration
+authorizerConfiguration:
+  className: ${AUTHORIZER_CLASS_NAME:-org.openmetadata.catalog.security.NoopAuthorizer}
+  containerRequestFilter: ${AUTHORIZER_REQUEST_FILTER:-""}
+  adminPrincipals:
+    - ${AUTHORIZER_ADMIN_PRINCIPALS:-admin}
+  botPrincipals:
+    - ${AUTHORIZER_INGESTION_PRINCIPAL:-ingestion-bot]}
+  principalDomain: ${AUTHORIZER_PRINCIPAL_DOMAIN:-""}
+
+authenticationConfiguration:
+  provider: ${AUTHENTICATION_PROVIDER:-no-auth}
+  publicKey: ${AUTHENTICATION_PUBLIC_KEY:-https://www.googleapis.com/oauth2/v3/certs}
+  authority: ${AUTHENTICATION_AUTHORITY:-https://accounts.google.com}
+  clientId: ${AUTHENTICATION_CLIENT_ID:-""}
+  callbackUrl: ${AUTHENTICATION_CALLBACK_URL:-""}
+
 elasticsearch:
   host: ${ELASTICSEARCH_HOST:-localhost}
   port: ${ELASTICSEARCH_PORT:-9200}