feat: configuration values for linux provider

Author: keskiju

scripts/linux-provider/_config.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo "[Configuration]"
+echo "- Using sudo: ${LINUX_SUDO}"
+echo "- Client max body size: ${LINUX_CLIENT_MAX_BODY_SIZE}"
+echo "NOTE: You can configure these in taito-config.sh"
+echo

scripts/linux-provider/taito-deployment-deploy#post.sh

@@ -12,6 +12,9 @@
 
 set -e
 
+. "${taito_project_path}/scripts/linux-provider/_config.sh"
+. "${taito_cli_path}/plugins/ssh/util/opts.sh"
+
 image_tag=$1
 if [[ ! $image_tag ]]; then
   echo "[Getting commit sha of the latest commit on branch ${taito_branch}]"
@@ -30,8 +33,6 @@ echo "NOTE: Deployment is done using the taito-config.sh and"
 echo "docker-compose-remote.yaml currently located on your local directory."
 echo
 
-. "${taito_cli_path}/plugins/ssh/util/opts.sh"
-
 echo "[Copy docker-compose-remote.yaml to ${taito_host}:/tmp]"
 (
   set -e
@@ -45,15 +46,15 @@ echo
 
 echo "[Execute on host ${taito_host}]"
 ssh ${opts} "${taito_ssh_user}@${taito_host}" "
-  sudo bash -c '
+  ${LINUX_SUDO} bash -c '
     set -e
     ${taito_setv:?}
     cd ${taito_host_dir}
     echo
     echo [Check that Docker images exist]
-    if ! sudo docker images | grep ${taito_container_registry} | grep ${image_tag} &> /dev/null; then
+    if ! docker images | grep ${taito_container_registry} | grep ${image_tag} &> /dev/null; then
       echo Latest images on remote host:
-      sudo docker images | grep ${taito_container_registry}
+      docker images | grep ${taito_container_registry}
       echo
       echo ERROR: No image with tag ${image_tag}
       exit 1

scripts/linux-provider/taito-env-apply#post.sh

@@ -9,8 +9,7 @@
 
 set -e
 
-CLIENT_MAX_BODY_SIZE=1m
-
+. "${taito_project_path}/scripts/linux-provider/_config.sh"
 . "${taito_cli_path}/plugins/ssh/util/opts.sh"
 
 echo "[Copy changed secrets to ${taito_host}:/tmp]"
@@ -26,7 +25,7 @@ echo
 
 echo "[Execute on ${taito_host}]"
 ssh ${opts} "${taito_ssh_user}@${taito_host}" "
-  sudo bash -c '
+  ${LINUX_SUDO} bash -c '
     set -e
     ${taito_setv:?}
     echo [Extract /tmp/${taito_namespace}-secrets.tar]
@@ -36,7 +35,7 @@ ssh ${opts} "${taito_ssh_user}@${taito_host}" "
     echo
 
     if which createtaitosite &> /dev/null; then
-      createtaitosite ${taito_namespace} ${taito_domain} $CLIENT_MAX_BODY_SIZE
+      createtaitosite ${taito_namespace} ${taito_domain} $LINUX_CLIENT_MAX_BODY_SIZE
     else
       echo NOTE: createtaitosite command does not exist.
       echo Configure routing for domain ${taito_domain} yourself.

scripts/linux-provider/taito-env-destroy#post.sh

@@ -7,11 +7,12 @@
 
 set -e
 
+. "${taito_project_path}/scripts/linux-provider/_config.sh"
 . "${taito_cli_path}/plugins/ssh/util/opts.sh"
 
 echo "[Execute on ${taito_host}]"
 ssh ${opts} "${taito_ssh_user}@${taito_host}" "
-  sudo bash -c '
+  ${LINUX_SUDO} bash -c '
     set -e
     ${taito_setv:?}
     if which deletetaitosite &> /dev/null; then

scripts/linux-provider/taito-env-rotate#post.sh

@@ -8,9 +8,10 @@
 
 set -e
 
+. "${taito_project_path}/scripts/linux-provider/_config.sh"
 . "${taito_cli_path}/plugins/ssh/util/opts.sh"
 
-# TODO: duplicate code with taito-env-apply#post.sh
+# TODO: some duplicate code with taito-env-apply#post.sh
 
 echo "[Copy changed secrets to ${taito_host}:/tmp]"
 (
@@ -25,7 +26,7 @@ echo
 
 echo "[Execute on ${taito_host}]"
 ssh ${opts} "${taito_ssh_user}@${taito_host}" "
-  sudo bash -c '
+  ${LINUX_SUDO} bash -c '
     set -e
     ${taito_setv:?}
     echo [Extract /tmp/${taito_namespace}-secrets.tar]
@@ -36,6 +37,7 @@ ssh ${opts} "${taito_ssh_user}@${taito_host}" "
 
     echo [Restart docker-compose]
     cd ${taito_host_dir}
+    . taito-config.sh
     docker-compose stop
     docker-compose -d up
   '

taito-config.sh

@@ -359,17 +359,21 @@ case $taito_provider in
     gcloud_service_account_enabled=true
     ;;
   linux)
+    # Enable ssh and run plugins
     taito_plugins="
       ssh:-local
       run:-local
       ${taito_plugins}
     "
     run_scripts_location="scripts/linux-provider"
-    # Use docker-compose instead of Kubernetes and Helm
+    # Set some configuration parameters for scripts/linux-provider scripts
+    LINUX_SUDO=sudo # NOTE: Put empty value if sudo is not required or allowed
+    LINUX_CLIENT_MAX_BODY_SIZE=1m
+    # Use Docker Compose instead of Kubernetes and Helm
     taito_plugins="${taito_plugins/docker-compose:local/docker-compose}"
     taito_plugins="${taito_plugins/kubectl:-local/}"
     taito_plugins="${taito_plugins/helm:-local/}"
-    # ssh plugin as database proxy
+    # Use SSH plugin as database proxy
     if [[ -f taito-user-config.sh ]]; then
       . ./taito-user-config.sh # TODO: hack
     fi