Merge https://github.com/redmatrix/hubzilla into pending_merge

1 files changed, 10 insertions, 3 deletions

diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy
index 1dca4a5e8..06a2440a0 100755
--- a/.openshift/action_hooks/deploy
+++ b/.openshift/action_hooks/deploy
@@ -179,8 +179,10 @@ 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"
+echo "Changing default configuration to conserve space and autocreate a social private channel upon account registration"
 cd ${OPENSHIFT_REPO_DIR}
+util/config system default_permissions_role social_private
+util/config system workflow_channel_next channel
 util/config system expire_delivery_reports 3
 util/config system feed_contacts 0
 util/config system diaspora_enabled 0
@@ -197,7 +199,7 @@ util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAdd
 # 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 
+util/add_theme_repo https://github.com/DeadSuperHero/hubzilla-themes.git DeadSuperHeroThemes 
 
 # Hubzilla ownMapp
 echo "Try to add or update Hubzilla ownMapp"
@@ -205,6 +207,11 @@ cd ${OPENSHIFT_REPO_DIR}
 util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp
 
 # Hubzilla Chess
-echo "Try to add or update Hubzilla chess to Hubzilla on OpenShift"
+echo "Try to add or update Hubzilla chess "
 cd ${OPENSHIFT_REPO_DIR}
 util/add_addon_repo https://gitlab.com/zot/hubzilla-chess.git Chess
+
+# Hubzilla Hubsites
+echo "Try to add or update Hubzilla Hubsites"
+cd ${OPENSHIFT_REPO_DIR}
+util/add_addon_repo https://gitlab.com/zot/hubsites.git Hubsites