Merge branch 'kubiko-devel' into devel

10 files changed, 67 insertions, 50 deletions

diff --git a/snap-src/Caddyfile b/snap-src/Caddyfile
new file mode 100644
index 00000000..07ed4143
--- /dev/null
+++ b/snap-src/Caddyfile
@@ -0,0 +1,5 @@
+http://:8080
+proxy / localhost:3001 {
+  websocket
+  transparent
+}
diff --git a/snap-src/bin/caddy-control b/snap-src/bin/caddy-control
new file mode 100755
index 00000000..92ce70ba
--- /dev/null
+++ b/snap-src/bin/caddy-control
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# get wekan/mongo settings
+source $SNAP/bin/wekan-read-settings
+
+if [ "$CADDY_ENABLED" = "true" ]; then
+    env LC_ALL=C caddy -conf=$SNAP_COMMON/Caddyfile -host=localhost:${CADDY_PORT}
+else
+    snapctl stop caddy-service 2>&1 || true
+    # sleep here, in case snapctl fails to stop service so we do not restart too often
+    sleep 60
+fi
diff --git a/snap-src/config b/snap-src/bin/config
index dbf8402c..c3434c8e 100755
--- a/snap-src/config
+++ b/snap-src/bin/config
@@ -1,12 +1,9 @@
 #!/bin/sh
 
-# store here all configuration options for wekan snap
-# read configured settings first
-SETTINGS_FILE="$SNAP_COMMON/wekan_settings.sh"
-[ -f $SETTINGS_FILE ] && . $SETTINGS_FILE
+# All supported keys are defined here together with descriptions and default values
 
 # list of supported keys
-keys="MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB"
+keys="MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT"
 
 # default values
 DESCRIPTION_MONGODB_BIND_UNIX_SOCKET="mongodb binding unix socket:\n"\
@@ -42,3 +39,11 @@ KEY_PORT="port"
 DESCRIPTION_DISABLE_MONGODB="Disable mongodb service: use only if binding to database outside of the snap. Valid values: [true,false]"
 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"
+DEFAULT_CADDY_ENABLED="false"
+KEY_CADDY_ENABLED="caddy-enabled"
+
+DESCRIPTION_CADDY_BIND_PORT="Port on which caddy will expect proxy, value set here will be set in $SNAP_COMMON/Caddyfile"
+DEFAULT_CADDY_BIND_PORT="3001"
+KEY_CADDY_BIND_PORT="caddy-bind-port"
diff --git a/snap-src/mongodb-backup b/snap-src/bin/mongodb-backup
index bef8bf9b..bef8bf9b 100755
--- a/snap-src/mongodb-backup
+++ b/snap-src/bin/mongodb-backup
diff --git a/snap-src/mongodb-control b/snap-src/bin/mongodb-control
index 08af132d..08af132d 100755
--- a/snap-src/mongodb-control
+++ b/snap-src/bin/mongodb-control
diff --git a/snap-src/mongodb-restore b/snap-src/bin/mongodb-restore
index c1c82775..c1c82775 100755
--- a/snap-src/mongodb-restore
+++ b/snap-src/bin/mongodb-restore
diff --git a/snap-src/wekan-control b/snap-src/bin/wekan-control
index 905642ed..bc2cefde 100755
--- a/snap-src/wekan-control
+++ b/snap-src/bin/wekan-control
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-SYSTEMD_WEKAN_SERVICE="snap.${SNAP_NAME}.wekan"
-SYSTEMD_MONGODB_SERVICE="snap.${SNAP_NAME}.mongodb"
-
 # get wekan/mongo settings
 source $SNAP/bin/wekan-read-settings
 
diff --git a/snap-src/wekan-help b/snap-src/bin/wekan-help
index bbf0e138..a498b9b9 100755
--- a/snap-src/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-source $SNAP/bin/config &>/dev/null
+# first read settings
+source $SNAP/bin/wekan-read-settings &>/dev/null
+if [ "$CADDY_ENABLED" = "true" ]; then
+    # tweak port nunmber as it has been remapped
+    export PORT=${CADDY_PORT} &>/dev/null
+fi
 
 echo -e "Wekan: The open-source Trello-like kanban.\n"
 echo -e "Make sure you have connected all interfaces, check more by calling $ snap interfaces"
 echo -e "\n"
-echo -e "${SNAP_NAME} has two services, to check status/restart/stop use systemd commands"
+echo -e "${SNAP_NAME} has multiple services, to check status/restart/stop use systemctl"
 echo -e "mongodb service:"
 echo -e "\t$ sudo systemctl status/start/stop/restart snap.$SNAP_NAME.mongodb"
 echo -e "wekan service"
 echo -e "\t$ sudo systemctl status/start/stop/restart snap.$SNAP_NAME.wekan"
+echo -e "Optional caddy service"
+echo -e "\t$ sudo systemctl status/start/stop/restart snap.$SNAP_NAME.caddy"
 echo -e "\n"
 echo -e "To make backup of wekan's database use: $ ${SNAP_NAME}.database-backup [backup file]"
 echo -e "\t backup file is optional parameter, if not passed backup is created in directory:"
@@ -42,7 +49,5 @@ do
         echo -e "\t\tCurrent value set to: '${!key}', (default value: '${!default_value}')"
     fi
 done
-echo -e "\nFor changes to take effect restart wekan service,"
-echo -e "if mongodb key was change also restart mongodb service, before restarting wekan"
-echo -e "to restart mongodb: $ sudo systemctl restart snap.$SNAP_NAME.mongodb"
-echo -e "to restart wekan:   $ sudo systemctl restart snap.$SNAP_NAME.wekan"
+
+echo -e "\n!!!! Some changes result in restart of some or all services, use with caution !!!!!"
diff --git a/snap-src/bin/wekan-read-settings b/snap-src/bin/wekan-read-settings
new file mode 100755
index 00000000..f216c2a8
--- /dev/null
+++ b/snap-src/bin/wekan-read-settings
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# read wekan config
+source $SNAP/bin/config
+
+
+for key in ${keys[@]}
+do
+    default_value="DEFAULT_$key"
+    description="DESCRIPTION_$key"
+    snappy_key="KEY_$key"
+    value=$(snapctl get ${!snappy_key})
+    if [ "x$value" == "x" ]; then
+        echo -e "$key=${!default_value} (default value)"
+        export $key=${!default_value}
+    else
+        echo -e "$key=$value"
+        export $key=$value
+    fi
+done
+
+# if caddy is enabled, do update port settings based on caddy file
+if [ "$CADDY_ENABLED" = "true" ]; then
+    echo "caddy is enabled, adjusting ports"
+    export CADDY_PORT=${PORT}
+    echo -e "CADDY_PORT=$CADDY_PORT"
+    export PORT=${CADDY_BIND_PORT}
+    echo -e "PORT=$PORT"
+fi
diff --git a/snap-src/wekan-read-settings b/snap-src/wekan-read-settings
deleted file mode 100755
index aec05bba..00000000
--- a/snap-src/wekan-read-settings
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# read wekan config
-source $SNAP/bin/config
-
-# TODO: uncomment following, once snapctl can be called from outside the hooks
-# for key in ${keys[@]}
-# do
-#   # snappy is picky about key syntax, using mapping
-#   MAP_KEY="KEY_$key"
-#   SNAPPY_KEY=
-#   if value=$(snapctl get ${!MAP_KEY}); then
-#       echo "$key='$value'"
-#       export $key=$value
-#   else
-#       # use default value
-#       default_value="DEFAULT_$key"
-#       echo "using default value: $key='${!default_value}'"
-#       export $key=${!default_value}
-#   fi
-# done
-
-# TODO: get rid of this workaround once above can be used
-# loop through all values, and if not defined, use default value
-for key in ${keys[@]}
-do
-  if [ "x" ==  "x${!key}" ]; then
-      # use default value
-      default_value="DEFAULT_$key"
-      echo "using default value: $key='${!default_value}'"
-      export $key=${!default_value}
-      # echo "export $key='${!def_value}'" >> $SETTINGS_FILE
-  else
-      echo "$key='${!key}'"
-  fi
-done