|
@@ -211,7 +211,6 @@ function remove_datserver {
|
211
|
211
|
remove_app datserver
|
212
|
212
|
remove_completion_param install_datserver
|
213
|
213
|
sed -i '/datserver/d' "$COMPLETION_FILE"
|
214
|
|
- rm /usr/bin/run_datserver
|
215
|
214
|
}
|
216
|
215
|
|
217
|
216
|
function install_datserver {
|
|
@@ -230,12 +229,13 @@ function install_datserver {
|
230
|
229
|
exit 4635439
|
231
|
230
|
fi
|
232
|
231
|
|
233
|
|
- { echo '#!/bin/bash';
|
234
|
|
- echo 'cd /etc/datserver';
|
235
|
|
- echo './node_modules/.bin/hypercored'; } > /usr/bin/run_datserver
|
236
|
|
- chmod +x /usr/bin/run_datserver
|
|
232
|
+ if ! npm install lil-pids; then
|
|
233
|
+ echo $'lil-pids was not installed'
|
|
234
|
+ exit 36483463
|
|
235
|
+ fi
|
|
236
|
+
|
|
237
|
+ echo "$DATSERVER_DIRECTORY/node_modules/.bin/hypercored --cwd $DATSERVER_DIRECTORY" > $DATSERVER_DIRECTORY/services
|
237
|
238
|
|
238
|
|
- set_completion_param "datserver version" "$DATSERVER_DAT_VERSION"
|
239
|
239
|
set_completion_param "datserver hypercored version" "$DATSERVER_HYPERCORED_VERSION"
|
240
|
240
|
|
241
|
241
|
adduser --system --home="$DATSERVER_DIRECTORY" --group datserver
|
|
@@ -252,7 +252,7 @@ function install_datserver {
|
252
|
252
|
echo '[Service]';
|
253
|
253
|
echo 'User=datserver';
|
254
|
254
|
echo 'Group=datserver';
|
255
|
|
- echo "ExecStart=/usr/bin/run_datserver";
|
|
255
|
+ echo "ExecStart=$DATSERVER_DIRECTORY/node_modules/.bin/lil-pids $DATSERVER_DIRECTORY/services $DATSERVER_DIRECTORY/pids";
|
256
|
256
|
echo 'Restart=always';
|
257
|
257
|
echo "WorkingDirectory=$DATSERVER_DIRECTORY";
|
258
|
258
|
echo 'StandardError=syslog';
|