diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-25 16:54:43 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-25 16:54:43 -0700 |
| commit | 7063b6cb6d36da2edd307237d6b69b7c2e6efdad (patch) | |
| tree | 51a8ec5593c478f17a59840bfa5d2f289f6b1774 | |
| parent | 917d0ced4a1f0890172b90a9551131fa43bea78b (diff) | |
| parent | 969418ce73e0a8dcba037390e24d8715e227b2cc (diff) | |
| download | volse-hubzilla-7063b6cb6d36da2edd307237d6b69b7c2e6efdad.tar.gz volse-hubzilla-7063b6cb6d36da2edd307237d6b69b7c2e6efdad.tar.bz2 volse-hubzilla-7063b6cb6d36da2edd307237d6b69b7c2e6efdad.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
| -rwxr-xr-x | .openshift/action_hooks/deploy | 11 | ||||
| -rw-r--r-- | doc/Hubzilla_on_OpenShift.bb | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index dafde2d69..9e3413f98 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -179,7 +179,18 @@ echo "chmod done, permissions set to 777 on poller script." # Hubzilla configuration - changes to default settings # to make Hubzilla on OpenShift a more pleasant experience +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 disable_discover_tab 1 + +# Hubzill addons +echo "Try to add or update Hubzilla addons" +cd ${OPENSHIFT_REPO_DIR} +util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAddons + +# Hubzilla themes +echo "Try to add or update Hubzilla themes" +cd ${OPENSHIFT_REPO_DIR} +util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes diff --git a/doc/Hubzilla_on_OpenShift.bb b/doc/Hubzilla_on_OpenShift.bb index f33eee98c..db61c3a48 100644 --- a/doc/Hubzilla_on_OpenShift.bb +++ b/doc/Hubzilla_on_OpenShift.bb @@ -1,5 +1,5 @@ [b]Hubzilla on OpenShift[/b] -You will notice a new .openshift folder when you fetch from upstream, i.e. from [url=https://github.com/redmatrix/hubzilla.git]https://github.com/redmatrix/hubzilla.git[/url] , which contains a deploy script to set up Hubzilla on OpenShift. +You will notice a new .openshift folder when you fetch from upstream, i.e. from [url=https://github.com/redmatrix/hubzilla.git]https://github.com/redmatrix/hubzilla.git[/url] , which contains a deploy script to set up Hubzilla on OpenShift with plugins and extra themes. Create an account on OpenShift, then use the registration e-mail and password to create your first Hubzilla instance. Install git and RedHat's command line tools - rhc - if you have not already done so. |