From 8ca4fb37843aef29f613b3af7817a7a2353c7ded Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Sun, 3 Jan 2016 14:13:29 +0100 Subject: Add Hubzilla Chess repo to deploy script --- .openshift/action_hooks/deploy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index 77f5bd999..5b4fc4864 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -205,6 +205,6 @@ 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" +echo "Try to add or update Hubzilla chess " cd ${OPENSHIFT_REPO_DIR} util/add_addon_repo https://gitlab.com/zot/hubzilla-chess.git Chess -- cgit v1.2.3 From 86dd4e7ee03c5c95eed9830c81aafdd0346d71f3 Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Mon, 4 Jan 2016 06:41:25 +0100 Subject: Fixed deploy --- .openshift/action_hooks/deploy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index b99200b07..5b4fc4864 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -205,10 +205,6 @@ cd ${OPENSHIFT_REPO_DIR} util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp # Hubzilla Chess -<<<<<<< HEAD echo "Try to add or update Hubzilla chess " -======= -echo "Try to add or update Hubzilla chess to Hubzilla on OpenShift" ->>>>>>> upstream/master cd ${OPENSHIFT_REPO_DIR} util/add_addon_repo https://gitlab.com/zot/hubzilla-chess.git Chess -- cgit v1.2.3 From 5d24f62b95b5ac47e490c1859cc1eeb806be594d Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Mon, 18 Jan 2016 19:19:16 +0100 Subject: Add Hubzilla Hubsites plugin to deploy script, change git for DeadSuperHero Hubzilla themes --- .openshift/action_hooks/deploy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index 5b4fc4864..fb5f5d170 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -197,7 +197,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" @@ -208,3 +208,8 @@ util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp 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 -- cgit v1.2.3 From 86598705efd5e23ab9803736a24d70836d46bf42 Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Mon, 18 Jan 2016 19:47:06 +0100 Subject: Add default_permissions_role social_private to autocreate a social private channel upon account registration --- .openshift/action_hooks/deploy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index fb5f5d170..3ed026299 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -179,8 +179,9 @@ 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 expire_delivery_reports 3 util/config system feed_contacts 0 util/config system diaspora_enabled 0 -- cgit v1.2.3 From 2a57f716d30dd62d6801cbdf031459e7ac6925e7 Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Mon, 18 Jan 2016 19:57:00 +0100 Subject: Add config workflow_channel_next and set to channel --- .openshift/action_hooks/deploy | 1 + 1 file changed, 1 insertion(+) diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index 3ed026299..06a2440a0 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -182,6 +182,7 @@ echo "chmod done, permissions set to 777 on poller script." 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 -- cgit v1.2.3