From a640d8f9a6f2a862e42a5653d6c64a3ca6348989 Mon Sep 17 00:00:00 2001
From: Yannick Goossens <yannick@ziroh.be>
Date: Fri, 12 Mar 2021 15:36:13 +0100
Subject: [PATCH] Remove hard coded references to homeserver and matrix domain

---
 roles/matrix-bot-go-neb/defaults/main.yml | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/roles/matrix-bot-go-neb/defaults/main.yml b/roles/matrix-bot-go-neb/defaults/main.yml
index 1dbfab7b..516ab83e 100644
--- a/roles/matrix-bot-go-neb/defaults/main.yml
+++ b/roles/matrix-bot-go-neb/defaults/main.yml
@@ -46,19 +46,19 @@ matrix_bot_go_neb_storage_database: "{{
 # https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/master/docs/configuring-playbook-dimension.md#access-token
 # via curl. With the element method, you might run into decryption problems (see https://github.com/matrix-org/go-neb#quick-start)
 matrix_bot_go_neb_clients: {}
-#  - UserID: "@goneb:localhost"
+#  - UserID: "@goneb:{{ matrix_domain }}"
 #    AccessToken: "MDASDASJDIASDJASDAFGFRGER"
 #    DeviceID: "DEVICE1"
-#    HomeserverURL: "http://localhost:8008"
+#    HomeserverURL: "{{ matrix_homeserver_container_url }}"
 #    Sync: true
 #    AutoJoinRooms: true
 #    DisplayName: "Go-NEB!"
 #    AcceptVerificationFromUsers: [":{{ matrix_domain }}"]
 #
-#  - UserID: "@another_goneb:localhost"
+#  - UserID: "@another_goneb:{{ matrix_domain }}"
 #    AccessToken: "MDASDASJDIASDJASDAFGFRGER"
 #    DeviceID: "DEVICE2"
-#    HomeserverURL: "http://localhost:8008"
+#    HomeserverURL: "{{ matrix_homeserver_container_url }}"
 #    Sync: false
 #    AutoJoinRooms: false
 #    DisplayName: "Go-NEB!"
@@ -81,7 +81,7 @@ matrix_bot_go_neb_realms: {}
 matrix_bot_go_neb_sessions: {}
 #  - SessionID: "your_github_session"
 #    RealmID: "github_realm"
-#    UserID: "@YOUR_USER_ID:localhost" # This needs to be the username of the person that's allowed to use the !github commands
+#    UserID: "@YOUR_USER_ID:{{ matrix_domain }}" # This needs to be the username of the person that's allowed to use the !github commands
 #    Config:
 #      # Populate these fields by generating a "Personal Access Token" on github.com
 #      AccessToken: "YOUR_GITHUB_ACCESS_TOKEN"
@@ -94,13 +94,13 @@ matrix_bot_go_neb_sessions: {}
 matrix_bot_go_neb_services: {}
 #  - ID: "echo_service"
 #    Type: "echo"
-#    UserID: "@goneb:localhost"
+#    UserID: "@goneb:{{ matrix_domain }}"
 #    Config: {}
 
 ## Can be obtained from https://developers.giphy.com/dashboard/
 #  - ID: "giphy_service"
 #    Type: "giphy"
-#    UserID: "@goneb:localhost" # requires a Syncing client
+#    UserID: "@goneb:{{ matrix_domain }}" # requires a Syncing client
 #    Config:
 #      api_key: "qwg4672vsuyfsfe"
 #      use_downsized: false
@@ -108,7 +108,7 @@ matrix_bot_go_neb_services: {}
 ## This service has been dead for over a year :/
 #  - ID: "guggy_service"
 #    Type: "guggy"
-#    UserID: "@goneb:localhost" # requires a Syncing client
+#    UserID: "@goneb:{{ matrix_domain }}" # requires a Syncing client
 #    Config:
 #      api_key: "2356saaqfhgfe"
 #
@@ -118,7 +118,7 @@ matrix_bot_go_neb_services: {}
 ## 'Search the entire web' and 'Image search' enabled for best results
 #  - ID: "google_service"
 #    Type: "google"
-#    UserID: "@goneb:localhost" # requires a Syncing client
+#    UserID: "@goneb:{{ matrix_domain }}" # requires a Syncing client
 #    Config:
 #      api_key: "AIzaSyA4FD39m9"
 #      cx: "AIASDFWSRRtrtr"
@@ -127,18 +127,18 @@ matrix_bot_go_neb_services: {}
 ## Select "oauth2 without callback url" and use the clientid as api_key value
 #  - ID: "imgur_service"
 #    Type: "imgur"
-#    UserID: "@imgur:localhost" # requires a Syncing client
+#    UserID: "@imgur:{{ matrix_domain }}" # requires a Syncing client
 #    Config:
 #      api_key: "AIzaSyA4FD39m9"
 #
 #  - ID: "wikipedia_service"
 #    Type: "wikipedia"
-#    UserID: "@goneb:localhost" # requires a Syncing client
+#    UserID: "@goneb:{{ matrix_domain }}" # requires a Syncing client
 #    Config:
 #
 #  - ID: "rss_service"
 #    Type: "rssbot"
-#    UserID: "@another_goneb:localhost"
+#    UserID: "@another_goneb:{{ matrix_domain }}"
 #    Config:
 #      feeds:
 #        "http://lorem-rss.herokuapp.com/feed?unit=second&interval=60":
@@ -156,17 +156,17 @@ matrix_bot_go_neb_services: {}
 #
 #  - ID: "github_cmd_service"
 #    Type: "github"
-#    UserID: "@goneb:localhost" # requires a Syncing client
+#    UserID: "@goneb:{{ matrix_domain }}" # requires a Syncing client
 #    Config:
 #      RealmID: "github_realm"
 #
 #    # Make sure your BASE_URL can be accessed by Github!
 #  - ID: "github_webhook_service"
 #    Type: "github-webhook"
-#    UserID: "@another_goneb:localhost"
+#    UserID: "@another_goneb:{{ matrix_domain }}"
 #    Config:
 #      RealmID: "github_realm"
-#      ClientUserID: "@YOUR_USER_ID:localhost" # needs to be an authenticated user so Go-NEB can create webhooks. Check the UserID field in the github_realm in matrix_bot_go_neb_sessions.
+#      ClientUserID: "@YOUR_USER_ID:{{ matrix_domain }}" # needs to be an authenticated user so Go-NEB can create webhooks. Check the UserID field in the github_realm in matrix_bot_go_neb_sessions.
 #      Rooms:
 #        "!someroom:id":
 #          Repos:
@@ -183,7 +183,7 @@ matrix_bot_go_neb_services: {}
 #
 #  - ID: "slackapi_service"
 #    Type: "slackapi"
-#    UserID: "@slackapi:localhost"
+#    UserID: "@slackapi:{{ matrix_domain }}"
 #    Config:
 #      Hooks:
 #        "hook1":
@@ -192,7 +192,7 @@ matrix_bot_go_neb_services: {}
 #
 #  - ID: "alertmanager_service"
 #    Type: "alertmanager"
-#    UserID: "@alertmanager:localhost"
+#    UserID: "@alertmanager:{{ matrix_domain }}"
 #    Config:
 #      # This is for information purposes only. It should point to Go-NEB path as follows:
 #      # `/services/hooks/<base64 encoded service ID>`