diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2019-10-29 16:22:58 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 16:22:58 +0900 |
| commit | ef623f512903624bba48f243e3a659ec46064054 (patch) | |
| tree | fbcf995931f67798390db4f22c9b7bc2311e9bda | |
| parent | 0449d7c5e10083ec8c9daaefa2e6d7585c40c5ca (diff) | |
| parent | 9c65853ddd49a8235dbe547e8d5d635d9f157f75 (diff) | |
Merge pull request #1954 from LogicalPhallacy/LogicalPhallacy-patch-NSSM
Use mirror for NSSM
| -rwxr-xr-x | deployment/win-x64/docker-build.sh | 2 | ||||
| -rwxr-xr-x | deployment/win-x86/docker-build.sh | 2 | ||||
| -rw-r--r-- | 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 20bf430c8..3f1ad78b5 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 c5f6e82e7..7d79ba495 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 c4fb4b995..5e06b9c06 100644 --- a/deployment/windows/build-jellyfin.ps1 +++ b/deployment/windows/build-jellyfin.ps1 @@ -84,8 +84,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 |