Browse Source

pleroma_secret config file defined in one place

Bob Mottram 7 years ago
parent
commit
30af6b69a7
1 changed files with 1 additions and 2 deletions
  1. 1
    2
      src/freedombone-app-pleroma

+ 1
- 2
src/freedombone-app-pleroma View File

@@ -42,6 +42,7 @@ PLEROMA_COMMIT='303289d7daac3a51f991bb8603f36628a5d944c1'
42 42
 PLEROMA_ADMIN_PASSWORD=
43 43
 PLEROMA_DIR=/etc/pleroma
44 44
 PLEROMA_SECRET_KEY=""
45
+pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
45 46
 
46 47
 PLEROMA_BACKGROUND_IMAGE_URL=
47 48
 
@@ -406,7 +407,6 @@ function pleroma_create_database {
406 407
         echo $"Missing directory $PLEROMA_DIR/config"
407 408
         exit 7835393
408 409
     fi
409
-    pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
410 410
     if [ ! -f $PLEROMA_DIR/config/dev.exs ]; then
411 411
         echo $"Did not find $PLEROMA_DIR/config/dev.exs"
412 412
         exit 78923528
@@ -1186,7 +1186,6 @@ function install_pleroma {
1186 1186
 
1187 1187
     # We need to set up the url option again because it somehow gets
1188 1188
     # lost during mix compile
1189
-    pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
1190 1189
     if ! grep -q 'watchers: [],' $pleroma_secret; then
1191 1190
         sed -i 's|watchers: \[\]|watchers: \[\],|g' $pleroma_secret
1192 1191
     fi