From 39c3b2f0447dedb4541c5f14332545de3276acfc Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 29 Oct 2019 16:22:58 +0900 Subject: [PATCH] Merge pull request #1954 from LogicalPhallacy/LogicalPhallacy-patch-NSSM Use mirror for NSSM (cherry picked from commit ef623f512903624bba48f243e3a659ec46064054) Signed-off-by: Joshua Boniface --- deployment/win-x64/docker-build.sh | 2 +- deployment/win-x86/docker-build.sh | 2 +- deployment/windows/build-jellyfin.ps1 | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deployment/win-x64/docker-build.sh b/deployment/win-x64/docker-build.sh index 20bf430c82..3f1ad78b50 100755 --- a/deployment/win-x64/docker-build.sh +++ b/deployment/win-x64/docker-build.sh @@ -7,7 +7,7 @@ set -o xtrace # Version variables NSSM_VERSION="nssm-2.24-101-g897c7ad" -NSSM_URL="https://nssm.cc/ci/${NSSM_VERSION}.zip" +NSSM_URL="http://files.evilt.win/nssm/${NSSM_VERSION}.zip" FFMPEG_VERSION="ffmpeg-4.0.2-win64-static" FFMPEG_URL="https://ffmpeg.zeranoe.com/builds/win64/static/${FFMPEG_VERSION}.zip" diff --git a/deployment/win-x86/docker-build.sh b/deployment/win-x86/docker-build.sh index c5f6e82e7d..7d79ba4958 100755 --- a/deployment/win-x86/docker-build.sh +++ b/deployment/win-x86/docker-build.sh @@ -7,7 +7,7 @@ set -o xtrace # Version variables NSSM_VERSION="nssm-2.24-101-g897c7ad" -NSSM_URL="https://nssm.cc/ci/${NSSM_VERSION}.zip" +NSSM_URL="http://files.evilt.win/nssm/${NSSM_VERSION}.zip" FFMPEG_VERSION="ffmpeg-4.0.2-win32-static" FFMPEG_URL="https://ffmpeg.zeranoe.com/builds/win32/static/${FFMPEG_VERSION}.zip" diff --git a/deployment/windows/build-jellyfin.ps1 b/deployment/windows/build-jellyfin.ps1 index 58968c5630..dde6eb8fcf 100644 --- a/deployment/windows/build-jellyfin.ps1 +++ b/deployment/windows/build-jellyfin.ps1 @@ -85,8 +85,9 @@ function Install-NSSM { Write-Warning "NSSM will not be installed" }else{ Write-Verbose "Downloading NSSM" - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - Invoke-WebRequest -Uri https://nssm.cc/ci/nssm-2.24-101-g897c7ad.zip -UseBasicParsing -OutFile "$tempdir/nssm.zip" | Write-Verbose + # [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + # Temporary workaround, file is hosted in an azure blob with a custom domain in front for brevity + Invoke-WebRequest -Uri http://files.evilt.win/nssm/nssm-2.24-101-g897c7ad.zip -UseBasicParsing -OutFile "$tempdir/nssm.zip" | Write-Verbose } Expand-Archive "$tempdir/nssm.zip" -DestinationPath "$tempdir/nssm/" -Force | Write-Verbose