Fix conflicts

ir-engine · Jul 31, 2024 · 99f8e23 · 99f8e23
1 parent a688d8b
commit 99f8e23
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/...es/05_infrastructure/03_devopsDeployment/04_AppleSSOSetup/02_GenerateClientSecretForApple b/...es/05_infrastructure/03_devopsDeployment/04_AppleSSOSetup/02_GenerateClientSecretForApple
@@ -59,7 +59,6 @@ Please note that this Client Secret will expire in 6 months, we cannot increase
 
 # Updating the Client Secret in IR Studio
 
-<<<<<<< HEAD
 Every 6 months, when the Client Secret will expire, you will have to get it updated in the running instances of IR Studio as per the following.
 
 - Generate a new Client Secret as mentioned above.
@@ -70,11 +69,6 @@ Every 6 months, when the Client Secret will expire, you will have to get it upda
 ```
 helm repo update && helm upgrade --reuse-values --set api.extraEnv.APPLE_CALLBACK_URL=https://ir-engine-mt-dev-api.theinfinitereality.io/oauth/apple/callback --set api.extraEnv.APPLE_CLIENT_ID=com.ir-engine.mt-dev.id --set api.extraEnv.APPLE_CLIENT_SECRET="eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik03N0xRNzVUN1oifQ.eyJpc3MiOiJVS1haTVoyM1A0IiwiYXVkIjoiaHR0cHM6Ly9hcHBsZWlkLmFwcGxlLmNvbSIsInN1YiI6ImNvbS5pci1lbmdpbmUubXQtZGV2LmlkIiwiaWF0IjoxNzIyNDAwMDY3LCJleHAiOjE3Mzc5NTIwNjd9.UI6CYITfZCFN6zgY8SRIeGGlzntfB23TcZOr12sdGorBnzt0K37ZVGm7BT5uIhVEbMWFCSklHDWYFW-SCDUhRA" --set media.extraEnv.APPLE_CALLBACK_URL=https://ir-engine-mt-dev-api.theinfinitereality.io/oauth/apple/callback --set media.extraEnv.APPLE_CLIENT_ID=com.ir-engine.mt-dev.id --set media.extraEnv.APPLE_CLIENT_SECRET="eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik03N0xRNzVUN1oifQ.eyJpc3MiOiJVS1haTVoyM1A0IiwiYXVkIjoiaHR0cHM6Ly9hcHBsZWlkLmFwcGxlLmNvbSIsInN1YiI6ImNvbS5pci1lbmdpbmUubXQtZGV2LmlkIiwiaWF0IjoxNzIyNDAwMDY3LCJleHAiOjE3Mzc5NTIwNjd9.UI6CYITfZCFN6zgY8SRIeGGlzntfB23TcZOr12sdGorBnzt0K37ZVGm7BT5uIhVEbMWFCSklHDWYFW-SCDUhRA" <MT and MT builder Release Name> etherealengine/etherealengine
 ```
-=======
-1. Generate a new Client Secret as mentioned above. 
-2. On the Deployed instance, go to '/admin/settings#authentication'.
-3. Update the Apple Client Secret and hit save, it should take a couple of minutes to restart the API pods and should be done then.
->>>>>>> f16c24753d1de49e18e91a76514d640794d9cc65
 
 # Future Work/Recommendations