Fix typos in README and entrypoint script

This commit is contained in:
Lukas Matt 2017-05-23 09:58:16 +02:00
parent cd34e738c2
commit addb40ffa1
2 changed files with 4 additions and 4 deletions

View File

@ -56,9 +56,9 @@ Passbolt docker image provides several environment variables to configure differ
### Core file variables ### Core file variables
* default_salt * salt
* default_seed * cipherseed
* default_url: url of the passbolt installation * url: url of the passbolt installation
### Database variables ### Database variables

View File

@ -100,7 +100,7 @@ gen_ssl_cert() {
install() { install() {
local database=${db_host:-$(grep -m1 -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' $db_config)} local database=${db_host:-$(grep -m1 -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' $db_config)}
echo $database echo $database
tables=$(mysql -u passbolt -h $database -p -BN -e "SHOW TABLES FROM passbolt" -p${db_pass:-P4ssb0lt} |wc -l) tables=$(mysql -u $db_user -h $database -p -BN -e "SHOW TABLES FROM passbolt" -p${db_pass:-P4ssb0lt} |wc -l)
if [ $tables -eq 0 ]; then if [ $tables -eq 0 ]; then
su -c "/var/www/passbolt/app/Console/cake install --send-anonymous-statistics true --no-admin" -ls /bin/bash nginx su -c "/var/www/passbolt/app/Console/cake install --send-anonymous-statistics true --no-admin" -ls /bin/bash nginx