diff --git a/salt/profile/matrix/config.sls b/salt/profile/matrix/config.sls index 8ee505a..6e38d47 100644 --- a/salt/profile/matrix/config.sls +++ b/salt/profile/matrix/config.sls @@ -20,18 +20,6 @@ synapse_conf_file: - watch_in: - module: synapse_restart -discord_conf_file: - file.managed: - - name: /var/lib/matrix-synapse/discord/config.yaml - - source: salt://profile/matrix/files/config-discord.yaml - - template: jinja - - require: - - file: synapse_conf_dir - - require_in: - - service: synapse_service - - watch_in: - - module: synapse_restart - synapse_appservice_discord_file: file.managed: - name: /etc/matrix-synapse/appservices/appservice-discord.yaml diff --git a/salt/profile/matrix/discord.sls b/salt/profile/matrix/discord.sls index e375368..50e0d2e 100644 --- a/salt/profile/matrix/discord.sls +++ b/salt/profile/matrix/discord.sls @@ -11,6 +11,18 @@ discord_pgks: file.directory: - user: synapse +discord_conf_file: + file.managed: + - name: /var/lib/matrix-synapse/discord/config.yaml + - source: salt://profile/matrix/files/config-discord.yaml + - template: jinja + - require: + - file: /var/lib/matrix-synapse/discord + - require_in: + - service: discord_service + - watch_in: + - module: discord_restart + https://github.com/Half-Shot/matrix-appservice-discord.git: git.latest: - branch: master diff --git a/salt/profile/matrix/synapse.sls b/salt/profile/matrix/synapse.sls index b642949..107cbf7 100644 --- a/salt/profile/matrix/synapse.sls +++ b/salt/profile/matrix/synapse.sls @@ -6,6 +6,12 @@ synapse_dependencies: - python3-matrix-synapse - python3-matrix-synapse-ldap3 +synapse: + group.present: + - system: True + - members: + - synapse + synapse_systemd_file: file.managed: - name: /etc/systemd/system/synapse.service