Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix password generation and OS case problems in install scripts (#4184)

Browse Source 
* Fix password generation in k8s install script

* OS should always be lower case
This commit is contained in:
Shrikant Sharat Kandula 2021-04-27 20:43:22 +05:30 committed by GitHub
parent c8bce7344b
commit 379ea708fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deploy/ansible/appsmith_playbook/main.yml
View File

@ -5,12 +5,13 @@
vars:
analytics_webhook_uri: https://hook.integromat.com/dkwb6i52am93pi30ojeboktvj32iw0fa
ipify_url: https://api64.ipify.org
tasks:
tasks:
- name: Deploy appsmith on host
block:
- name: Get OS
shell: cat /etc/*-release | awk -F= '$1 == "NAME" { gsub(/"/, ""); print $2; exit }'
shell: |
cat /etc/*-release | awk -F= '$1 == "NAME" { gsub(/"/, ""); print $2; exit }' | tr '[:upper:]' '[:lower:]'
register: os
- name: Get app installation id
@ -30,17 +31,17 @@
- name: Setup dependencies
import_role:
name: base
- name: Generate config template
import_role:
name: generate_template
- name: Run App
import_role:
name: start_app
- name: Config SSL
import_role:
import_role:
name: domain_ssl
- name: Push installation success event to integromat
uri:

6
deploy/aws_ami/first-time-setup.sh
View File

@ -36,7 +36,7 @@ bye() { # Prints a friendly good bye message and exits the script.
"userId": "'"$APPSMITH_INSTALLATION_ID"'",
"event": "Installation Support",
"data": {
"os": "Ubuntu",
"os": "ubuntu",
"platform" : "aws_ami"
}
}' > /dev/null
@ -88,7 +88,7 @@ curl -s --location --request POST 'https://hook.integromat.com/dkwb6i52am93pi30o
"userId": "'"$APPSMITH_INSTALLATION_ID"'",
"event": "Installation Started",
"data": {
"os": "Ubuntu",
"os": "ubuntu",
"platform": "aws_ami"
}
}' > /dev/null
@ -163,7 +163,7 @@ if [[ $status_code -eq 401 ]]; then
"userId": "'"$APPSMITH_INSTALLATION_ID"'",
"event": "Installation Success",
"data": {
"os": "Ubuntu",
"os": "ubuntu",
"platform": "aws_ami"
}
}' > /dev/null

30
deploy/install.sh
View File

@ -60,20 +60,22 @@ install_docker() {
$apt_cmd update
echo "Installing docker"
$apt_cmd install docker-ce docker-ce-cli containerd.io
elif [[ $package_manager == zypper ]]; then
zypper_cmd="sudo zypper --quiet --no-gpg-checks --non-interactive"
echo "Installing docker"
if [[ $os == sles ]]; then
os_sp="$(cat /etc/*-release | awk -F= '$1 == "VERSION_ID" { gsub(/"/, ""); print $2; exit }')"
os_arch="$(uname -i)"
sudo SUSEConnect -p sle-module-containers/$os_sp/$os_arch -r ''
sudo SUSEConnect -p "sle-module-containers/$os_sp/$os_arch" -r ''
fi
$zypper_cmd install docker docker-runc containerd
sudo systemctl enable docker.service
else
yum_cmd="sudo yum --assumeyes --quiet"
$yum_cmd install yum-utils
sudo yum-config-manager --add-repo https://download.docker.com/linux/$os/docker-ce.repo
sudo yum-config-manager --add-repo "https://download.docker.com/linux/$os/docker-ce.repo"
echo "Installing docker"
$yum_cmd install docker-ce docker-ce-cli containerd.io
@ -122,51 +124,55 @@ check_os() {
if is_mac; then
package_manager="brew"
desired_os=1
os="Mac"
os="mac"
return
fi
os_name="$(cat /etc/*-release | awk -F= '$1 == "NAME" { gsub(/"/, ""); print $2; exit }')"
local os_name="$(
cat /etc/*-release \
| awk -F= '$1 == "NAME" { gsub(/"/, ""); print $2; exit }' \
| tr '[:upper:]' '[:lower:]'
)"
case "$os_name" in
Ubuntu*)
ubuntu*)
desired_os=1
os="ubuntu"
package_manager="apt-get"
;;
Debian*)
debian*)
desired_os=1
os="debian"
package_manager="apt-get"
;;
Linux\ Mint*)
linux\ mint*)
desired_os=1
os="linux mint"
package_manager="apt-get"
;;
Red\ Hat*)
red\ hat*)
desired_os=1
os="red hat"
package_manager="yum"
;;
CentOS*)
centos*)
desired_os=1
os="centos"
package_manager="yum"
;;
SLES*)
sles*)
desired_os=1
os="sles"
package_manager="zypper"
;;
openSUSE*)
opensuse*)
desired_os=1
os="opensuse"
package_manager="zypper"
;;
*)
desired_os=0
os="Not Found"
os="Not Found: $os_name"
esac
}

45
deploy/k8s/install.k8s.sh
View File

@ -18,11 +18,11 @@ check_k8s_setup() {
echo "Please install kubectl on your machine"
exit 1
else
if ! is_command_present jq; then
install_jq
fi
clusters=`kubectl config view -o json | jq -r '."current-context"'`
clusters=`kubectl config view -o json | jq -r '."current-context"'`
if [[ ! -n $clusters ]]; then
echo "Please setup a k8s cluster & config kubectl to connect to it"
exit 1
@ -56,36 +56,40 @@ check_os() {
if is_mac; then
package_manager="brew"
desired_os=1
os="Mac"
os="mac"
return
fi
os_name="$(cat /etc/*-release | awk -F= '$1 == "NAME" { gsub(/"/, ""); print $2; exit }')"
local os_name="$(
cat /etc/*-release \
| awk -F= '$1 == "NAME" { gsub(/"/, ""); print $2; exit }' \
| tr '[:upper:]' '[:lower:]'
)"
case "$os_name" in
Ubuntu*)
ubuntu*)
desired_os=1
os="ubuntu"
package_manager="apt-get"
;;
Debian*)
debian*)
desired_os=1
os="debian"
package_manager="apt-get"
;;
Red\ Hat*)
red\ hat*)
desired_os=1
os="red hat"
package_manager="yum"
;;
CentOS*)
centos*)
desired_os=1
os="centos"
package_manager="yum"
;;
*)
desired_os=0
os="Not Found"
os="Not Found: $os_name"
esac
}
@ -97,12 +101,12 @@ overwrite_file() {
if [[ -f $full_path ]] && ! confirm y "File $relative_path already exists. Would you like to replace it?"; then
rm -f "$template_file"
else
else
mv -f "$template_file" "$full_path"
fi
}
# This function prompts the user for an input for a non-empty Mongo root password.
# This function prompts the user for an input for a non-empty Mongo root password.
read_mongo_password() {
read -srp 'Set the mongo password: ' mongo_root_password
while [[ -z $mongo_root_password ]]; do
@ -113,10 +117,10 @@ read_mongo_password() {
echo "++++++++++++++++++++++++++++++++++++++++"
echo ""
read -srp 'Set the mongo password: ' mongo_root_password
done
done
}
# This function prompts the user for an input for a non-empty Mongo username.
# This function prompts the user for an input for a non-empty Mongo username.
read_mongo_username() {
read -rp 'Set the mongo root user: ' mongo_root_user
while [[ -z $mongo_root_user ]]; do
@ -147,8 +151,13 @@ urlencode() {
}
generate_password() {
# Picked up the following method of generation from : https://gist.github.com/earthgecko/3089509
LC_CTYPE=C tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 13 | head -n 1
local gen_string="$(/usr/bin/python -c 'import random, string; print("".join(random.choice(string.ascii_letters + string.digits) for _ in range(13)))' 2>/dev/null)"
if [[ -n $gen_string ]]; then
echo "$gen_string"
else
# Picked up the following method of generation from : https://gist.github.com/earthgecko/3089509
LC_ALL=C tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 13 | head -n 1
fi
}
confirm() {
@ -222,7 +231,7 @@ download_template_file() {
cd "$install_dir"
curl --remote-name-all --silent --show-error -o backend-template.yaml \
"$template_endpoint/deploy/k8s/templates/backend-template.yaml"
curl --remote-name-all --silent --show-error -o frontend-template.yaml \
"$template_endpoint/deploy/k8s/templates/frontend-template.yaml"
if [[ "$fresh_installation" == "true" ]]; then
@ -250,7 +259,7 @@ install_certmanager() {
# cert-manager installation document: https://cert-manager.io/docs/installation/kubernetes/
kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.0.3/cert-manager.yaml
sleep 30; # Wait 30s for cert-manger ready
else
else
echo "Cert-manager already install"
fi
}
@ -478,7 +487,7 @@ download_template_file
echo ""
echo "Generating the configuration files from the templates"
cd "$templates_dir"
cd "$templates_dir"
mkdir -p "$install_dir/config-template"