Skip to content

Focal fixs #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arm4b merged 2 commits into from
May 12, 2021
Merged

Focal fixs #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7799119
Fix white space and indentation
nzlosh May 12, 2021
7d44339
Use mongodb 4.4 for focal and mongodb 4.0 for other ubuntu versions.
nzlosh May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions scripts/st2bootstrap-deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ install_st2_dependencies() {
fi

sudo apt-get install -y curl

# Various other dependencies needed by st2 and installer script
sudo apt-get install -y crudini
}
Expand All @@ -489,10 +489,16 @@ install_rabbitmq() {

install_mongodb() {
# Add key and repo for the latest stable MongoDB 4.0
wget -qO - https://www.mongodb.org/static/pgp/server-4.0.asc | sudo apt-key add -
echo "deb http://repo.mongodb.org/apt/ubuntu ${SUBTYPE}/mongodb-org/4.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list
if [[ "$SUBTYPE" = 'focal' ]]; then
MONGO_VERSION="4.4"
else
MONGO_VERSION="4.0"
fi

# Install MongoDB 4.0
wget -qO - https://www.mongodb.org/static/pgp/server-${MONGO_VERSION}.asc | sudo apt-key add -
echo "deb http://repo.mongodb.org/apt/ubuntu ${SUBTYPE}/mongodb-org/${MONGO_VERSION} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-${MONGO_VERSION}.list

# Install MongoDB
sudo apt-get update
sudo apt-get install -y mongodb-org

Expand Down Expand Up @@ -542,8 +548,8 @@ EOF
}

install_redis() {
# Install Redis Server. By default, redis only listen on localhost only.
sudo apt-get install -y redis-server
# Install Redis Server. By default, redis only listen on localhost only.
sudo apt-get install -y redis-server
}

get_full_pkg_versions() {
Expand Down Expand Up @@ -610,7 +616,7 @@ install_st2() {

# Configure [coordination] section in st2.conf (url for Redis access)
sudo crudini --set /etc/st2/st2.conf coordination url "redis://127.0.0.1:6379"

sudo st2ctl start
sudo st2ctl reload --register-all
}
Expand Down
20 changes: 13 additions & 7 deletions scripts/st2bootstrap-deb.template.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ install_st2_dependencies() {
fi

sudo apt-get install -y curl

# Various other dependencies needed by st2 and installer script
sudo apt-get install -y crudini
}
Expand All @@ -175,10 +175,16 @@ install_rabbitmq() {

install_mongodb() {
# Add key and repo for the latest stable MongoDB 4.0
wget -qO - https://www.mongodb.org/static/pgp/server-4.0.asc | sudo apt-key add -
echo "deb http://repo.mongodb.org/apt/ubuntu ${SUBTYPE}/mongodb-org/4.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list
if [[ "$SUBTYPE" = 'focal' ]]; then
MONGO_VERSION="4.4"
else
MONGO_VERSION="4.0"
fi

# Install MongoDB 4.0
wget -qO - https://www.mongodb.org/static/pgp/server-${MONGO_VERSION}.asc | sudo apt-key add -
echo "deb http://repo.mongodb.org/apt/ubuntu ${SUBTYPE}/mongodb-org/${MONGO_VERSION} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-${MONGO_VERSION}.list

# Install MongoDB
sudo apt-get update
sudo apt-get install -y mongodb-org

Expand Down Expand Up @@ -228,8 +234,8 @@ EOF
}

install_redis() {
# Install Redis Server. By default, redis only listen on localhost only.
sudo apt-get install -y redis-server
# Install Redis Server. By default, redis only listen on localhost only.
sudo apt-get install -y redis-server
}

get_full_pkg_versions() {
Expand Down Expand Up @@ -296,7 +302,7 @@ install_st2() {

# Configure [coordination] section in st2.conf (url for Redis access)
sudo crudini --set /etc/st2/st2.conf coordination url "redis://127.0.0.1:6379"

sudo st2ctl start
sudo st2ctl reload --register-all
}
Expand Down