Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-21 16:56:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'devel'

Browse source
This commit is contained in:
Lauri Ojansivu 2018-03-01 14:38:33 +02:00
commit 2c1dadf712
4 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -9,9 +9,11 @@ This release fixes the following bugs:
- [Allow swimlanes reordering](https://github.com/wekan/wekan/commit/37c94622e476f50bf2387bc8b140454d66200e78); - [Allow swimlanes reordering](https://github.com/wekan/wekan/commit/37c94622e476f50bf2387bc8b140454d66200e78);
- [Avoid swimlane title overlap](https://github.com/wekan/wekan/commit/c4fa9010f34966b633c7bf7e46ad49fc101127c9); - [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); - [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 # v0.77 2018-02-23 Wekan release

6
snap/hooks/configure vendored
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/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" echo "$(date '+%Y-%m-%d %H:%M:%S') $0: Entering hook"
set -x set -x
@ -17,8 +17,8 @@ if [ "$value" = "true" ]; then
port=$(snapctl get port) port=$(snapctl get port)
[ "x" != "x${bind_port}" ] && sed -i 's|proxy / localhost:.* {|proxy / localhost:'"${bind_port}"' {|g' $SNAP_COMMON/Caddyfile [ "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 [ "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 start --enable ${SNAP_NAME}.caddy 2>&1 || true
snapctl restart ${SNAP_NAME}.caddy 2>&1 || true
else else
snapctl stop --disable ${SNAP_NAME}.caddy 2>&1 || true snapctl stop --disable ${SNAP_NAME}.caddy 2>&1 || true
fi fi
@ -27,8 +27,8 @@ value=$(snapctl get disable-mongodb)
if [ "$value" = "true" ]; then if [ "$value" = "true" ]; then
snapctl stop --disable ${SNAP_NAME}.mongodb 2>&1 || true snapctl stop --disable ${SNAP_NAME}.mongodb 2>&1 || true
else else
snapctl stop ${SNAP_NAME}.mongodb 2>&1 || true
snapctl start --enable ${SNAP_NAME}.mongodb 2>&1 || true snapctl start --enable ${SNAP_NAME}.mongodb 2>&1 || true
snapctl restart ${SNAP_NAME}.mongodb 2>&1 || true
fi fi
# restart all services # restart all services

2
snap/hooks/install
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/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" echo "$(date '+%Y-%m-%d %H:%M:%S') $0: Entering hook"
# coppy caddy file in place # coppy caddy file in place

6
snapcraft.yaml
View file

@ -21,6 +21,12 @@ plugs:
interface: content interface: content
target: $SNAP_DATA/shared target: $SNAP_DATA/shared
hooks:
configure:
plugs:
- network
- network-bind
slots: slots:
mongodb-slot: mongodb-slot:
interface: content interface: content