diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-26 10:42:36 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-26 10:42:36 +0300 |
| commit | c8d3c3bfeca66d16846f97b50328e0718cfe5fef (patch) | |
| tree | cfe7074c79f6117443632af5f13fd33672f90732 /rel | |
| parent | cad9b325e567c9c607c2b1d33c915cc88da716b1 (diff) | |
| parent | dc9090810dbed74da91f2e94f23e5512d259e4fc (diff) | |
| download | pleroma-c8d3c3bfeca66d16846f97b50328e0718cfe5fef.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
Diffstat (limited to 'rel')
| -rw-r--r-- | rel/env.sh.eex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rel/env.sh.eex b/rel/env.sh.eex index a4ce25295..e1b87102d 100644 --- a/rel/env.sh.eex +++ b/rel/env.sh.eex @@ -8,5 +8,5 @@ # fi # Set the release to work across nodes -export RELEASE_DISTRIBUTION=name -export RELEASE_NODE=<%= @release.name %>@127.0.0.1 +export RELEASE_DISTRIBUTION="${RELEASE_DISTRIBUTION:-name}" +export RELEASE_NODE="${RELEASE_NODE:-<%= @release.name %>@127.0.0.1}" |