diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-20 21:25:34 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-20 21:25:34 +0000 |
| commit | 2437f5128407bbcdfc152ea3f008d7eecc1728f2 (patch) | |
| tree | b96de5712ecf8ac6f376b9ac3f70bfdf4df243d2 /rel/files/bin | |
| parent | 3b48876cf02b35af953bf463987e42675a9e6180 (diff) | |
| parent | e3e8a7dc0e0f3d3abde90c93a0650e7188d13b12 (diff) | |
| download | pleroma-2437f5128407bbcdfc152ea3f008d7eecc1728f2.tar.gz pleroma-2437f5128407bbcdfc152ea3f008d7eecc1728f2.zip | |
Merge branch 'fix/config-gen-releases' into 'develop'
Refactor mix tasks a bit and make config generator work with releases
See merge request pleroma/pleroma!1312
Diffstat (limited to 'rel/files/bin')
| -rwxr-xr-x | rel/files/bin/pleroma_ctl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl index 62368115e..b0e1874a9 100755 --- a/rel/files/bin/pleroma_ctl +++ b/rel/files/bin/pleroma_ctl @@ -110,7 +110,7 @@ else if [ "$1" = "update" ]; then update "$2" - elif [ "$1" = "migrate" ] || [ "$1" = "rollback" ] || [ "$1" = "create" ] || [ -n "$PLEROMA_CTL_RPC_DISABLED" ]; then + elif [ "$1" = "migrate" ] || [ "$1" = "rollback" ] || [ "$1" = "create" ] || [ "$1 $2" = "instance gen" ] || [ -n "$PLEROMA_CTL_RPC_DISABLED" ]; then "$SCRIPTPATH"/pleroma eval 'Pleroma.ReleaseTasks.run("'"$*"'")' else "$SCRIPTPATH"/pleroma rpc 'Pleroma.ReleaseTasks.run("'"$*"'")' |