summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md6
-rwxr-xr-xsnap/hooks/configure6
-rwxr-xr-xsnap/hooks/install2
-rw-r--r--snapcraft.yaml6
4 files changed, 14 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17a3aa9f..77f69a75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,11 @@ This release fixes the following bugs:
- [Allow swimlanes reordering](https://github.com/wekan/wekan/commit/37c94622e476f50bf2387bc8b140454d66200e78);
- [Avoid swimlane title overlap](https://github.com/wekan/wekan/commit/c4fa9010f34966b633c7bf7e46ad49fc101127c9);
- [Fix scrollbar inside list and outer scroll](https://github.com/wekan/wekan/commit/a033c35a3411902b9bf8f62a40cd68f641e573d3);
-- [Remove list max-height 350px](https://github.com/wekan/wekan/commit/b6d3e79548d1e88c93fa2965a936595176a95565).
+- [Remove list max-height 350px](https://github.com/wekan/wekan/commit/b6d3e79548d1e88c93fa2965a936595176a95565);
+- [Snap: Adding network hooks for configure hook to fix security denials](https://github.com/wekan/wekan/commit/9084158aece8a642dc49bf7ecc2196bf9d1af63e);
+- [Snap: Fixing problem when mongodb was not started at install/refresh](https://github.com/wekan/wekan/commit/1be8e5625fd20797910009a8221ca706fd52ab11).
-Thanks to GitHub users andresmanelli, GhassenRjab and xet7 for their contributions.
+Thanks to GitHub users andresmanelli, GhassenRjab, kubiko and xet7 for their contributions.
# v0.77 2018-02-23 Wekan release
diff --git a/snap/hooks/configure b/snap/hooks/configure
index 5dcea5b9..f2f4cda1 100755
--- a/snap/hooks/configure
+++ b/snap/hooks/configure
@@ -1,6 +1,6 @@
#!/bin/bash
-exec >> $SNAP_COMMON/hook.log 2>&1
+exec >> $SNAP_DATA/hook.log 2>&1
echo "$(date '+%Y-%m-%d %H:%M:%S') $0: Entering hook"
set -x
@@ -17,8 +17,8 @@ if [ "$value" = "true" ]; then
port=$(snapctl get port)
[ "x" != "x${bind_port}" ] && sed -i 's|proxy / localhost:.* {|proxy / localhost:'"${bind_port}"' {|g' $SNAP_COMMON/Caddyfile
[ "x" != "x$port" ] && sed -i 's|http://:.*|http://:'"${port}"'|g' $SNAP_COMMON/Caddyfile
- snapctl stop ${SNAP_NAME}.caddy 2>&1 || true
snapctl start --enable ${SNAP_NAME}.caddy 2>&1 || true
+ snapctl restart ${SNAP_NAME}.caddy 2>&1 || true
else
snapctl stop --disable ${SNAP_NAME}.caddy 2>&1 || true
fi
@@ -27,8 +27,8 @@ value=$(snapctl get disable-mongodb)
if [ "$value" = "true" ]; then
snapctl stop --disable ${SNAP_NAME}.mongodb 2>&1 || true
else
- snapctl stop ${SNAP_NAME}.mongodb 2>&1 || true
snapctl start --enable ${SNAP_NAME}.mongodb 2>&1 || true
+ snapctl restart ${SNAP_NAME}.mongodb 2>&1 || true
fi
# restart all services
diff --git a/snap/hooks/install b/snap/hooks/install
index 14087eaa..7bc908eb 100755
--- a/snap/hooks/install
+++ b/snap/hooks/install
@@ -1,6 +1,6 @@
#!/bin/bash
-exec >> $SNAP_COMMON/hook.log 2>&1
+exec >> $SNAP_DATA/hook.log 2>&1
echo "$(date '+%Y-%m-%d %H:%M:%S') $0: Entering hook"
# coppy caddy file in place
diff --git a/snapcraft.yaml b/snapcraft.yaml
index d1ef6856..e28987db 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -21,6 +21,12 @@ plugs:
interface: content
target: $SNAP_DATA/shared
+hooks:
+ configure:
+ plugs:
+ - network
+ - network-bind
+
slots:
mongodb-slot:
interface: content