free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidying

This commit is contained in:
Bob Mottram 2018-01-09 19:51:20 +00:00
parent ef2a5ca038
commit 077a02818e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/freedombone-app-pleroma
View File

@ -188,6 +188,11 @@ function change_password_pleroma {
#${PROJECT_NAME}-pass -u "$curr_username" -a pleroma -p "$new_user_password" #${PROJECT_NAME}-pass -u "$curr_username" -a pleroma -p "$new_user_password"
} }
function pleroma_create_database_failed {
run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
}
function pleroma_create_database { function pleroma_create_database {
if [ -f $IMAGE_PASSWORD_FILE ]; then if [ -f $IMAGE_PASSWORD_FILE ]; then
PLEROMA_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)" PLEROMA_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
@ -215,8 +220,7 @@ function pleroma_create_database {
if [ ${#PLEROMA_SECRET_KEY} -lt 64 ]; then if [ ${#PLEROMA_SECRET_KEY} -lt 64 ]; then
PLEROMA_SECRET_KEY="$(create_password 30)$(create_password 30)$(create_password 30)" PLEROMA_SECRET_KEY="$(create_password 30)$(create_password 30)$(create_password 30)"
if [ ${#PLEROMA_SECRET_KEY} -lt 64 ]; then if [ ${#PLEROMA_SECRET_KEY} -lt 64 ]; then
run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;" pleroma_create_database_failed
run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
echo $'Pleroma secret key not created' echo $'Pleroma secret key not created'
exit 6782352 exit 6782352
fi fi
@ -258,8 +262,7 @@ function pleroma_create_database {
chown -R pleroma:pleroma $PLEROMA_DIR/* chown -R pleroma:pleroma $PLEROMA_DIR/*
sudo -u pleroma mix local.rebar --force sudo -u pleroma mix local.rebar --force
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;" pleroma_create_database_failed
run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
echo $'mix local.rebar failed' echo $'mix local.rebar failed'
exit 73528562 exit 73528562
fi fi
@ -268,15 +271,13 @@ function pleroma_create_database {
systemctl restart postgresql systemctl restart postgresql
sudo -u pleroma mix ecto.create --force sudo -u pleroma mix ecto.create --force
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;" pleroma_create_database_failed
run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
echo $'mix ecto.create failed' echo $'mix ecto.create failed'
exit 83653582 exit 83653582
fi fi
sudo -u pleroma mix ecto.migrate --force sudo -u pleroma mix ecto.migrate --force
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;" pleroma_create_database_failed
run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
echo $'mix ecto.migrate failed' echo $'mix ecto.migrate failed'
exit 73752573 exit 73752573
fi fi