From 67f34a368c814a697890fad933e3d8b61015689a Mon Sep 17 00:00:00 2001
From: Benedikt Tissot <benedikt.tissot@googlemail.com>
Date: Fri, 17 Sep 2021 17:38:47 +0200
Subject: [PATCH] simplify config generation

---
 conf/config.yaml   | 6 +++---
 scripts/_common.sh | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/conf/config.yaml b/conf/config.yaml
index e1933bf..aec934f 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -424,10 +424,10 @@ bridge:
 # Telegram config
 telegram:
     # Get your own API keys at https://my.telegram.org/apps
-    api_id: __TELEGRAM_API_ID__
-    api_hash: __TELEGRAM_API_HASH__
+    api_id: __APIID__
+    api_hash: __APIHASH__
     # (Optional) Create your own bot at https://t.me/BotFather
-    bot_token: __TELEGRAM_BOT_TOKEN__
+    bot_token: __BOTTOKEN__
 
     # Telethon connection options.
     connection:
diff --git a/scripts/_common.sh b/scripts/_common.sh
index d8bd1f0..7a9038d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -21,10 +21,6 @@ write_bridge_config () {
 	verify_server_ssl_certificates="true"
 	matrix_server_supports_asmux="false"
 	log_filename="/var/log/$app/$app.log"
-	# TODO rename these settings
-	telegram_api_id="$apiid"
-	telegram_api_hash="$apihash"
-	telegram_bot_token="$bottoken"
 	log_level="error"
 	ynh_add_config --template="config.yaml" --destination="$mautrix_config_path"
 }