Commit 813795cd authored by kai.ahrens's avatar kai.ahrens
Browse files

dirty patching for Bullseye

parent 927d4632
......@@ -37,5 +37,5 @@ FEATURE_IMAGECONVERTER=true
FEATURE_SPELLCHECK=true
FEATURE_DOCUMENTS=true
FEATURE_DOCUMENTCONVERTER=true
FEATURE_GUARD=true
FEATURE_GUARD=false
FEATURE_WEAKFORCE=true
......@@ -90,7 +90,7 @@ case $key in
shift
;;
--install)
export FEATURE_WEAKFORCE=true
export FEATURE_WEAKFORCE=false
shift
;;
--restart)
......@@ -101,7 +101,7 @@ case $key in
export WFORCE_ENABLE=true
export WFORCE_SERVER=true
export WFORCE_BACKEND_PLUGIN=true
export FEATURE_WEAKFORCE=true
export FEATURE_WEAKFORCE=false
shift
;;
# -k|--key)
......
#
# 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
......@@ -12,7 +12,7 @@
# 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
......@@ -26,7 +26,7 @@
# This restarts the provided service name with the configured service managers
function restartService {
echo "Restarting service $1 ..."
echo "Restarting service $1 ..."
if [[ "${DIST}" == "RHEL7" ]]; then
systemctl restart $1.service
else
......@@ -53,8 +53,8 @@ function startAllServices {
fi
}
function stopService {
echo "Stopping service $1 ..."
echo "Stopping service $1 ..."
if [[ "${DIST}" == "RHEL7" ]]; then
systemctl stop $1.service
else
......@@ -98,7 +98,7 @@ function detectDistribution {
export DISTRO="DebianStretch"
export DISTRO_GENERIC="debian"
export COMPATIBLE=true
elif [[ "${REV}" == "10."* ]]; then
elif [[ "${REV}" == "11."* ]] || [[ "${REV}" == "bullseye/sid" ]]; then
export DIST="DebianBuster"
export DIST_VERSION="buster"
export ANY_DEB=true
......@@ -113,7 +113,7 @@ function detectDistribution {
export HTTPD_TLS_KEY=/etc/ssl/private/ssl-cert-snakeoil.key
export DISTRO="DebianBuster"
export DISTRO_GENERIC="debian"
export COMPATIBLE=true
export COMPATIBLE=true
fi
export DEBIAN_FRONTEND=noninteractive
......@@ -272,9 +272,9 @@ function setOXProperty {
function waitPort {
echo "Waiting for port $2 on host $1 ..."
while ! timeout 1s /bin/bash -c "2>/dev/null >/dev/tcp/$1/$2"; do
sleep 1
while ! timeout 1s /bin/bash -c "2>/dev/null >/dev/tcp/$1/$2"; do
sleep 1
echo ". "
done
......@@ -290,7 +290,7 @@ function exportProperties {
while IFS='=' read -r key value
do
if [[ $key != \#* ]] && [[ -n $key ]] ; then
if [[ $key != \#* ]] && [[ -n $key ]] ; then
export $key=$(eval echo "$value")
fi
......
......@@ -83,7 +83,7 @@ if [[ true == "${ANY_DEB}" ]]; then
echo "Adding adoptopenjdk.jfrog.io build key to apt ..."
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
# add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
PACKAGES="adoptopenjdk-${JAVA_JDK_VERSION}-hotspot"
elif [[ true == "${ANY_RHEL}" ]] || [[ true == "${ANY_CENTOS}" ]]; then
......
......@@ -163,10 +163,10 @@ if [[ "${DATABASE_TYPE}" == "mysql" ]]; then
installPackages "mysql-community-server"
elif [[ "${DATABASE_TYPE}" == "mariadb" ]]; then
echo "Installing mariadb-server packages..."
# echo "Installing mariadb-server packages..."
echo "Using the setup script that is provided by mariadb..."
wget https://downloads.mariadb.com/MariaDB/mariadb_repo_setup -O ${SCRIPT_DIR}/mariadb_repo_setup.sh
# echo "Using the setup script that is provided by mariadb..."
# wget https://downloads.mariadb.com/MariaDB/mariadb_repo_setup -O ${SCRIPT_DIR}/mariadb_repo_setup.sh
chmod +x ${SCRIPT_DIR}/mariadb_repo_setup.sh
if [[ true == "${ANY_DEB}" ]]; then
......@@ -194,9 +194,8 @@ elif [[ "${DATABASE_TYPE}" == "mariadb" ]]; then
echo "Executing prep script ${SCRIPT_DIR}/mariadb_repo_setup.sh ..."
sleep 5
${SCRIPT_DIR}/mariadb_repo_setup.sh --skip-maxscale --mariadb-server-version=mariadb-${DATABASE_VERSION}
installPackagesRetry ${DB_PACKAGE_NAME}
#${SCRIPT_DIR}/mariadb_repo_setup.sh --skip-maxscale --mariadb-server-version=mariadb-${DATABASE_VERSION}
#installPackagesRetry ${DB_PACKAGE_NAME}
fi
if [[ "${OX_INIT}" == true ]]; then
......
......@@ -55,7 +55,7 @@ AS_PROXY_VERSION="1.2.0"
# === Dovecot specific settings === #
# Installs dovecot 2.3 latest packages from repo.dovecot.org
# Switch between Dovecot repositories.
# Switch between Dovecot repositories.
# Possible values:
# EXT - official dovecot repository (repo.dovecot.org)
# INT - internally used repositories (only for dovecot ee from internal locations, you have to set DC_PRO=true)
......@@ -78,4 +78,4 @@ DC_VERSION="2.3.14"
## User folder names from https://apt.dovecot.net/ index page as version
# DC_REPO_SOURCE=INT
# DC_VERSION="dovecot-nightly-2.3"
# DC_PRO=true
# DC_PRO=true
Markdown is supported
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