From 0c5c003e34eb16122afa0487bc9bee49508ea4e7 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Feb 01 2020 23:57:21 +0000
Subject: Merge branch 'hellcp/matrix-fix-syntax' into 'production'


Fix the syntax and order

See merge request infra/salt!331
---

diff --git a/salt/profile/matrix/discord.sls b/salt/profile/matrix/discord.sls
index 401f896..436cb71 100644
--- a/salt/profile/matrix/discord.sls
+++ b/salt/profile/matrix/discord.sls
@@ -5,12 +5,20 @@ discord_pgks:
     - pkgs:
       - git
       - nodejs10
+      - npm10
       - nodejs-common
 
 /var/lib/matrix-synapse/discord:
   file.directory:
     - user: synapse
 
+https://github.com/Half-Shot/matrix-appservice-discord.git:
+  git.latest:
+    - branch: master
+    - target: /var/lib/matrix-synapse/discord/
+    - rev: master
+    - user: synapse
+
 discord_conf_file:
   file.managed:
     - name: /var/lib/matrix-synapse/discord/config.yaml
@@ -23,26 +31,21 @@ discord_conf_file:
     - watch_in:
       - module: discord_restart
 
-https://github.com/Half-Shot/matrix-appservice-discord.git:
-  git.latest:
-    - branch: master
-    - target: /var/lib/matrix-synapse/discord/
-    - rev: master
-    - user: synapse
-
 discord_boostrap:
   cmd.run:
     - name: npm install
     - cwd: /var/lib/matrix-synapse/discord
     - user: synapse
-    - env: "NODE_VERSION=10"
+    - env:
+      - "NODE_VERSION=10"
 
 discord_build:
   cmd.run:
     - name: npm run build
     - cwd: /var/lib/matrix-synapse/discord
     - user: synapse
-    - env: "NODE_VERSION=10"
+    - env:
+      - "NODE_VERSION=10"
 
 discord_systemd_file:
   file.managed:
diff --git a/salt/profile/matrix/files/discord.service b/salt/profile/matrix/files/discord.service
index b0974c3..3a4694f 100644
--- a/salt/profile/matrix/files/discord.service
+++ b/salt/profile/matrix/files/discord.service
@@ -3,10 +3,14 @@ Description=Matrix Appservice Discord
 
 [Service]
 Type=simple
+Restart=on-failure
+RestartSec=3
+
 User=synapse
 Group=synapse
 WorkingDirectory=/var/lib/matrix-synapse/discord/
-ExecStart=npm start
+Environment="NODE_VERSION=10"
+ExecStart=/usr/bin/npm start
 
 [Install]
 WantedBy=multi-user.target
diff --git a/salt/profile/matrix/files/synapse.service b/salt/profile/matrix/files/synapse.service
index 6fbf122..6a1358b 100644
--- a/salt/profile/matrix/files/synapse.service
+++ b/salt/profile/matrix/files/synapse.service
@@ -3,6 +3,9 @@ Description=Synapse Matrix homeserver
 
 [Service]
 Type=simple
+Restart=on-failure
+RestartSec=3
+
 User=synapse
 Group=synapse
 WorkingDirectory=/var/lib/matrix-synapse/