Add support for debian 13 (trixie).
This commit is contained in:
@@ -123,7 +123,13 @@ blank_line() {
|
||||
|
||||
detect_os () {
|
||||
|
||||
if $(which lsb_release > /dev/null 2>&1) ; then
|
||||
if [ -r /etc/os-release ]; then
|
||||
. /etc/os-release
|
||||
DIST="${ID:-unknown}"
|
||||
DIST_VERSION="${VERSION_ID:-unknown}"
|
||||
DIST_CODENAME="${VERSION_CODENAME:-unknown}"
|
||||
|
||||
elif $(which lsb_release > /dev/null 2>&1) ; then
|
||||
|
||||
DIST="$(lsb_release -i | awk '{print tolower($3)}')"
|
||||
DIST_VERSION="$(lsb_release -r | awk '{print tolower($2)}')"
|
||||
@@ -135,12 +141,11 @@ detect_os () {
|
||||
fi
|
||||
fi
|
||||
|
||||
elif [[ -e "/etc/os-release" ]]; then
|
||||
else
|
||||
|
||||
. /etc/os-release
|
||||
|
||||
DIST=$ID
|
||||
DIST_VERSION=${VERSION_ID}
|
||||
DIST="unknown"
|
||||
DIST_VERSION="unknown"
|
||||
DIST_CODENAME="unknown"
|
||||
|
||||
fi
|
||||
|
||||
@@ -151,7 +156,6 @@ detect_os () {
|
||||
}
|
||||
|
||||
|
||||
|
||||
# ----------
|
||||
# - Jobhandling
|
||||
# ----------
|
||||
@@ -1028,8 +1032,8 @@ server {
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl http2;
|
||||
listen [::]:443 ssl http2;
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
server_name ${FQHN_HOSTNAME};
|
||||
|
||||
# Include location directive for Let's Encrypt ACME Challenge
|
||||
@@ -1162,7 +1166,7 @@ server {
|
||||
|
||||
# xmpp websockets
|
||||
location = /xmpp-websocket {
|
||||
proxy_pass http://127.0.0.1:5280/xmpp-websocket?prefix=\$prefix&\$args;
|
||||
proxy_pass http://localhost:5280/xmpp-websocket?prefix=\$prefix&\$args;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade \$http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
@@ -1172,7 +1176,7 @@ server {
|
||||
|
||||
# colibri (JVB) websockets for jvb1
|
||||
location ~ ^/colibri-ws/default-id/(.*) {
|
||||
proxy_pass http://127.0.0.1:9090/colibri-ws/default-id/\$1\$is_args\$args;
|
||||
proxy_pass http://localhost:9090/colibri-ws/default-id/\$1\$is_args\$args;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade \$http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
@@ -1244,6 +1248,61 @@ else
|
||||
echo_skipped
|
||||
fi
|
||||
|
||||
if [ "$DIST" = "debian" ] && [[ "$DIST_VERSION" == 13* ]]; then
|
||||
|
||||
echo
|
||||
echo -e "\033[37m\033[1mTake care inspect.lua is available für Lua 5.4 ..\033[m"
|
||||
echo
|
||||
|
||||
echononl "Create Folder '/usr/share/lua/5.4'.."
|
||||
if [[ ! -d "/usr/share/lua/5.4" ]] ; then
|
||||
mkdir -p /usr/share/lua/5.4 > "$log_file" 2>&1
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo_failed
|
||||
error "$(cat "$log_file")"
|
||||
else
|
||||
echo_ok
|
||||
fi
|
||||
else
|
||||
echo_skipped
|
||||
fi
|
||||
|
||||
echononl "Deploy luan.inspect to the '/usr/share/lua/5.4' folder.."
|
||||
if [[ ! -f /usr/share/lua/5.4/inspect.lua ]]; then
|
||||
if [[ -f /usr/share/lua/5.3/inspect.lua ]]; then
|
||||
cp -a /usr/share/lua/5.3/inspect.lua /usr/share/lua/5.4/inspect.lua > "$log_file" 2>&1
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo_failed
|
||||
error "$(cat "$log_file")"
|
||||
else
|
||||
echo_ok
|
||||
fi
|
||||
elif [[ -f /usr/share/lua/5.2/inspect.lua ]]; then
|
||||
cp -a /usr/share/lua/5.2/inspect.lua /usr/share/lua/5.4/inspect.lua > "$log_file" 2>&1
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo_failed
|
||||
error "$(cat "$log_file")"
|
||||
else
|
||||
echo_ok
|
||||
fi
|
||||
elif [[ -f /usr/share/lua/5.1/inspect.lua ]]; then
|
||||
ln -s ../5.1/inspect.lua /usr/share/lua/5.4/inspect.lua > "$log_file" 2>&1
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo_failed
|
||||
error "$(cat "$log_file")"
|
||||
else
|
||||
echo_ok
|
||||
fi
|
||||
else
|
||||
echo_failed
|
||||
error "No luan.inspect at folder '/usr/share/lua/5.4' present!"
|
||||
fi
|
||||
else
|
||||
echo_skipped
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
echo
|
||||
@@ -1260,7 +1319,7 @@ else
|
||||
fi
|
||||
|
||||
echononl "Restart jicofo service.."
|
||||
systemctl restart prosody > "$log_file" 2>&1
|
||||
systemctl restart jicofo > "$log_file" 2>&1
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo_failed
|
||||
error "$(cat "$log_file")"
|
||||
|
||||
Reference in New Issue
Block a user