From e176ea4b658cb0044c167a6794fbec915fcf362f Mon Sep 17 00:00:00 2001
From: Rob Moffat <rob@kite9.com>
Date: Thu, 28 Apr 2022 11:51:18 +0100
Subject: [PATCH 1/2] Updated example application.yml

---
 .../application.examplebotidentity.yml        | 14 -----
 demos/demo-bot/application.yml                | 52 +++++++++----------
 2 files changed, 25 insertions(+), 41 deletions(-)
 delete mode 100644 demos/demo-bot/application.examplebotidentity.yml

diff --git a/demos/demo-bot/application.examplebotidentity.yml b/demos/demo-bot/application.examplebotidentity.yml
deleted file mode 100644
index 502d383dc..000000000
--- a/demos/demo-bot/application.examplebotidentity.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# in your application.yml file, express your bot identity something like the below:
-
-symphony:
-  bot:
-    identity:
-      email: evil.bot@example.com
-      commonName: evil.bot.on.symphony
-      # either specify as a p12...
-      password: changeit
-      location: file:./some.p12
-      # or insert pems into your application.yml
-      privateKey:  "-----BEGIN PRIVATE KEY-----\nMIIE...g3x6A==\n-----END PRIVATE KEY-----"
-      certificates:
-      - "-----BEGIN CERTIFICATE-----\nMIIC7z...xBXKt4=\n-----END CERTIFICATE-----"  
\ No newline at end of file
diff --git a/demos/demo-bot/application.yml b/demos/demo-bot/application.yml
index 37e578ce1..3674a5188 100644
--- a/demos/demo-bot/application.yml
+++ b/demos/demo-bot/application.yml
@@ -1,29 +1,27 @@
 #set the room for the bot to post in.  Bot (and you) should be members of this room
-room: y3EJYqKMwG7Jn7_YqyYdiX___pR3YrnTdA==
+room: y3EJYqKMwG7Jn7_YqyYdiX___pR3YrnTdA==  # this is a symphony room here.
+server:
+  port: 8080
 
-symphony:
-#  trust-store:
-#    location: classpath:/example-trust.crt
-#    type: PEMS
-  apis:
-  - id: develop
-    pod:
-      url: https://develop.symphony.com/pod
-#     proxy:
-#       host: <your proxy host>
-#       user: <optional>
-#       password: <optional>
-#       port: <default 8080>
-    sessionauth:
-      url: https://develop.symphony.com/sessionauth
-#     proxy:  as above
-    keyauth:
-      url: https://develop.symphony.com/keyauth
-#     proxy:  as above
-    agent: 
-      url: https://develop.symphony.com/agent
-#     proxy:  as above
-    login: 
-      url: https://develop.symphony.com/login
-    relay:
-      url: https://develop.symphony.com/relay
+# include if using symphony
+bdk:
+  host: develop.symphony.com #your pod id.
+  bot:
+    username: symphony.practice.bot1 # bot id
+    privateKey:  
+      path: private-key.pem # bot private key
+
+# include if using teams
+teams:
+  storage:
+    type: blob
+    connection-string: # blob storage details
+  app:
+    tennantId: # tennant id for teams instance
+  bot:
+    MicrosoftAppPassword: # bot password
+    MicrosoftAppId: # bot app id
+
+spring:
+  profiles:
+    active: teams, symphony  # comment these if you only want a single platform
\ No newline at end of file

From add328c2e526d7ae225604e42e36f2a6f5aebb75 Mon Sep 17 00:00:00 2001
From: Rob Moffat <rob@kite9.com>
Date: Thu, 28 Apr 2022 12:00:13 +0100
Subject: [PATCH 2/2] Updated room name instructions

---
 demos/demo-bot/application.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demos/demo-bot/application.yml b/demos/demo-bot/application.yml
index 3674a5188..ed0a634bb 100644
--- a/demos/demo-bot/application.yml
+++ b/demos/demo-bot/application.yml
@@ -1,5 +1,5 @@
 #set the room for the bot to post in.  Bot (and you) should be members of this room
-room: y3EJYqKMwG7Jn7_YqyYdiX___pR3YrnTdA==  # this is a symphony room here.
+room: Public Room Name  # name of some room here on symphony or teams.
 server:
   port: 8080