From 3665a9131c4f0bac07727a5f908905e9a6348535 Mon Sep 17 00:00:00 2001
From: Ondrej Kubik <ondrej.kubik@canonical.com>
Date: Sat, 4 Nov 2017 19:20:37 +0000
Subject: splitting hooks and using snapctl instead of local settings file

Signed-off-by: Ondrej Kubik <ondrej.kubik@canonical.com>
---
 snap/hooks/configure    | 28 +++-------------------------
 snap/hooks/install      | 12 ++++++++++++
 snap/hooks/post-refresh |  1 +
 3 files changed, 16 insertions(+), 25 deletions(-)
 create mode 100755 snap/hooks/install
 create mode 120000 snap/hooks/post-refresh

(limited to 'snap')

diff --git a/snap/hooks/configure b/snap/hooks/configure
index 1e2b0ec7..60ce81e8 100755
--- a/snap/hooks/configure
+++ b/snap/hooks/configure
@@ -1,32 +1,10 @@
 #!/bin/bash
 
+exec >> $SNAP_COMMON/hook.log 2>&1
+echo "$(date '+%Y-%m-%d %H:%M:%S') $0: Entering hook"
+
 # read wekan config
 . $SNAP/bin/config
 
-# create run dir, we're going to use it for unix socket
-mkdir -p $SNAP_DATA/share
-mkdir -p $SNAP_DATA/shared
-
 # settings were altered by user, safest way to get them applied is to restart service
 
-# TODO: remove this workaround once it's not needed
-# for the moment we can't read settings outside of the hook,
-# so store all settings in helpper script which is then picked by main wrapper
-echo -e "#!/bin/sh\n" > $SETTINGS_FILE
-for key in ${keys[@]}
-do
-  # snappy is picky about key syntax, using mapping
-  MAP_KEY="KEY_$key"
-  if value=$(snapctl get ${!MAP_KEY}); then
-      echo "export $key='$value'" >> $SETTINGS_FILE
-  elif [ -d "${!key}" ]; then
-      # store back value from SETTINGS_FILE
-      echo "export $key='${!key}'" >> $SETTINGS_FILE
-  fi
-done
-
-# set file executable
-chmod 755 $SETTINGS_FILE
-# we can't use snapctl to restart service, may be one day ....
-
-echo "Setting has been updated, restart service."
diff --git a/snap/hooks/install b/snap/hooks/install
new file mode 100755
index 00000000..14087eaa
--- /dev/null
+++ b/snap/hooks/install
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+exec >> $SNAP_COMMON/hook.log 2>&1
+echo "$(date '+%Y-%m-%d %H:%M:%S') $0: Entering hook"
+
+# coppy caddy file in place
+[ ! -e $SNAP_COMMON/Caddyfile ] && cp $SNAP/Caddyfile $SNAP_COMMON/Caddyfile
+
+# create run dir, we're going to use it for unix socket
+mkdir -p $SNAP_DATA/share
+mkdir -p $SNAP_DATA/shared
+
diff --git a/snap/hooks/post-refresh b/snap/hooks/post-refresh
new file mode 120000
index 00000000..f7ffc47a
--- /dev/null
+++ b/snap/hooks/post-refresh
@@ -0,0 +1 @@
+install
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22