Merge branch 'master' of https://github.com/lemmynet/lemmy
This commit is contained in:
commit
a0ffe08ec2
2 changed files with 5 additions and 5 deletions
8
install.sh
vendored
8
install.sh
vendored
|
@ -16,10 +16,10 @@ init_db_final=0
|
||||||
while [ "$init_db_valid" == 0 ]
|
while [ "$init_db_valid" == 0 ]
|
||||||
do
|
do
|
||||||
read -p "Initialize database (y/n)? " init_db
|
read -p "Initialize database (y/n)? " init_db
|
||||||
case "${init_db,,}" in
|
case "$init_db" in
|
||||||
y|yes ) init_db_valid=1; init_db_final=1;;
|
[yY]* ) init_db_valid=1; init_db_final=1;;
|
||||||
n|no ) init_db_valid=1; init_db_final=0;;
|
[nN]* ) init_db_valid=1; init_db_final=0;;
|
||||||
* ) echo "Invalid input" 1>&2;;
|
* ) echo "Invalid input. Please enter either \"y\" or \"n\"." 1>&2;;
|
||||||
esac
|
esac
|
||||||
echo
|
echo
|
||||||
done
|
done
|
||||||
|
|
2
server/db-init.sh
vendored
2
server/db-init.sh
vendored
|
@ -37,7 +37,7 @@ done
|
||||||
|
|
||||||
|
|
||||||
psql -c "CREATE USER $username WITH PASSWORD '$password' SUPERUSER;" -U postgres
|
psql -c "CREATE USER $username WITH PASSWORD '$password' SUPERUSER;" -U postgres
|
||||||
psql -c 'CREATE DATABASE $dbname WITH OWNER $username;' -U postgres
|
psql -c "CREATE DATABASE $dbname WITH OWNER $username;" -U postgres
|
||||||
export LEMMY_DATABASE_URL=postgres://$username:$password@localhost:$port/$dbname
|
export LEMMY_DATABASE_URL=postgres://$username:$password@localhost:$port/$dbname
|
||||||
|
|
||||||
echo $LEMMY_DATABASE_URL
|
echo $LEMMY_DATABASE_URL
|
||||||
|
|
Loading…
Reference in a new issue