summaryrefslogtreecommitdiffstats
path: root/conf.d
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-12-11 11:09:35 +0100
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-12-11 15:49:30 +0100
commit963931e04d44a5b40d38817163f52f56241a9f33 (patch)
tree986841498f9c998549ee175c240713709e32510a /conf.d
parente9fa58ca8a03f03e6022955fd4934e6fda5876ee (diff)
Standardized XDS config file name and location.
- config file name is : server-config.json - xds-server settings under user's home is: $HOME/.xds/server - xds-server settings under etc is: /etc/xds/server Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Diffstat (limited to 'conf.d')
-rw-r--r--conf.d/etc/default/xds-server2
-rw-r--r--conf.d/etc/xds/server/server-config.json (renamed from conf.d/etc/xds-server/config.json)4
-rw-r--r--conf.d/usr/lib/systemd/user/xds-server.service4
3 files changed, 4 insertions, 6 deletions
diff --git a/conf.d/etc/default/xds-server b/conf.d/etc/default/xds-server
index 0c82849..4bf2ae6 100644
--- a/conf.d/etc/default/xds-server
+++ b/conf.d/etc/default/xds-server
@@ -2,7 +2,7 @@
# this file is used for service environment in /usr/lib/systemd/user/xds-server.service
# JSON config file to use
-#APP_CONFIG=${HOME}/.config/xds/server/config.json
+#APP_CONFIG=${HOME}/.xds/server/server-config.json
# Logging level (supported levels: panic, fatal, error, warn, info, debug)
LOG_LEVEL=info
diff --git a/conf.d/etc/xds-server/config.json b/conf.d/etc/xds/server/server-config.json
index 4dbe501..5562bb3 100644
--- a/conf.d/etc/xds-server/config.json
+++ b/conf.d/etc/xds/server/server-config.json
@@ -1,11 +1,11 @@
{
"webAppDir": "www",
"httpPort": "8000",
- "shareRootDir": "${HOME}/.xds-server/projects",
+ "shareRootDir": "${HOME}/.xds/server/projects",
"sdkRootDir": "/xdt/sdk",
"syncthing": {
"binDir": "",
- "home": "${HOME}/.xds-server/syncthing-config",
+ "home": "${HOME}/.xds/server/syncthing-config",
"gui-address": "http://localhost:8385"
}
}
diff --git a/conf.d/usr/lib/systemd/user/xds-server.service b/conf.d/usr/lib/systemd/user/xds-server.service
index 0175d29..0dac9d6 100644
--- a/conf.d/usr/lib/systemd/user/xds-server.service
+++ b/conf.d/usr/lib/systemd/user/xds-server.service
@@ -2,10 +2,8 @@
Description=XDS Server
[Service]
-Type=forking
EnvironmentFile=-/etc/default/xds-server
-ExecStart=/opt/AGL/xds/server/xds-server-start.sh
-ExecStop=/opt/AGL/xds/server/xds-server-stop.sh
+ExecStart=/opt/AGL/bin/xds-server
[Install]
WantedBy=default.target