diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-02 17:07:58 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-02 17:07:58 -0800 |
| commit | 543bf51effab44ad74a3a85954ba5b61db924f78 (patch) | |
| tree | c97552e9a4dff40522abea6c6e96bdf9a1c3a262 | |
| parent | 5513feb15bcacdfe4d80aee2b8393a1f4b7df0cb (diff) | |
| parent | e03faaeb8f7798803a54a8905c1d27b801640466 (diff) | |
| download | volse-hubzilla-543bf51effab44ad74a3a85954ba5b61db924f78.tar.gz volse-hubzilla-543bf51effab44ad74a3a85954ba5b61db924f78.tar.bz2 volse-hubzilla-543bf51effab44ad74a3a85954ba5b61db924f78.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
| -rwxr-xr-x | .openshift/action_hooks/deploy | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index 9e3413f98..7b4c9f477 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -183,7 +183,12 @@ echo "Changing default configuration to conserve space" cd ${OPENSHIFT_REPO_DIR} util/config system expire_delivery_reports 3 util/config system feed_contacts 0 +util/config system diaspora_enabled 0 util/config system disable_discover_tab 1 +util/config system directory_server https://blablanet.com +util/config directory safemode 0 +util/config directory globaldir 1 +util/config directory pubforums 0 # Hubzill addons echo "Try to add or update Hubzilla addons" |