summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-03-21 12:44:19 +0200
committerLauri Ojansivu <x@xet7.org>2018-03-21 12:44:19 +0200
commit3d0bac1f49844a009ae16e8b0438e643059c6cfc (patch)
tree46d4ec3e5723d4a5bb1cac7680d6067652e71f67
parent578bdf9e67fd53b39d1c0c9e84fd8fc5ac49b799 (diff)
parent10f24a8a8ae9ead604ea74abc79a50565544a522 (diff)
downloadwekan-3d0bac1f49844a009ae16e8b0438e643059c6cfc.tar.gz
wekan-3d0bac1f49844a009ae16e8b0438e643059c6cfc.tar.bz2
wekan-3d0bac1f49844a009ae16e8b0438e643059c6cfc.zip
Merge branch 'devel'
-rwxr-xr-xsnap-src/bin/config2
-rw-r--r--snapcraft.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/snap-src/bin/config b/snap-src/bin/config
index da2ee5cd..813c3d3f 100755
--- a/snap-src/bin/config
+++ b/snap-src/bin/config
@@ -40,7 +40,7 @@ DESCRIPTION_DISABLE_MONGODB="Disable mongodb service: use only if binding to dat
DEFAULT_DISABLE_MONGODB="false"
KEY_DISABLE_MONGODB="disable-mongodb"
-DESCRIPTION_CADDY_ENABLED="Enable caddy service (caddy - Every Site on HTTPS). Set to 'true' to enable caddy\n\t\tcaddy settings are handled through $SNAP_COMMON/Caddyfile"
+DESCRIPTION_CADDY_ENABLED="Enable caddy service (caddy - Every Site on HTTPS) personal license for non-commercial use only, see https://caddyserver.com/products/licenses . Set to 'true' to enable caddy\n\t\tcaddy settings are handled through $SNAP_COMMON/Caddyfile"
DEFAULT_CADDY_ENABLED="false"
KEY_CADDY_ENABLED="caddy-enabled"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index e28987db..657e7bc8 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -140,7 +140,7 @@ parts:
caddy:
plugin: dump
- source: https://caddyserver.com/download/linux/amd64?plugins=
+ source: https://caddyserver.com/download/linux/amd64?license=personal&plugins=
source-type: tar
organize:
caddy: bin/caddy