From 963931e04d44a5b40d38817163f52f56241a9f33 Mon Sep 17 00:00:00 2001
From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Mon, 11 Dec 2017 11:09:35 +0100
Subject: 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>
---
 conf.d/etc/default/xds-server                  |  2 +-
 conf.d/etc/xds-server/config.json              | 11 -----------
 conf.d/etc/xds/server/server-config.json       | 11 +++++++++++
 conf.d/usr/lib/systemd/user/xds-server.service |  4 +---
 4 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 conf.d/etc/xds-server/config.json
 create mode 100644 conf.d/etc/xds/server/server-config.json

(limited to 'conf.d')

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/config.json
deleted file mode 100644
index 4dbe501..0000000
--- a/conf.d/etc/xds-server/config.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "webAppDir": "www",
-    "httpPort": "8000",
-    "shareRootDir": "${HOME}/.xds-server/projects",
-    "sdkRootDir": "/xdt/sdk",
-    "syncthing": {
-        "binDir": "",
-        "home": "${HOME}/.xds-server/syncthing-config",
-        "gui-address": "http://localhost:8385"
-    }
-}
diff --git a/conf.d/etc/xds/server/server-config.json b/conf.d/etc/xds/server/server-config.json
new file mode 100644
index 0000000..5562bb3
--- /dev/null
+++ b/conf.d/etc/xds/server/server-config.json
@@ -0,0 +1,11 @@
+{
+    "webAppDir": "www",
+    "httpPort": "8000",
+    "shareRootDir": "${HOME}/.xds/server/projects",
+    "sdkRootDir": "/xdt/sdk",
+    "syncthing": {
+        "binDir": "",
+        "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
-- 
cgit 1.2.3-korg