lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lamassu-install and lamassu-update bugfixes (#261)

Browse source 
* Call bip39 after lamassu-server gets installed

* Fix bash variable declaration

* Remove mnemonic path from migrate defaults

This caused the update-to-mnemonic script to skip thinking the mnemonic
already existed
This commit is contained in:
Rafael Taranto 2019-03-14 08:09:47 -03:00 • committed by Josh Harvey
parent eb69b2b5c8
commit f7e9630710
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/lamassu-update
View file

@ -43,7 +43,7 @@ decho "unlinking ${NPM_BIN}/lamassu* old executables"
find ${NPM_BIN} -type l \( -name "lamassu-*" -or -name "hkdf" \) -exec rm -fv {} \; >> ${LOG_FILE} 2>&1 find ${NPM_BIN} -type l \( -name "lamassu-*" -or -name "hkdf" \) -exec rm -fv {} \; >> ${LOG_FILE} 2>&1
if [ -d "/usr/lib/node_modules/lamassu-server" ]; then if [ -d "/usr/lib/node_modules/lamassu-server" ]; then
BKP_NAME = lamassu-server-$(date +%s) BKP_NAME=lamassu-server-$(date +%s)
decho "renaming old lamassu-server instance to ${BKP_NAME}" decho "renaming old lamassu-server instance to ${BKP_NAME}"
mv -v "/usr/lib/node_modules/lamassu-server" "/usr/lib/node_modules/${BKP_NAME}" >> ${LOG_FILE} 2>&1 mv -v "/usr/lib/node_modules/lamassu-server" "/usr/lib/node_modules/${BKP_NAME}" >> ${LOG_FILE} 2>&1
fi fi

1
lamassu-default.json
View file

@ -1,6 +1,5 @@
{ {
"seedPath": "/etc/lamassu/seeds/seed.txt", "seedPath": "/etc/lamassu/seeds/seed.txt",
"mnemonicPath": "/etc/lamassu/mnemonics/mnemonic.txt",
"caPath": "/etc/ssl/certs/Lamassu_OP_Root_CA.pem", "caPath": "/etc/ssl/certs/Lamassu_OP_Root_CA.pem",
"certPath": "/etc/ssl/certs/Lamassu_OP.pem", "certPath": "/etc/ssl/certs/Lamassu_OP.pem",
"keyPath": "/etc/ssl/private/Lamassu_OP.key", "keyPath": "/etc/ssl/private/Lamassu_OP.key",

12
lamassu-remote-install/install
View file

@ -92,12 +92,6 @@ apt update >> $LOG_FILE 2>&1
decho "Installing necessary packages..." decho "Installing necessary packages..."
apt install nodejs python-minimal build-essential supervisor postgresql libpq-dev -y -q >> $LOG_FILE 2>&1 apt install nodejs python-minimal build-essential supervisor postgresql libpq-dev -y -q >> $LOG_FILE 2>&1
decho "Generating mnemonic..."
mkdir -p $MNEMONIC_DIR >> $LOG_FILE 2>&1
SEED=$(openssl rand -hex 32)
MNEMONIC=$(bip39 $SEED)
echo "$MNEMONIC" > $MNEMONIC_FILE
decho "Installing latest npm package manager for node..." decho "Installing latest npm package manager for node..."
retry 3 npm -g --unsafe-perm install npm@5 >> $LOG_FILE 2>&1 retry 3 npm -g --unsafe-perm install npm@5 >> $LOG_FILE 2>&1
NODE_MODULES=$(npm -g root) NODE_MODULES=$(npm -g root)
@ -106,6 +100,12 @@ NPM_BIN=$(npm -g bin)
decho "Installing lamassu-server..." decho "Installing lamassu-server..."
retry 3 npm -g --unsafe-perm install lamassu/lamassu-server#${1-master} >> $LOG_FILE 2>&1 retry 3 npm -g --unsafe-perm install lamassu/lamassu-server#${1-master} >> $LOG_FILE 2>&1
decho "Generating mnemonic..."
mkdir -p $MNEMONIC_DIR >> $LOG_FILE 2>&1
SEED=$(openssl rand -hex 32)
MNEMONIC=$(bip39 $SEED)
echo "$MNEMONIC" > $MNEMONIC_FILE
decho "Creating postgres user..." decho "Creating postgres user..."
POSTGRES_PW=$(hkdf postgres-pw $SEED) POSTGRES_PW=$(hkdf postgres-pw $SEED)
su -l postgres >> $LOG_FILE 2>&1 <<EOF su -l postgres >> $LOG_FILE 2>&1 <<EOF

1
package.json
View file

@ -74,6 +74,7 @@
"lamassu-admin-server": "./bin/lamassu-admin-server", "lamassu-admin-server": "./bin/lamassu-admin-server",
"lamassu-apply-defaults": "./bin/lamassu-apply-defaults", "lamassu-apply-defaults": "./bin/lamassu-apply-defaults",
"hkdf": "./bin/hkdf", "hkdf": "./bin/hkdf",
"bip39": "./bin/bip39",
"lamassu-backup-pg": "./bin/lamassu-backup-pg", "lamassu-backup-pg": "./bin/lamassu-backup-pg",
"lamassu-mnemonic": "./bin/lamassu-mnemonic", "lamassu-mnemonic": "./bin/lamassu-mnemonic",
"lamassu-cancel": "./bin/lamassu-cancel", "lamassu-cancel": "./bin/lamassu-cancel",