Skip to content

Commit

Permalink
Merge pull request #445 from tusharsadhwani/fix-whitespace
Browse files Browse the repository at this point in the history
Fix whitespace inconsistency in install scripts
  • Loading branch information
mr-karan committed Aug 30, 2021
2 parents 7691fbd + 2edd3ec commit 6cf0b46
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 55 deletions.
10 changes: 5 additions & 5 deletions install-demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ check_dependencies() {
if ! command -v curl > /dev/null; then
echo "curl is not installed."
exit 1
fi
fi

if ! command -v docker > /dev/null; then
echo "docker is not installed."
exit 1
fi
fi

if ! command -v docker-compose > /dev/null; then
echo "docker-compose is not installed."
Expand All @@ -22,12 +22,12 @@ check_dependencies() {
}

setup_containers() {
curl -o docker-compose.yml https://raw.githubusercontent.com/knadh/listmonk/master/docker-compose.yml
docker-compose up -d demo-db demo-app
curl -o docker-compose.yml https://raw.githubusercontent.com/knadh/listmonk/master/docker-compose.yml
docker-compose up -d demo-db demo-app
}

show_output(){
echo -e "\nListmonk is now up and running. Visit http://localhost:9000 in your browser.\n"
echo -e "\nListmonk is now up and running. Visit http://localhost:9000 in your browser.\n"
}


Expand Down
100 changes: 50 additions & 50 deletions install-prod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ check_dependencies() {
if ! exists curl; then
error "curl is not installed."
exit 1
fi
fi

if ! exists docker; then
error "docker is not installed."
exit 1
fi
fi

if ! exists docker-compose; then
error "docker-compose is not installed."
Expand All @@ -45,81 +45,81 @@ check_dependencies() {
}

download() {
curl --fail --silent --location --output "$2" "$1"
curl --fail --silent --location --output "$2" "$1"
}

is_healthy() {
info "waiting for db container to be up. retrying in 3s"
health_status="$(docker inspect -f "{{.State.Health.Status}}" "$1")"
if [ "$health_status" = "healthy" ]; then
return 0
else
return 1
fi
info "waiting for db container to be up. retrying in 3s"
health_status="$(docker inspect -f "{{.State.Health.Status}}" "$1")"
if [ "$health_status" = "healthy" ]; then
return 0
else
return 1
fi
}

is_running() {
info "checking if "$1" is running"
status="$(docker inspect -f "{{.State.Status}}" "$1")"
if [ "$status" = "running" ]; then
return 0
else
return 1
fi
info "checking if "$1" is running"
status="$(docker inspect -f "{{.State.Status}}" "$1")"
if [ "$status" = "running" ]; then
return 0
else
return 1
fi
}

generate_password(){
echo $(tr -dc A-Za-z0-9 </dev/urandom | head -c 13 ; echo '')
echo $(tr -dc A-Za-z0-9 </dev/urandom | head -c 13 ; echo '')
}

get_config() {
info "fetching config.toml from listmonk repo"
download https://raw.githubusercontent.com/knadh/listmonk/master/config.toml.sample config.toml
info "fetching config.toml from listmonk repo"
download https://raw.githubusercontent.com/knadh/listmonk/master/config.toml.sample config.toml
}

get_containers() {
info "fetching docker-compose.yml from listmonk repo"
download https://raw.githubusercontent.com/knadh/listmonk/master/docker-compose.yml docker-compose.yml
info "fetching docker-compose.yml from listmonk repo"
download https://raw.githubusercontent.com/knadh/listmonk/master/docker-compose.yml docker-compose.yml
}

modify_config(){
info "generating a random password"
db_password=$(generate_password)

info "modifying config.toml"
# Replace `db.host=localhost` with `db.host=db` in config file.
sed -i "s/host = \"localhost\"/host = \"listmonk_db\"/g" config.toml
# Replace `db.password=listmonk` with `db.password={{db_password}}` in config file.
# Note that `password` is wrapped with `\b`. This ensures that `admin_password` doesn't match this pattern instead.
sed -i "s/\bpassword\b = \"listmonk\"/password = \"$db_password\"/g" config.toml
# Replace `app.address=localhost:9000` with `app.address=0.0.0.0:9000` in config file.
sed -i "s/address = \"localhost:9000\"/address = \"0.0.0.0:9000\"/g" config.toml

info "modifying docker-compose.yml"
sed -i "s/POSTGRES_PASSWORD=listmonk/POSTGRES_PASSWORD=$db_password/g" docker-compose.yml
info "generating a random password"
db_password=$(generate_password)

info "modifying config.toml"
# Replace `db.host=localhost` with `db.host=db` in config file.
sed -i "s/host = \"localhost\"/host = \"listmonk_db\"/g" config.toml
# Replace `db.password=listmonk` with `db.password={{db_password}}` in config file.
# Note that `password` is wrapped with `\b`. This ensures that `admin_password` doesn't match this pattern instead.
sed -i "s/\bpassword\b = \"listmonk\"/password = \"$db_password\"/g" config.toml
# Replace `app.address=localhost:9000` with `app.address=0.0.0.0:9000` in config file.
sed -i "s/address = \"localhost:9000\"/address = \"0.0.0.0:9000\"/g" config.toml

info "modifying docker-compose.yml"
sed -i "s/POSTGRES_PASSWORD=listmonk/POSTGRES_PASSWORD=$db_password/g" docker-compose.yml
}

run_migrations(){
info "running migrations"
docker-compose up -d db
while ! is_healthy listmonk_db; do sleep 3; done
docker-compose run --rm app ./listmonk --install
info "running migrations"
docker-compose up -d db
while ! is_healthy listmonk_db; do sleep 3; done
docker-compose run --rm app ./listmonk --install
}

start_services(){
info "starting app"
docker-compose up -d app db
info "starting app"
docker-compose up -d app db
}

show_output(){
info "finishing setup"
sleep 3

if is_running listmonk_db && is_running listmonk_app
then completed "Listmonk is now up and running. Visit http://localhost:9000 in your browser."
else
error "error running containers. something went wrong."
fi
info "finishing setup"
sleep 3

if is_running listmonk_db && is_running listmonk_app
then completed "Listmonk is now up and running. Visit http://localhost:9000 in your browser."
else
error "error running containers. something went wrong."
fi
}


Expand Down

0 comments on commit 6cf0b46

Please sign in to comment.