Bob Mottram преди 7 години
родител
ревизия
077a02818e
променени са 1 файла, в които са добавени 9 реда и са изтрити 8 реда
  1. 9
    8
      src/freedombone-app-pleroma

+ 9
- 8
src/freedombone-app-pleroma Целия файл

188
     #${PROJECT_NAME}-pass -u "$curr_username" -a pleroma -p "$new_user_password"
188
     #${PROJECT_NAME}-pass -u "$curr_username" -a pleroma -p "$new_user_password"
189
 }
189
 }
190
 
190
 
191
+function pleroma_create_database_failed {
192
+    run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
193
+    run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
194
+}
195
+
191
 function pleroma_create_database {
196
 function pleroma_create_database {
192
     if [ -f $IMAGE_PASSWORD_FILE ]; then
197
     if [ -f $IMAGE_PASSWORD_FILE ]; then
193
         PLEROMA_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
198
         PLEROMA_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
215
     if [ ${#PLEROMA_SECRET_KEY} -lt 64 ]; then
220
     if [ ${#PLEROMA_SECRET_KEY} -lt 64 ]; then
216
         PLEROMA_SECRET_KEY="$(create_password 30)$(create_password 30)$(create_password 30)"
221
         PLEROMA_SECRET_KEY="$(create_password 30)$(create_password 30)$(create_password 30)"
217
         if [ ${#PLEROMA_SECRET_KEY} -lt 64 ]; then
222
         if [ ${#PLEROMA_SECRET_KEY} -lt 64 ]; then
218
-            run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
219
-            run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
223
+            pleroma_create_database_failed
220
             echo $'Pleroma secret key not created'
224
             echo $'Pleroma secret key not created'
221
             exit 6782352
225
             exit 6782352
222
         fi
226
         fi
258
     chown -R pleroma:pleroma $PLEROMA_DIR/*
262
     chown -R pleroma:pleroma $PLEROMA_DIR/*
259
     sudo -u pleroma mix local.rebar --force
263
     sudo -u pleroma mix local.rebar --force
260
     if [ ! "$?" = "0" ]; then
264
     if [ ! "$?" = "0" ]; then
261
-        run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
262
-        run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
265
+        pleroma_create_database_failed
263
         echo $'mix local.rebar failed'
266
         echo $'mix local.rebar failed'
264
         exit 73528562
267
         exit 73528562
265
     fi
268
     fi
268
     systemctl restart postgresql
271
     systemctl restart postgresql
269
     sudo -u pleroma mix ecto.create --force
272
     sudo -u pleroma mix ecto.create --force
270
     if [ ! "$?" = "0" ]; then
273
     if [ ! "$?" = "0" ]; then
271
-        run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
272
-        run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
274
+        pleroma_create_database_failed
273
         echo $'mix ecto.create failed'
275
         echo $'mix ecto.create failed'
274
         exit 83653582
276
         exit 83653582
275
     fi
277
     fi
276
     sudo -u pleroma mix ecto.migrate --force
278
     sudo -u pleroma mix ecto.migrate --force
277
     if [ ! "$?" = "0" ]; then
279
     if [ ! "$?" = "0" ]; then
278
-        run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
279
-        run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
280
+        pleroma_create_database_failed
280
         echo $'mix ecto.migrate failed'
281
         echo $'mix ecto.migrate failed'
281
         exit 73752573
282
         exit 73752573
282
     fi
283
     fi