瀏覽代碼

Revert "Move pleroma to production config"

This reverts commit 0982180705567a0f7f65154483e539c72bbe2398.
Bob Mottram 7 年之前
父節點
當前提交
1d7888894f
共有 1 個檔案被更改,包括 3 行新增12 行删除
  1. 3
    12
      src/freedombone-app-pleroma

+ 3
- 12
src/freedombone-app-pleroma 查看文件

@@ -227,12 +227,11 @@ function pleroma_create_database {
227 227
         echo $"Missing directory $PLEROMA_DIR/config"
228 228
         exit 7835393
229 229
     fi
230
-    pleroma_secret=$PLEROMA_DIR/config/prod.secret.exs
230
+    pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
231 231
     if [ ! -f $PLEROMA_DIR/config/dev.exs ]; then
232 232
         echo $"Did not find $PLEROMA_DIR/config/dev.exs"
233 233
         exit 78923528
234 234
     fi
235
-
236 235
     cp $PLEROMA_DIR/config/dev.exs $pleroma_secret
237 236
     sed -i "s|username:.*|username: \"pleroma\",|g" $pleroma_secret
238 237
     sed -i "s|password:.*|password: \"$PLEROMA_ADMIN_PASSWORD\",|g" $pleroma_secret
@@ -273,20 +272,13 @@ function pleroma_create_database {
273 272
         echo $'mix ecto.create failed'
274 273
         exit 83653582
275 274
     fi
276
-    sudo -u pleroma MIX_ENV=prod mix ecto.migrate --force
275
+    sudo -u pleroma mix ecto.migrate --force
277 276
     if [ ! "$?" = "0" ]; then
278 277
         run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
279 278
         run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
280 279
         echo $'mix ecto.migrate failed'
281 280
         exit 73752573
282 281
     fi
283
-    sudo -u pleroma MIX_ENV=prod mix phx.digest --force
284
-    if [ ! "$?" = "0" ]; then
285
-        run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
286
-        run_system_query_postgresql "ALTER USER pleroma NOCREATEDB;"
287
-        echo $'mix phx.digest failed'
288
-        exit 783529235
289
-    fi
290 282
 
291 283
     # revoke the ability to create databases for this user
292 284
     run_system_query_postgresql "ALTER USER pleroma NOSUPERUSER;"
@@ -886,7 +878,7 @@ function install_pleroma {
886 878
 
887 879
     # We need to set up the url option again because it somehow gets
888 880
     # lost during mix compile
889
-    pleroma_secret=$PLEROMA_DIR/config/prod.secret.exs
881
+    pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
890 882
     if ! grep -q 'watchers: [],' $pleroma_secret; then
891 883
         sed -i 's|watchers: []|watchers: [],|g' $pleroma_secret
892 884
     fi
@@ -907,7 +899,6 @@ function install_pleroma {
907 899
     echo 'User=pleroma' >> /etc/systemd/system/pleroma.service
908 900
     echo "WorkingDirectory=$PLEROMA_DIR" >> /etc/systemd/system/pleroma.service
909 901
     echo "Environment=\"HOME=$PLEROMA_DIR\"" >> /etc/systemd/system/pleroma.service
910
-    echo "Environment=\"MIX_ENV=prod\"" >> /etc/systemd/system/pleroma.service
911 902
     echo 'ExecStart=/usr/local/bin/mix phx.server' >> /etc/systemd/system/pleroma.service
912 903
     echo 'ExecReload=/bin/kill $MAINPID' >> /etc/systemd/system/pleroma.service
913 904
     echo 'KillMode=process' >> /etc/systemd/system/pleroma.service