From 5ccc62cd3f57e6507c0595f179ee2999aea00e3c Mon Sep 17 00:00:00 2001
From: Henrique Goncalves <kamus@hadenes.io>
Date: Fri, 4 Jun 2021 06:31:11 -0300
Subject: [PATCH] Small Fixes for Heroku and Render.com (#718)

* remove unused env vars and use default domain

* clarify render.com wait time

* small changes
---
 app.json                         | 36 --------------------------------
 packer/heroku/squidex/squidex.sh |  4 ++++
 packer/render/squidex/squidex.sh | 10 ++++++++-
 render.yaml                      | 19 +----------------
 4 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/app.json b/app.json
index a4603d5e0..95239f665 100644
--- a/app.json
+++ b/app.json
@@ -17,42 +17,6 @@
     "MONGO_PASSWORD": {
       "description": "Mongo Password (see MONGO_USERNAME)",
       "value": "Squidex123"
-    },
-    "EVENTSTORE__TYPE": {
-      "description": "EventStore Type",
-      "value": "MongoDB"
-    },
-    "IDENTITY__ADMINEMAIL": {
-      "description": "Admin Email",
-      "value": "squidex@example.com"
-    },
-    "IDENTITY__ADMINPASSWORD": {
-      "description": "Admin Password",
-      "generator": "secret"
-    },
-    "IDENTITY__GOOGLECLIENT": {
-      "description": "Google Client ID",
-      "required": false
-    },
-    "IDENTITY__GOOGLESECRET": {
-      "description": "Google Secret",
-      "required": false
-    },
-    "IDENTITY__GITHUBCLIENT": {
-      "description": "GitHub Client ID",
-      "required": false
-    },
-    "IDENTITY__GITHUBSECRET": {
-      "description": "GitHub Secret",
-      "required": false
-    },
-    "IDENTITY__MICROSOFTCLIENT": {
-      "description": "Microsoft Client ID",
-      "required": false
-    },
-    "IDENTITY__MICROSOFTSECRET": {
-      "description": "Microsoft Secret",
-      "required": false
     }
   },
   "formation": {
diff --git a/packer/heroku/squidex/squidex.sh b/packer/heroku/squidex/squidex.sh
index b9e047bff..fc2f79aa7 100644
--- a/packer/heroku/squidex/squidex.sh
+++ b/packer/heroku/squidex/squidex.sh
@@ -10,4 +10,8 @@ export STORE__MONGODB__CONTENTDATABASE="Squidex"
 
 export ASPNETCORE_URLS="http://+:$PORT"
 
+export IDENTITY__GOOGLECLIENT=""
+export IDENTITY__GITHUBCLIENT=""
+export IDENTITY__MICROSOFTCLIENT=""
+
 dotnet Squidex.dll
\ No newline at end of file
diff --git a/packer/render/squidex/squidex.sh b/packer/render/squidex/squidex.sh
index 97d881775..3290b7f32 100644
--- a/packer/render/squidex/squidex.sh
+++ b/packer/render/squidex/squidex.sh
@@ -1,10 +1,18 @@
 #!/bin/sh
 
-echo "Waiting 60 seconds ..."
+echo "Waiting 60 seconds for MongoDB ..."
 sleep 60
 
+if [ "x$DOMAIN" = "x" ]; then
+    export DOMAIN=$RENDER_EXTERNAL_HOSTNAME
+fi
+
 export URLS__BASEURL="https://${DOMAIN}"
 export EVENTSTORE__MONGODB__CONFIGURATION="mongodb://${MONGO}"
 export STORE__MONGODB__CONFIGURATION="mongodb://${MONGO}"
 
+export IDENTITY__GOOGLECLIENT=""
+export IDENTITY__GITHUBCLIENT=""
+export IDENTITY__MICROSOFTCLIENT=""
+
 dotnet Squidex.dll
\ No newline at end of file
diff --git a/render.yaml b/render.yaml
index b103291e9..5713ca61f 100644
--- a/render.yaml
+++ b/render.yaml
@@ -1,3 +1,4 @@
+autoDeploy: false
 services:
   - type: web
     name: squidex_squidex
@@ -18,24 +19,6 @@ services:
           name: squidex_mongo
           type: pserv
           property: hostport
-      - key: EVENTSTORE__TYPE
-        value: MongoDB
-      - key: IDENTITY__ADMINEMAIL
-        sync: false
-      - key: IDENTITY__ADMINPASSWORD
-        generateValue: true
-      - key: IDENTITY__GOOGLECLIENT
-        sync: false
-      - key: IDENTITY__GOOGLESECRET
-        sync: false
-      - key: IDENTITY__GITHUBCLIENT
-        sync: false
-      - key: IDENTITY__GITHUBSECRET
-        sync: false
-      - key: IDENTITY__MICROSOFTCLIENT
-        sync: false
-      - key: IDENTITY__MICROSOFTSECRET
-        sync: false
       - key: ASPNETCORE_URLS
         value: http://+:5000
   - type: pserv