Merge remote-tracking branch 'origin/master'

docs/admin/management.rst

@@ -270,7 +270,7 @@ setupgroups
 Configures default groups and (if called with ``--move``) assigns all users
 to default group.
 
-The option ``--no-update`` disables update of existing groups (only adds
+The option ``--no-privs-update`` disables update of existing groups (only adds
 new ones).
 
 .. seealso:: :ref:`privileges`
@@ -306,5 +306,3 @@ Fetches remote VCS repositories and updates internal cache.
 
 You can either define which project or component to update (eg.
 ``weblate/master``) or use ``--all`` to update all existing components.
-
-

openshift/install.sh

@@ -81,7 +81,11 @@ fi
 
 sh "python ${OPENSHIFT_REPO_DIR}/openshift/manage.py migrate --noinput"
 
-sh "python ${OPENSHIFT_REPO_DIR}/openshift/manage.py setupgroups --move"
+if [ ! -s $OPENSHIFT_DATA_DIR/.credentials ]; then
+  sh "python ${OPENSHIFT_REPO_DIR}/openshift/manage.py setupgroups --move"
+else
+  sh "python ${OPENSHIFT_REPO_DIR}/openshift/manage.py setupgroups --no-privs-update"
+fi
 
 sh "python ${OPENSHIFT_REPO_DIR}/openshift/manage.py setuplang"