Skip to content
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

Jump to bottom

refactor: postgres without sudo #47

Merged
merged 2 commits into from
Apr 5, 2019
Merged

refactor: postgres without sudo #47

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
c0cecf9
refactor: remove sudo requirement for postgres
alexbarnsley Apr 4, 2019
e7d5660
fix: prefix from json config
alexbarnsley Apr 5, 2019
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
29 changes: 17 additions & 12 deletions app/app-core.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,17 @@ app_install_core()
TESTNET_PREFIX=$(sh -c "jq '.M' $__dir/prefixes.json")
fi

## Create local user for psql
sudo -u postgres psql -c "CREATE USER $USER;"
sudo -u postgres psql -c "ALTER USER $USER WITH SUPERUSER;"

local DATABASE_NAME_MAINNET="${DATABASE_NAME}_mainnet"
local DATABASE_NAME_DEVNET="${DATABASE_NAME}_devnet"
local DATABASE_NAME_TESTNET="${DATABASE_NAME}_testnet"

local DB_EXISTS_MAINNET=$(sudo -u postgres psql -t -c "\l" | fgrep "$DATABASE_NAME_MAINNET" | fgrep "|" | awk '{$1=$1};1' | awk '{print $1}')
local DB_EXISTS_DEVNET=$(sudo -u postgres psql -t -c "\l" | fgrep "$DATABASE_NAME_DEVNET" | fgrep "|" | awk '{$1=$1};1' | awk '{print $1}')
local DB_EXISTS_TESTNET=$(sudo -u postgres psql -t -c "\l" | fgrep "$DATABASE_NAME_TESTNET" | fgrep "|" | awk '{$1=$1};1' | awk '{print $1}')
local DB_EXISTS_MAINNET=$(psql -t -c "\l" postgres | fgrep "$DATABASE_NAME_MAINNET" | fgrep "|" | awk '{$1=$1};1' | awk '{print $1}')
local DB_EXISTS_DEVNET=$(psql -t -c "\l" postgres | fgrep "$DATABASE_NAME_DEVNET" | fgrep "|" | awk '{$1=$1};1' | awk '{print $1}')
local DB_EXISTS_TESTNET=$(psql -t -c "\l" postgres | fgrep "$DATABASE_NAME_TESTNET" | fgrep "|" | awk '{$1=$1};1' | awk '{print $1}')

local DB_EXISTS="$DB_EXISTS_MAINNET $DB_EXISTS_DEVNET $DB_EXISTS_TESTNET"
local DB_EXISTS=$(echo "$DB_EXISTS" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
Expand All @@ -46,22 +50,23 @@ app_install_core()
echo "Skipping database re-creation"
else
if [ ! -z "$DB_EXISTS_MAINNET" ]; then
sudo -u postgres dropdb "$DATABASE_NAME_MAINNET"
sudo -u postgres createdb "$DATABASE_NAME_MAINNET"
dropdb "$DATABASE_NAME_MAINNET"
createdb "$DATABASE_NAME_MAINNET"
fi
if [ ! -z "$DB_EXISTS_DEVNET" ]; then
sudo -u postgres dropdb "$DATABASE_NAME_DEVNET"
sudo -u postgres createdb "$DATABASE_NAME_DEVNET"
dropdb "$DATABASE_NAME_DEVNET"
createdb "$DATABASE_NAME_DEVNET"
fi
if [ ! -z "$DB_EXISTS_TESTNET" ]; then
sudo -u postgres dropdb "$DATABASE_NAME_TESTNET"
sudo -u postgres createdb "$DATABASE_NAME_TESTNET"
dropdb "$DATABASE_NAME_TESTNET"
createdb "$DATABASE_NAME_TESTNET"
fi
echo "Created databases"
fi
else
sudo -u postgres createdb "$DATABASE_NAME_MAINNET"
sudo -u postgres createdb "$DATABASE_NAME_DEVNET"
sudo -u postgres createdb "$DATABASE_NAME_TESTNET"
createdb "$DATABASE_NAME_MAINNET"
createdb "$DATABASE_NAME_DEVNET"
createdb "$DATABASE_NAME_TESTNET"
echo "Created databases"
fi

Expand Down
6 changes: 3 additions & 3 deletions app/args.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ parse_json_config()
fi
;;
"mainnetPrefix")
PREFIX=$(jq -r '.mainnetPrefix' "$CONFIG")
MAINNET_PREFIX=$(jq -r '.mainnetPrefix' "$CONFIG")
;;
"devnetPrefix")
PREFIX=$(jq -r '.devnetPrefix' "$CONFIG")
DEVNET_PREFIX=$(jq -r '.devnetPrefix' "$CONFIG")
;;
"testnetPrefix")
PREFIX=$(jq -r '.testnetPrefix' "$CONFIG")
TESTNET_PREFIX=$(jq -r '.testnetPrefix' "$CONFIG")
;;
"fees")
local STATIC_FEES=$(jq -r '.fees.static // empty' "$CONFIG")
Expand Down
2 changes: 1 addition & 1 deletion app/process-core.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ __core_start() {
__core_check_last_height() {
local CONFIG_PATH="$1"
local DATABASE_NAME=$(cat "$BRIDGECHAIN_PATH/packages/core/bin/config/$NETWORK/.env" | fgrep 'CORE_DB_DATABASE=' | awk -F'=' '{print $2}')
sudo -u postgres psql -qtAX -d "$DATABASE_NAME" -c "SELECT height FROM blocks ORDER BY height DESC LIMIT 1" 2>/dev/null || echo 0
psql -qtAX -d "$DATABASE_NAME" -c "SELECT height FROM blocks ORDER BY height DESC LIMIT 1" 2>/dev/null || echo 0
}

process_core_stop()
Expand Down