diff --git a/salt/profile/matrix/appservice.sls b/salt/profile/matrix/appservice.sls index 4deb378..f057210 100644 --- a/salt/profile/matrix/appservice.sls +++ b/salt/profile/matrix/appservice.sls @@ -4,8 +4,9 @@ appservice_pgks: pkg.installed: - pkgs: - git - - nodejs10 - - npm10 + - nodejs12 + - nodejs12-devel + - npm12 - nodejs-common - make - gcc @@ -68,7 +69,7 @@ synapse_appservice_{{ dir }}_file: - cwd: /var/lib/matrix-synapse/{{ dir }} - runas: synapse - env: - - NODE_VERSION: 10 + - NODE_VERSION: 12 {% if data.get('build') == True %} {{ dir }}_build: @@ -77,7 +78,7 @@ synapse_appservice_{{ dir }}_file: - cwd: /var/lib/matrix-synapse/{{ dir }} - runas: synapse - env: - - NODE_VERSION: 10 + - NODE_VERSION: 12 {% endif %} {{ dir }}_systemd_file: diff --git a/salt/profile/matrix/dimension.sls b/salt/profile/matrix/dimension.sls index 89ac7a1..c65bc45 100644 --- a/salt/profile/matrix/dimension.sls +++ b/salt/profile/matrix/dimension.sls @@ -1,3 +1,10 @@ +dimension_pgks: + pkg.installed: + - pkgs: + - nodejs10 + - nodejs10-devel + - npm10 + /var/lib/matrix-synapse/dimension: file.directory: - user: synapse diff --git a/salt/profile/matrix/files/appservice.service b/salt/profile/matrix/files/appservice.service index 6056fe3..a27c334 100644 --- a/salt/profile/matrix/files/appservice.service +++ b/salt/profile/matrix/files/appservice.service @@ -9,7 +9,7 @@ RestartSec=3600 User=synapse Group=synapse WorkingDirectory=/var/lib/matrix-synapse/{{ dir }}/ -Environment="NODE_VERSION=10" +Environment="NODE_VERSION=12" Environment="WEBHOOKS_USER_STORE_PATH=/data/matrix/webhook/user-store.db" Environment="WEBHOOKS_ROOM_STORE_PATH=/data/matrix/webhook/room-store.db" Environment="NODE_ENV=production" diff --git a/salt/profile/matrix/files/dimension.service b/salt/profile/matrix/files/dimension.service index 09b8369..65318e2 100644 --- a/salt/profile/matrix/files/dimension.service +++ b/salt/profile/matrix/files/dimension.service @@ -9,6 +9,7 @@ RestartSec=3600 User=synapse Group=synapse WorkingDirectory=/var/lib/matrix-synapse/dimension/ +Environment="NODE_VERSION=10" Environment="NODE_ENV=production" ExecStart=/usr/bin/node build/app/index.js