From b0a1183b85d63862de204d12f7d8f8adf35a90e4 Mon Sep 17 00:00:00 2001 From: Rajesh Rajendran Date: Wed, 19 May 2021 20:02:31 +0530 Subject: [PATCH 1/2] chore(script): remove logo Signed-off-by: Rajesh Rajendran --- scripts/helm/kube-install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/helm/kube-install.sh b/scripts/helm/kube-install.sh index 2fc132040..1256269fa 100755 --- a/scripts/helm/kube-install.sh +++ b/scripts/helm/kube-install.sh @@ -84,11 +84,6 @@ This script will install and configure OpenReplay apps and databases on the kube which is accesd with the ${HOME}/.kube/config or $KUBECONFIG env variable. ''' cat << EOF -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -█░▄▄▀█░▄▄█░▄▄▀█░██░█░▄▄█░▄▄▀██ -█░▀▀░█▄▄▀█░▀▀░█░▀▀░█░▄▄█░▀▀▄██ -█▄██▄█▄▄▄█▄██▄█▀▀▀▄█▄▄▄█▄█▄▄██ -▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ EOF echo -e "${green}Usage: openreplay-cli [ -h | --help ] [ -v | --verbose ] From fbf35b3bc515bb7dba9c4688e6ef4041e7528779 Mon Sep 17 00:00:00 2001 From: Rajesh Rajendran Date: Wed, 19 May 2021 20:07:05 +0530 Subject: [PATCH 2/2] Making domain_name mandatory Signed-off-by: Rajesh Rajendran --- scripts/helm/install.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/helm/install.sh b/scripts/helm/install.sh index fc50c519b..a3dfcc4c2 100755 --- a/scripts/helm/install.sh +++ b/scripts/helm/install.sh @@ -2,6 +2,22 @@ set -o errtrace +# Check for a valid domain_name +domain_name=`grep domain_name vars.yaml | grep -v "example" | cut -d " " -f2 | cut -d '"' -f2` +# Ref: https://stackoverflow.com/questions/15268987/bash-based-regex-domain-name-validation +[[ $(echo $domain_name | grep -P '(?=^.{5,254}$)(^(?:(?!\d+\.)[a-zA-Z0-9_\-]{1,63}\.?)+(?:[a-zA-Z]{2,})$)') ]] || { + echo "OpenReplay Needs a valid domain name for captured sessions to replay. For example, openreplay.mycompany.com" + echo "Please enter your domain name" + read domain_name + [[ -z domain_name ]] && { + echo "OpenReplay won't work without domain name. Exiting..." + exit 1 + } || { + sed -i "s#domain_name.*#domain_name: \"${domain_name}\" #g" vars.yaml + } +} + + # Installing k3s curl -sL https://get.k3s.io | sudo K3S_KUBECONFIG_MODE="644" INSTALL_K3S_VERSION='v1.19.5+k3s2' INSTALL_K3S_EXEC="--no-deploy=traefik" sh - mkdir ~/.kube