diff --git a/pillar/role/matrix.sls b/pillar/role/matrix.sls index 221c39c..f2ec648 100644 --- a/pillar/role/matrix.sls +++ b/pillar/role/matrix.sls @@ -6,6 +6,9 @@ include: profile: matrix: discord_client_id: 672058964707377152 + discord_appservice_id: 330d1b6dcdf6a2217454f8227d2a960030d341a8baca5fa5c40f4081b6f40acd + discord_homeserver_token: c86278c9ee856a30120578811404ab9f87ab14e4ee245811cf008c78eb1d0c82 + discord_appservice_token: f23cb935c48801d921142fc0011d952b7108874eaae9182e5f229cdf9a1e81ab sudoers: included_files: diff --git a/salt/profile/matrix/config.sls b/salt/profile/matrix/config.sls index 6e38d47..45cae55 100644 --- a/salt/profile/matrix/config.sls +++ b/salt/profile/matrix/config.sls @@ -24,6 +24,7 @@ synapse_appservice_discord_file: file.managed: - name: /etc/matrix-synapse/appservices/appservice-discord.yaml - source: salt://profile/matrix/files/appservice-discord.yaml + - template: jinja - require: - file: /var/lib/matrix-synapse/discord - watch_in: diff --git a/salt/profile/matrix/discord.sls b/salt/profile/matrix/discord.sls index 8e72909..596ba38 100644 --- a/salt/profile/matrix/discord.sls +++ b/salt/profile/matrix/discord.sls @@ -40,6 +40,7 @@ discord_appservice_file: - name: /var/lib/matrix-synapse/discord/discord-registration.yaml - source: salt://profile/matrix/files/appservice-discord.yaml - user: synapse + - template: jinja - require: - file: /var/lib/matrix-synapse/discord - watch_in: diff --git a/salt/profile/matrix/files/appservice-discord.yaml b/salt/profile/matrix/files/appservice-discord.yaml index d93cec4..081314b 100644 --- a/salt/profile/matrix/files/appservice-discord.yaml +++ b/salt/profile/matrix/files/appservice-discord.yaml @@ -1,6 +1,6 @@ -id: 330d1b6dcdf6a2217454f8227d2a960030d341a8baca5fa5c40f4081b6f40acd -hs_token: c86278c9ee856a30120578811404ab9f87ab14e4ee245811cf008c78eb1d0c82 -as_token: f23cb935c48801d921142fc0011d952b7108874eaae9182e5f229cdf9a1e81ab +id: {{ pillar['profile']['matrix']['discord_appservice_id'] }} +hs_token: {{ pillar['profile']['matrix']['discord_homeserver_token'] }} +as_token: {{ pillar['profile']['matrix']['discord_appservice_token'] }} namespaces: users: - exclusive: true