From 389a661c3793a332fe3073d5afe5433c46a249e2 Mon Sep 17 00:00:00 2001
From: Benedikt Kroening <benedikt.kroening@open-xchange.com>
Date: Mon, 27 Jan 2020 14:54:49 +0100
Subject: [PATCH] Removed slipped in files, small fixes to dovecot.sh
---
features/.codecept.sh.swp | Bin 1024 -> 0 bytes
features/dovecot.sh | 13 ++++-------
lib/dovecot.bash | 47 --------------------------------------
3 files changed, 5 insertions(+), 55 deletions(-)
delete mode 100644 features/.codecept.sh.swp
delete mode 100644 lib/dovecot.bash
diff --git a/features/.codecept.sh.swp b/features/.codecept.sh.swp
deleted file mode 100644
index e9b90ab086e730c58a966dd8a04dbedd1f3ae7bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1024
zcmYc?$V<%2S1{5u*E3;20-FLD7>e@qOOS+cGK*4kQWJ|)b<J_AfJo?r4AjrB(9O&%
vE=kPENiEV(OHC{(ElMrcPtH$CO-?N+(JRg%V9KcUXb6mk0GS~Wimnd;89Nxs
diff --git a/features/dovecot.sh b/features/dovecot.sh
index 9c9997c..b5fe28f 100755
--- a/features/dovecot.sh
+++ b/features/dovecot.sh
@@ -28,7 +28,6 @@ SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P)"
# sourcing some commonly used functions and executing basic checks
source ${SCRIPT_DIR}/../lib/common.bash
source ${SCRIPT_DIR}/../lib/setup.bash
-source ${SCRIPT_DIR}/../lib/dovecot.bash
checkRootPrivileges
detectDistribution
@@ -81,10 +80,6 @@ case $key in
shift
shift
;;
- --restart)
- RESTART_OX=true
- shift
- ;;
*) # unknown option
POSITIONAL+=("$1") # save it in an array for later
shift
@@ -184,6 +179,10 @@ if [ ! -f ${INIT_STATE_FILE} ]; then
# set home permissions every time ...
chown -R vmail:vmail /home/vmail
chmod 2770 /home/vmail
+
+ restartService postfix
+ restartService dovecot
+
fi
elif [[ "${FEATURE_ENABLE}" = false ]]; then
INPUT=${SCRIPT_DIR}/../config/environment/qa/users.csv
@@ -218,7 +217,5 @@ elif [[ "${FEATURE_ENABLE}" = true ]]; then
done < $INPUT
IFS=$OLDIFS
fi
-if [[ "${RESTART_OX}" = true ]]; then
- restartService dovecot
-fi
+
diff --git a/lib/dovecot.bash b/lib/dovecot.bash
deleted file mode 100644
index 5f06120..0000000
--- a/lib/dovecot.bash
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#
-# Copyright (C) 2019 OX Software GmbH
-#
-# This file is part of OX Automation.
-#
-# OX Automation 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,
-# 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/>.
-#
-#
-# Authors:
-# Daniel Pondruff <daniel.pondruff@open-xchange.com>
-#
-
-# This restarts the provided service name with the configured service managers
-
-function installDovecot {
- echo "Add Dovecot Build key & Repo"
- wget https://repo.dovecot.org/DOVECOT-REPO-GPG && apt-key add DOVECOT-REPO-GPG && \
- echo "deb https://repo.dovecot.org/ce-2.3-latest/debian/stretch stretch main" > /etc/apt/sources.list.d/dovecot.list
-
- echo "Install Dovecot CE packages"
- apt-get update && apt-get install -y dovecot-core \
- dovecot-imapd \
- dovecot-lmtpd \
- dovecot-managesieved \
- dovecot-sieve \
- dovecot-pop3d \
- dovecot-ldap \
- postfix \
- rsyslog
- echo "Copy Dovecot Configs"
- rm -rf /etc/dovecot/*
- cp -R config/dovecot/etc/dovecot/* /etc/dovecot/
-}
-
--
GitLab