systemd changes

system.d/systemd.env

-DJS_HOME='/home/debomatic/debomatic-webui/debomatic-webui'
-DJSPROXY_HOME='/home/debomatic/debomatic-webui/nodejs-proxy'

system.d/debomatic-nodejs-proxy.service → systemd/debomatic-webui-proxy.service

@@ -3,12 +3,12 @@ Description=Deb-o-Matic Node.js Proxy
 
 [Service]
 Type=simple
-EnvironmentFile=/home/debomatic/debomatic-webui/systemd.env
-ExecStart=/usr/bin/nodejs ${DJSPROXY_HOME}/proxy.js 2>&1 > ${DJS_HOME}webui.log
+EnvironmentFile=/home/debomatic/debomatic-webui/systemd/systemd.env
+ExecStart=/usr/bin/nodejs ${DWPROXY}/proxy.js 2>&1 > ${DWLOG}/proxy.log
 ExecStop=/bin/kill -TERM $MAINPID
 Restart=on-failure
 
 [Install]
-Requires=debomatic-nodejs@amd64.service
-Requires=debomatic-nodejs@i386.service
+Requires=debomatic-webui@amd64.service
+Requires=debomatic-webui@i386.service
 WantedBy=multi-user.target

system.d/debomatic-nodejs@.service → systemd/debomatic-webui@.service

@@ -3,9 +3,8 @@ Description=Deb-o-Matic Node.js
 
 [Service]
 Type=simple
-EnvironmentFile=/home/debomatic/debomatic-webui/systemd.env
-ExecStartPre=/bin/ln -fs ${DJS_HOME}/%i.config.js ${DJS_HOME}/user.config.js
-ExecStart=/usr/bin/nodejs ${DJS_HOME}/index.js 2>&1 > ${DJS_HOME}/webui-amd64.log
+EnvironmentFile=/home/debomatic/debomatic-webui/systemd/systemd.env
+ExecStart=/usr/bin/nodejs ${DW}/debomatic-webui -c ${DWCONFIG}/%i.config.js 2>&1 > ${DWLOG}/webui-%i.log
 ExecStop=/bin/kill -TERM $MAINPID
 Restart=on-failure
 

systemd/systemd.env

+DW='/home/debomatic/debomatic-webui/debomatic-webui'
+DWPROXY='/home/debomatic/debomatic-webui/proxy'
+DWCONFIG='/home/debomatic/debomatic-webui/config'
+DWLOG='/home/debomatic/debomatic-webui/logs'