From 38992dd327728361c4a37b521c29c6726853f468 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sat, 29 Aug 2020 22:51:37 +0800
Subject: [PATCH] daemon works with strict mode now.

---
 snap/local/launcher.sh | 11 ++++++-----
 snap/snapcraft.yaml    | 12 +++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/snap/local/launcher.sh b/snap/local/launcher.sh
index 52b3e4ce5c..29a7a63779 100755
--- a/snap/local/launcher.sh
+++ b/snap/local/launcher.sh
@@ -15,11 +15,12 @@ case "$SNAP_USER_COMMON" in
 	*)                             COMMON=$SNAP_USER_COMMON ;;
 esac
 
-if [ -d /etc/taos ]; then
-    CONFIG_FILE="/etc/taos"
-else
-    CONFIG_FILE="$SNAP/etc/taos"
+if [ ! -f $SNAP_DATA/etc/taos/taos.cfg ]; then
+  if [ ! -d $SNAP_DATA/etc/taos ]; then
+    mkdir -p $SNAP_DATA/etc/taos
+  fi
+  cp $SNAP/etc/taos/taos.cfg $SNAP_DATA/etc/taos
 fi
 
 # Launch the snap
-$SNAP/usr/bin/taosd -c $CONFIG_FILE $@
+$SNAP/usr/bin/taosd -c /etc/taos $@
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index cf4f993394..4a7dff3ec6 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,13 +1,13 @@
 name: tdengine
 base: core18 # the base snap is the execution environment for this snap
-version: '2.0.0.6' # just for humans, typically '1.2+git' or '1.3.2'
+version: '2.0.1.1' # just for humans, typically '1.2+git' or '1.3.2'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
   TDengine is an open-source big data platform designed and optimized for Internet of Things (IoT), Connected Vehicles, and Industrial IoT. Besides the 10x faster time-series database, it provides caching, stream computing, message queuing and other functionalities to reduce the complexity and costs of development and operations.
 
 grade: stable
-confinement: classic
+confinement: strict
 
 apps:
   tdengine:
@@ -24,7 +24,9 @@ apps:
     command: taoswrapper.sh
     plugs:
       - network
+      - system-observe
       - systemfiles
+      - home
 
   taosdemo:
     command: usr/bin/taosdemo
@@ -85,7 +87,7 @@ parts:
       - usr/bin/taosd
       - usr/bin/taos
       - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.0.0.6
+      - usr/lib/libtaos.so.2.0.1.1
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so
 
@@ -103,8 +105,8 @@ layout:
     bind: $SNAP_DATA/var/lib/taos
   /var/log/taos:
     bind: $SNAP_DATA/var/log/taos
-  /etc/taos/taos.cfg:
-    bind-file: $SNAP_DATA/etc/taos/taos.cfg
+  /etc/taos:
+    bind: $SNAP_DATA/etc/taos
 
 
 hooks:
-- 
GitLab