Skip to content
Snippets Groups Projects
Commit c15f1c3a authored by benedikt.kroening's avatar benedikt.kroening
Browse files

Merge branch 'codecept' into 7.10.3

parents 8d328cfa a0752ff7
No related branches found
No related tags found
2 merge requests!7Issue16 7102,!1Codecept
Hide whitespace changes
Inline Side-by-side
config/dovecot/etc/dovecot/conf.d/10-mail.conf
+ 1
− 1
View file @ c15f1c3a
mail_vsize_bg_after_count = 100
#mail_vsize_bg_after_count = 100
mailbox_list_index = yes
mail_always_cache_fields = body.snippet
mail_location = maildir:~/Maildir
......
features/codecept.sh
+ 73
− 18
View file @ c15f1c3a
......@@ -92,20 +92,71 @@ set -- "${POSITIONAL[@]}" # restore positional parameters
if [[ "${FEATURE_ENABLE}" = true ]]; then
echo "Install Docker !" # TODO
curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/debian \
$(lsb_release -cs) \
stable"
apt-get update && apt-get install docker-ce
echo "Install dep" # DEBIAN ONLY ! TODO
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
curl -sL https://deb.nodesource.com/setup_12.x | bash -
apt-get update && \
apt-get install -y git nodejs yarn nmap default-jre jq
# curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
# add-apt-repository \
# "deb [arch=amd64] https://download.docker.com/linux/debian \
# $(lsb_release -cs) \
# stable"
# apt-get update && apt-get install docker-ce
# curl -fsSL https://get.docker.com -o get-docker.sh
# sh get-docker.sh
if [[ true == "${ANY_DEB}" ]]; then
# Adding dovecot key
apt-key adv --fetch-keys https://download.docker.com/linux/debian/gpg
{
echo "deb https://download.docker.com/linux/debian ${DIST_VERSION} stable"
} > /etc/apt/sources.list.d/docker.list
elif [[ true == "${ANY_SLES}" ]]; then
echo ""
echo "ERROR: dovecot setup on sles not yet implemented"
echo ""
sleep 10
exit 1
elif [[ true == "${ANY_RHEL}" ]] || [[ true == "${ANY_CENTOS}" ]]; then
echo ""
echo "ERROR: dovecot setup on rhel/centos not yet implemented"
echo ""
sleep 10
exit 1
fi
installPackages "docker-ce"
echo "Install Nodejs"
curl -sL https://deb.nodesource.com/setup_13.x -o nodesource_setup.sh
bash nodesource_setup.sh
installPackages
echo "Install dependency...." # DEBIAN ONLY ! TODO
if [[ true == "${ANY_DEB}" ]]; then
# Adding yarnpkg key
apt-key adv --fetch-keys https://dl.yarnpkg.com/debian/pubkey.gpg
{
echo "deb https://dl.yarnpkg.com/debian/ stable main"
} > /etc/apt/sources.list.d/yarnpkg.list
# Adding nodejs key
apt-key adv --fetch-keys https://deb.nodesource.com/gpgkey/nodesource.gpg.key
{
echo "deb https://deb.nodesource.com/node_13.x ${DIST_VERSION} main"
} > /etc/apt/sources.list.d/nodesource.list
elif [[ true == "${ANY_SLES}" ]]; then
echo ""
echo "ERROR: dovecot setup on sles not yet implemented"
echo ""
sleep 10
exit 1
elif [[ true == "${ANY_RHEL}" ]] || [[ true == "${ANY_CENTOS}" ]]; then
echo ""
echo "ERROR: dovecot setup on rhel/centos not yet implemented"
echo ""
sleep 10
exit 1
fi
installPackages "git nodejs yarn nmap default-jre jq"
echo "Clone Repo"
......@@ -114,12 +165,16 @@ git clone --depth 1 -b master https://gitlab.open-xchange.com/frontend/core /op
cd /opt/open-xchange/tests/frontend/ui
npm install -g allure-commandline --save-dev
setOXProperty PROVISIONING_URL "http://192.168.33.211/" /opt/open-xchange/tests/frontend/ui/.env
if [ -z ${CC_IP} ];then
CC_IP=$(ip a show $(ip r | grep -oP 'default .* \K.+') | grep -oP 'inet \K[\d\.]+') # DEBIAN Only.... -.-
fi
setOXProperty PROVISIONING_URL "http://${CC_IP}/" /opt/open-xchange/tests/frontend/ui/.env
setOXProperty CONTEXT_ID "1337" /opt/open-xchange/tests/frontend/ui/.env
setOXProperty SELENIUM_HOST "localhost" /opt/open-xchange/tests/frontend/ui/.env
setOXProperty LAUNCH_URL "http://192.168.33.211/appsuite/" /opt/open-xchange/tests/frontend/ui/.env
setOXProperty SMTP_SERVER "192.168.33.211" /opt/open-xchange/tests/frontend/ui/.env
setOXProperty IMAP_SERVER "192.168.33.211" /opt/open-xchange/tests/frontend/ui/.env
setOXProperty LAUNCH_URL "http://${CC_IP}/appsuite/" /opt/open-xchange/tests/frontend/ui/.env
setOXProperty SMTP_SERVER "${CC_IP}" /opt/open-xchange/tests/frontend/ui/.env
setOXProperty IMAP_SERVER "${CC_IP}" /opt/open-xchange/tests/frontend/ui/.env
yarn
[ ! "$(docker ps -a | grep "hA4uYS")" ] && docker run --name "hA4uYS" -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome-debug:latest
......
features/dovecot.sh
+ 34
− 5
View file @ c15f1c3a
#!/bin/bash
#
# Copyright (C) 2019 OX Software GmbH
......@@ -95,7 +94,36 @@ done
set -- "${POSITIONAL[@]}" # restore positional parameters
if [[ "${FEATURE_INSTALL}" = true ]]; then
installDovecot
if [[ -z "${DC_VERSION}" ]]; then
echo "Version not specified, set to latest"
DC_VERSION=2.3-latest
fi
if [[ true == "${ANY_DEB}" ]]; then
# Adding dovecot key
apt-key adv --fetch-keys https://repo.dovecot.org/DOVECOT-REPO-GPG
{
echo "deb https://repo.dovecot.org/ce-${DC_VERSION}/debian/${DIST_VERSION} ${DIST_VERSION} main"
} > /etc/apt/sources.list.d/dovecot.list
elif [[ true == "${ANY_SLES}" ]]; then
echo ""
echo "ERROR: dovecot setup on sles not yet implemented"
echo ""
sleep 10
exit 1
elif [[ true == "${ANY_RHEL}" ]] || [[ true == "${ANY_CENTOS}" ]]; then
echo ""
echo "ERROR: dovecot setup on rhel/centos not yet implemented"
echo ""
sleep 10
exit 1
fi
installPackages "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/
restartService dovecot
INIT_STATE_FILE="/etc/dovecot/dovecot-init-done"
if [ ! -f "/etc/dovecot/dovecot.conf" ]; then
......@@ -106,6 +134,7 @@ fi
if [ ! -f ${INIT_STATE_FILE} ]; then
mkdir /var/log/dovecot
echo "Executing init-config script (dovecot-backend) "
echo "$0 $@"
echo "Creating user and group: vmail"
......@@ -148,7 +177,7 @@ if [ ! -f ${INIT_STATE_FILE} ]; then
#postconf -e "smtpd_tls_cert_file=${SSL_DIR}/certs/${FQDN}.crt"
#postconf -e "smtpd_tls_key_file=${SSL_DIR}/private/${FQDN}.key"
postconf -e "dovecot_destination_recipient_limit = 1"
postconf -e "virtual_mailbox_domains = ${MAIL_DOMAIN}"
postconf -e "virtual_mailbox_domains = $(hostname -f)"
postconf -e "virtual_transport = dovecot"
postconf -e "myorigin = \$mydomain"
postconf -e "mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 ${ENV_SUBNET}"
......@@ -156,7 +185,7 @@ if [ ! -f ${INIT_STATE_FILE} ]; then
chown -R vmail:vmail /home/vmail
chmod 2770 /home/vmail
fi
elif [[ "${FEATURE_ENABLE}" = true ]]; then
elif [[ "${FEATURE_ENABLE}" = false ]]; then
INPUT=${SCRIPT_DIR}/../config/environment/qa/users.csv
OLDIFS=$IFS
IFS=','
......@@ -172,7 +201,7 @@ elif [[ "${FEATURE_ENABLE}" = true ]]; then
# echo "password : $password"
done < $INPUT
IFS=$OLDIFS
elif [[ "${FEATURE_ENABLE}" = false ]]; then
elif [[ "${FEATURE_ENABLE}" = true ]]; then
INPUT=${SCRIPT_DIR}/../config/environment/qa/users.csv
OLDIFS=$IFS
IFS=','
......
lib/dovecot.bash
+ 2
− 1
View file @ c15f1c3a
......@@ -43,4 +43,5 @@ function installDovecot {
echo "Copy Dovecot Configs"
rm -rf /etc/dovecot/*
cp -R config/dovecot/etc/dovecot/* /etc/dovecot/
}
\ No newline at end of file
}
ox-installer.sh
+ 18
− 1
View file @ c15f1c3a
......@@ -131,6 +131,10 @@ case $key in
export INSTALL_TYPE=singlenode
shift
;;
--codecept)
export EXECUTE_CODECEPT=true
shift
;;
--config)
export CONFIG_DIR="$2"
exportProperties ${CONFIG_DIR}
......@@ -225,7 +229,15 @@ if [ "$INSTALL_GUARD" = true ] ; then
fi
if [ "$INSTALL_DOVECOT" = true ] ; then
setup/install-dovecot.sh -s
if [[ "${INSTALL_TYPE}" == *"singlenode"* ]]; then
# ensure that all components will be "force" installed if on any singlenode
echo "Installing documents for singlenode environment ..."
features/dovecot.sh --install --enable
else
# let the environment variables do the selection magic
echo "Docker/Dovecot install is currently not supported by ox-installer...."
exit 1
fi
fi
if [ "${OX_INIT}" = true ]; then
......@@ -248,6 +260,11 @@ if [ "${OX_INIT}" = true ]; then
fi
fi
if [ "${EXECUTE_CODECEPT}" = true ] ; then
echo "Init Codecept...."
features/codecept.sh --enable
fi
FINISHED_AT=$(date)
echo "====================================================================================="
echo "Started at: $STARTED_AT"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment