diff options
| -rw-r--r-- | config/releases.exs | 3 | ||||
| -rwxr-xr-x | rel/pleroma_ctl | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config/releases.exs b/config/releases.exs index f8494dd34..98c5ceccd 100644 --- a/config/releases.exs +++ b/config/releases.exs @@ -1,5 +1,8 @@ import Config +config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" +config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" + config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs" if File.exists?(config_path) do diff --git a/rel/pleroma_ctl b/rel/pleroma_ctl index ef2717c44..2e709a8a6 100755 --- a/rel/pleroma_ctl +++ b/rel/pleroma_ctl @@ -1,6 +1,6 @@ #!/bin/sh # XXX: This should be removed when elixir's releases get custom command support -if [ -z "$1" ] || [ "$1" == "help" ]; then +if [ -z "$1" ] || [ "$1" = "help" ]; then echo "Usage: $(basename "$0") COMMAND [ARGS] The known commands are: @@ -15,5 +15,5 @@ if [ -z "$1" ] || [ "$1" == "help" ]; then else SCRIPT=$(readlink -f "$0") SCRIPTPATH=$(dirname "$SCRIPT") - $SCRIPTPATH/pleroma eval 'Pleroma.ReleaseTasks.run("'"$*"'")' + "$SCRIPTPATH"/pleroma eval 'Pleroma.ReleaseTasks.run("'"$*"'")' fi |