From bb37371f6c04a00d22e959f3a97a7ed2be856655 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Jan 29 2020 19:44:31 +0000 Subject: Dash -> Underscore --- diff --git a/salt/profile/matrix/config.sls b/salt/profile/matrix/config.sls index 1197aaa..f156566 100644 --- a/salt/profile/matrix/config.sls +++ b/salt/profile/matrix/config.sls @@ -14,7 +14,7 @@ synapse_conf_file: - source: salt://profile/matrix/files/homeserver.yaml - template: jinja - require: - - file: synapse-conf-dir + - file: synapse_conf_dir - require_in: - service: synapse_service - watch_in: @@ -26,7 +26,7 @@ discord_conf_file: - source: salt://profile/matrix/files/config-discord.yaml - template: jinja - require: - - file: synapse-conf-dir + - file: synapse_conf_dir - require_in: - service: synapse_service - watch_in: @@ -41,7 +41,7 @@ synapse_appservice_discord_file: - watch_in: - module: discord_restart -synapse-log-conf-file: +synapse_log_conf_file: file.managed: - name: /etc/matrix-synapse/log.yaml - source: salt://profile/matrix/files/log_config diff --git a/salt/profile/matrix/init.sls b/salt/profile/matrix/init.sls index 06c39b6..b749fbc 100644 --- a/salt/profile/matrix/init.sls +++ b/salt/profile/matrix/init.sls @@ -1,16 +1,16 @@ {% set roles = salt['grains.get']('roles', []) %} -synapse-service: +synapse_service: service.running: - name: synapse - enable: True -synapse-restart: +synapse_restart: module.wait: - name: service.restart - m_name: synapse - require: - - service: synapse-service + - service: synapse_service discord_service: service.running: