From d7dce0f0f3be882e0bd7055ff4233a1b1f1a0400 Mon Sep 17 00:00:00 2001
From: Benedikt Kroening <benedikt.kroening@open-xchange.com>
Date: Mon, 5 Aug 2019 10:59:01 +0200
Subject: [PATCH] Fixed some copy-paste issues with create-context script

---
 config/create-context.sh | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/config/create-context.sh b/config/create-context.sh
index 52d5a35..5211a4a 100755
--- a/config/create-context.sh
+++ b/config/create-context.sh
@@ -1,22 +1,23 @@
-#!/bin/bash
+#! /bin/bash
+# Setup a context
 #
-# Copyright (C) 2019 OX Software GmbH
+# Copyright (C) 2016 OX Software GmbH
 # 
-# This file is part of OX Automation.
+# This file is part of OX Installer Collection.
 #
-# OX Automation is free software: you can redistribute it and/or modify
+# OX Installer Collection is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# OX Automation is distributed in the hope that it will be useful,
+# OX Installer Collection is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # 
 # See the GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with OX Automation. If not, see <http://www.gnu.org/licenses/>.
+# along with OX Installer Collection. If not, see <http://www.gnu.org/licenses/>.
 #
 # Authors:
 # Martin Heiland <martin.heiland@open-xchange.com>
@@ -87,9 +88,8 @@ else
         "${AS_BIN}"/deletecontext -c "$CTX_ID" -A oxadminmaster -P "${AS_ADMINMASTER_PASS}" 2>/dev/null
     fi
 
-    
     "${AS_BIN}"/createcontext -A oxadminmaster -P "${AS_ADMINMASTER_PASS}" -c "$CTX_ID" -u oxadmin -d "Context Admin" -g Admin -s User -p "${AS_ADMIN_PASS}" -L "${LOGIN_DOMAIN}" -e oxadmin@"${MAIL_DOMAIN}" -q 1024 --access-combination-name="${ACN}"
-    
+
     if [[ $? != 0 ]]; then
         echo "Context could not be created, aborting."
         exit 1
@@ -100,7 +100,6 @@ ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u mheiland -
 ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u mwagner -d "Markus Wagner" -g Markus -s Wagner -p secret -e mwagner@"${MAIL_DOMAIN}" --imaplogin mwagner --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
 ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u bkroening -d "Benedikt Kröning" -g Benedikt -s Kröning -p secret -e bkroening@"${MAIL_DOMAIN}" --imaplogin bkroening --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
 ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u tthamm -d "Tobias Thamm" -g Tobias -s Thamm -p secret -e tthamm@"${MAIL_DOMAIN}" --imaplogin tthamm --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
-${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u ntsapanidis -d "Nikolaos Tsapanidis" -g Nikolaos -s Tsapanidis -p secret -e ntsapanidis@"${MAIL_DOMAIN}" --imaplogin ntsapanidis --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
 ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u ofelka -d "Olaf Felka" -g Olaf -s Felka -p secret -e ofelka@"${MAIL_DOMAIN}" --imaplogin ofelka --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
 ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u mhenschel -d "Maike Henschel" -g Maike -s Henschel -p secret -e mhenschel@"${MAIL_DOMAIN}" --imaplogin mhenschel --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
 ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u pschumacher -d "Philipp Schumacher" -g Philipp -s Schumacher -p secret -e pschumacher@"${MAIL_DOMAIN}" --imaplogin pschumacher --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
@@ -110,23 +109,18 @@ ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u jlaatsch -
 ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u jswitalski -d "Jarek Switalski" -g Jarek -s Switalski -p secret -e jswitalski@"${MAIL_DOMAIN}" --imaplogin jswitalski --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
 ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u dpondruff -d "Daniel Pondruff" -g Daniel -s Pondruff -p secret -e dpondruff@"${MAIL_DOMAIN}" --imaplogin dpondruff --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
 ${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u hnambalirwa -d "Harriet Nambalirwa" -g Harriet -s Nambalirwa -p secret -e hnambalirwa@"${MAIL_DOMAIN}" --imaplogin hnambalirwa --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
-${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u greg -d "Greg Hill" -g Greg -s Hill -p secret -e greg@"${MAIL_DOMAIN}" --imaplogin greg --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
-${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u mdrnovsek -d "Matthias Drnovsek" -g Matthias -s Drnovsek -p secret -e mdrnovsek@"${MAIL_DOMAIN}" --imaplogin mdrnovsek --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
+${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u kahrens -d "Kai Ahrens" -g Kai -s Ahrens -p secret -e kahrens@"${MAIL_DOMAIN}" --imaplogin kahrens --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
+${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u abunkowski -d "Andreas Bunkowski" -g Andreas -s Bunkowski -p secret -e abunkowski@"${MAIL_DOMAIN}" --imaplogin abunkowski --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
+${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u mkoch -d "Michael Koch" -g Michael -s Koch -p secret -e mkoch@"${MAIL_DOMAIN}" --imaplogin mkoch --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
+${AS_BIN}/createuser -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -u sdoerr -d "Sonja Dörr" -g Sonja -s Dörr -p secret -e sdoerr@"${MAIL_DOMAIN}" --imaplogin sdoerr --imapserver "${MAIL_SERVER}" --smtpserver "${MAIL_SERVER}"
+
 
 ${AS_BIN}/creategroup -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -d "Test Group 01" -n test_group_01 -a 3,4,5
 ${AS_BIN}/creategroup -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -d "My Users" -n my_users -a 3,4
 ${AS_BIN}/createresource -c "$CTX_ID" -A oxadmin -P "${AS_ADMIN_PASS}" -d "Resource 01" -n resource_01 -e resource_01@"${MAIL_DOMAIN}"
 ${AS_BIN}/changecontext -c "$CTX_ID" -A oxadminmaster -P "${AS_ADMINMASTER_PASS}" --access-combination-name="${ACN}"
 if [[ "${EXTRAS}" == true ]]; then
-    if [[ true == "${HAS_USERFEEDBACK}" ]]; then
-        CAPABILITIES="${CAPABILITIES},feedback"
-    fi
-    if [[ -n "${AS_REPO_DEALS}" ]]; then
-        CAPABILITIES="${CAPABILITIES},deals-user,deals-admin"
-    fi
-    if [[ -n "${AS_REPO_MESSENGER}" ]]; then
-        CAPABILITIES="${CAPABILITIES},messenger,messenger-phone,messenger-group,messenger-call,messenger-group-call,messenger-guestmode,messenger-screensharing,messenger-conference"
-    fi
+    CAPABILITIES="${CAPABILITIES},feedback"
     if [[ -n "${AS_REPO_GUARD}" ]]; then
         CAPABILITIES="${CAPABILITIES},guard"
     fi
@@ -135,5 +129,3 @@ fi
 if [[ "${VIRTUAL_ATTACHMENTS}" == true ]]; then
     ${AS_BIN}/changecontext -c "$CTX_ID" -A oxadminmaster -P "${AS_ADMINMASTER_PASS}" --config/com.openexchange.file.storage.mail.enabled=true
 fi
--config/com.openexchange.file.storage.mail.enabled=true
-fi
-- 
GitLab