Skip to content
Snippets Groups Projects
Commit 30af6b69 authored by Bob Mottram's avatar Bob Mottram
Browse files

pleroma_secret config file defined in one place

parent 3420e71e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/freedombone-app-pleroma
+ 1
− 2
View file @ 30af6b69
...@@ -42,6 +42,7 @@ PLEROMA_COMMIT='303289d7daac3a51f991bb8603f36628a5d944c1' ...@@ -42,6 +42,7 @@ PLEROMA_COMMIT='303289d7daac3a51f991bb8603f36628a5d944c1'
PLEROMA_ADMIN_PASSWORD= PLEROMA_ADMIN_PASSWORD=
PLEROMA_DIR=/etc/pleroma PLEROMA_DIR=/etc/pleroma
PLEROMA_SECRET_KEY="" PLEROMA_SECRET_KEY=""
pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
PLEROMA_BACKGROUND_IMAGE_URL= PLEROMA_BACKGROUND_IMAGE_URL=
...@@ -406,7 +407,6 @@ function pleroma_create_database { ...@@ -406,7 +407,6 @@ function pleroma_create_database {
echo $"Missing directory $PLEROMA_DIR/config" echo $"Missing directory $PLEROMA_DIR/config"
exit 7835393 exit 7835393
fi fi
pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
if [ ! -f $PLEROMA_DIR/config/dev.exs ]; then if [ ! -f $PLEROMA_DIR/config/dev.exs ]; then
echo $"Did not find $PLEROMA_DIR/config/dev.exs" echo $"Did not find $PLEROMA_DIR/config/dev.exs"
exit 78923528 exit 78923528
...@@ -1186,7 +1186,6 @@ function install_pleroma { ...@@ -1186,7 +1186,6 @@ function install_pleroma {
# We need to set up the url option again because it somehow gets # We need to set up the url option again because it somehow gets
# lost during mix compile # lost during mix compile
pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
if ! grep -q 'watchers: [],' $pleroma_secret; then if ! grep -q 'watchers: [],' $pleroma_secret; then
sed -i 's|watchers: \[\]|watchers: \[\],|g' $pleroma_secret sed -i 's|watchers: \[\]|watchers: \[\],|g' $pleroma_secret
fi fi
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment