Bob Mottram 7 лет назад
Родитель
Сommit
19428773ac
1 измененных файлов: 17 добавлений и 15 удалений
  1. 17
    15
      src/freedombone-app-pleroma

+ 17
- 15
src/freedombone-app-pleroma Просмотреть файл

@@ -190,9 +190,21 @@ function pleroma_create_database {
190 190
     run_system_query_postgresql "GRANT ALL ON ALL tables IN SCHEMA public TO pleroma;"
191 191
     run_system_query_postgresql "GRANT ALL ON ALL sequences IN SCHEMA public TO pleroma;"
192 192
 
193
+    pleroma_secret=config/dev.secret.exs
194
+    cp config/dev.exs $pleroma_secret
195
+    sed -i "s|username:.*|username: \"pleroma\",|g" $pleroma_secret
196
+    sed -i "s|password:.*|password: \"$PLEROMA_ADMIN_PASSWORD\",|g" $pleroma_secret
197
+    sed -i "s|database:.*|database: \"pleroma\",|g" $pleroma_secret
198
+    sed -i "/config :pleroma, Pleroma.Web.Endpoint/a url: [host: \"$PLEROMA_DOMAIN_NAME\", scheme: \"https\", port: 443]," $pleroma_secret
199
+
200
+    pleroma_config=config/config.exs
201
+    sed -i "s|name: .*|name: \"$PLEROMA_TITLE\",|g" $pleroma_config
202
+    sed -i "s|email: .*|email: \"$MY_EMAIL_ADDRESS\",|g" $pleroma_config
203
+
193 204
     cd $PLEROMA_DIR
194
-    mix ecto.create
195
-    mix ecto.migrate
205
+    mix local.rebar --force
206
+    mix ecto.create --force
207
+    mix ecto.migrate --force
196 208
 }
197 209
 
198 210
 function reconfigure_pleroma {
@@ -620,28 +632,18 @@ function install_pleroma {
620 632
     systemctl restart postgresql
621 633
     systemctl restart nginx
622 634
 
623
-    ${PROJECT_NAME}-pass -u $MY_USERNAME -a pleroma -p "$PLEROMA_ADMIN_PASSWORD"
624
-
625 635
     set_completion_param "pleroma domain" "$PLEROMA_DOMAIN_NAME"
626 636
 
627 637
 
628 638
     # back end
629 639
     cd $PLEROMA_DIR
630
-    mix deps.get
640
+    mix local.hex --force
641
+    mix deps.get --force
631 642
 
632 643
     function_check pleroma_create_database
633 644
     pleroma_create_database
634 645
 
635
-    pleroma_secret=config/dev.secret.exs
636
-    cp config/dev.exs $pleroma_secret
637
-    sed -i "s|username:.*|username: \"pleroma\",|g" $pleroma_secret
638
-    sed -i "s|password:.*|password: \"$PLEROMA_ADMIN_PASSWORD\",|g" $pleroma_secret
639
-    sed -i "s|database:.*|database: \"pleroma\",|g" $pleroma_secret
640
-    sed -i "/config :pleroma, Pleroma.Web.Endpoint/a url: [host: \"$PLEROMA_DOMAIN_NAME\", scheme: \"https\", port: 443]," $pleroma_secret
641
-
642
-    pleroma_config=config/config.exs
643
-    sed -i "s|name: .*|name: \"$PLEROMA_TITLE\",|g" $pleroma_config
644
-    sed -i "s|email: .*|email: \"$MY_EMAIL_ADDRESS\",|g" $pleroma_config
646
+    ${PROJECT_NAME}-pass -u $MY_USERNAME -a pleroma -p "$PLEROMA_ADMIN_PASSWORD"
645 647
 
646 648
     # front end
647 649
     install_pleroma_front_end "pleroma" "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE"