aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-26 09:40:54 +1100
committerredmatrix <redmatrix@redmatrix.me>2015-10-26 09:40:54 +1100
commit969418ce73e0a8dcba037390e24d8715e227b2cc (patch)
tree8222c9adb495033561164f6891b45beb13d0ab21
parent7f3df847a2ba1e836c930f89a681e1589131f557 (diff)
parent969b66b3152b779590e41ce8f3eff18a1279c5e5 (diff)
downloadvolse-hubzilla-969418ce73e0a8dcba037390e24d8715e227b2cc.tar.gz
volse-hubzilla-969418ce73e0a8dcba037390e24d8715e227b2cc.tar.bz2
volse-hubzilla-969418ce73e0a8dcba037390e24d8715e227b2cc.zip
Merge pull request #99 from HaakonME/master
Hubzilla on OpenShift - now with plugins and extra themes
-rwxr-xr-x.openshift/action_hooks/deploy11
-rw-r--r--doc/Hubzilla_on_OpenShift.bb2
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.