From 41860b639d9b252f7963b12bd14a4e0f533e564f Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Wed, 28 Feb 2024 19:52:50 +0000 Subject: [PATCH 1/3] KASM-5659 Use updated kasm-profile-sync branch with fix for large number of small files --- src/ubuntu/install/profile_sync/install_profile_sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubuntu/install/profile_sync/install_profile_sync.sh b/src/ubuntu/install/profile_sync/install_profile_sync.sh index acc4a5c..02c28ab 100755 --- a/src/ubuntu/install/profile_sync/install_profile_sync.sh +++ b/src/ubuntu/install/profile_sync/install_profile_sync.sh @@ -79,8 +79,8 @@ download_and_symlink() { } ARCH=$(arch) -BRANCH="release_1.0.3" -COMMIT_ID="635ff757b74f53b88d6ceb58d6041676fd59f5bd" +BRANCH="release_1.0.4" +COMMIT_ID="ce08b72955459c61f27ce5015547fab9b25842d4" convert_local_distro_to_profile_sync_distro check_distro_is_supported From 3ccf613c4ff9e3a5572991eb5fe02b1ab808c284 Mon Sep 17 00:00:00 2001 From: Justin Travis Date: Wed, 28 Feb 2024 15:20:24 -0500 Subject: [PATCH 2/3] KASM-5638 Log messages may when attaching to docker networks. Dont exit the script when this happens --- src/common/startup_scripts/vnc_startup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/startup_scripts/vnc_startup.sh b/src/common/startup_scripts/vnc_startup.sh index 03e7dab..d59fc18 100755 --- a/src/common/startup_scripts/vnc_startup.sh +++ b/src/common/startup_scripts/vnc_startup.sh @@ -10,7 +10,9 @@ log () { INGEST_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") echo "${INGEST_DATE} ${LOG_LEVEL} (${APP_NAME}): $1" if [ ! -z "${KASM_API_JWT}" ] && [ ! -z "${KASM_API_HOST}" ] && [ ! -z "${KASM_API_PORT}" ]; then + set +e http_proxy="" https_proxy="" curl https://${KASM_API_HOST}:${KASM_API_PORT}/api/kasm_session_log?token=${KASM_API_JWT} --max-time 1 -X POST -H 'Content-Type: application/json' -d '[{ "host": "'"${KASM_ID}"'", "application": "Session", "ingest_date": "'"${INGEST_DATE}"'", "message": "'"$1"'", "levelname": "'"${LOG_LEVEL}"'", "process": "'"${APP_NAME}"'", "kasm_user_name": "'"${KASM_USER_NAME}"'", "kasm_id": "'"${KASM_ID}"'" }]' -k -s + set -e fi fi } From e9320b6ec4412e8fa3245091a24628dd21551c11 Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Wed, 28 Feb 2024 21:04:44 +0000 Subject: [PATCH 3/3] KASM-5679 Add Fix for ubuntu libssl 404 --- src/ubuntu/install/squid/install/install_squid.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubuntu/install/squid/install/install_squid.sh b/src/ubuntu/install/squid/install/install_squid.sh index 7742e17..9e1b6b5 100644 --- a/src/ubuntu/install/squid/install/install_squid.sh +++ b/src/ubuntu/install/squid/install/install_squid.sh @@ -3,9 +3,9 @@ set -ex ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') if [[ "${ARCH}" == "arm64" ]]; then - LIBSSLURL="http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_arm64.deb" + LIBSSLURL="http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_arm64.deb" else - LIBSSLURL="http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb" + LIBSSLURL="http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb" fi # intall squid