From 853758c1adac5ff3de6d92732b71a562ce1e9b7a Mon Sep 17 00:00:00 2001
From: Alan Myrvold <alan.myrvold@comcast.net>
Date: Mon, 1 Oct 2018 22:28:26 -0400
Subject: [PATCH] [BEAM-4496] Fix #2 for branch fetch failure on
 job_PostCommit_Website_Publish (#6531)

---
 website/build.gradle                 | 5 +++--
 website/src/get-started/downloads.md | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/website/build.gradle b/website/build.gradle
index a73628d0184d8..fd9c55a667c00 100644
--- a/website/build.gradle
+++ b/website/build.gradle
@@ -28,6 +28,7 @@ def buildDir = "${project.rootDir}/build/website"
 def buildContentDir = "${project.rootDir}/build/website/generated-content"
 def repoContentDir = "${project.rootDir}/website/generated-content"
 def commitedChanges = false
+def gitboxUrl = project.findProperty('gitPublishRemote') ?: 'https://gitbox.apache.org/repos/asf/beam.git'
 
 def shell = { cmd ->
   println cmd
@@ -125,7 +126,7 @@ task commitWebsite << {
   // get the latest commit on master
   def latestCommit = grgit.log(maxCommits: 1)[0].abbreviatedId
 
-  shell "git fetch origin asf-site"
+  shell "git fetch ${gitboxUrl} asf-site"
   git.checkout(branch: 'asf-site')
   shell "git reset --hard origin/asf-site"
 
@@ -178,7 +179,7 @@ task publishWebsite << {
   }
 
   // Because git.push() fails to authenticate, run git push directly.
-  shell "git push https://gitbox.apache.org/repos/asf/beam.git asf-site"
+  shell "git push ${gitboxUrl} asf-site"
 }
 
 commitWebsite.dependsOn testWebsite
diff --git a/website/src/get-started/downloads.md b/website/src/get-started/downloads.md
index d9912472f4d50..608774f98128b 100644
--- a/website/src/get-started/downloads.md
+++ b/website/src/get-started/downloads.md
@@ -80,9 +80,9 @@ versions denoted `0.x.y`.
 ## Releases
 
 ### 2.6.0 (2018-08-08)
-Official [source code download](https://dist.apache.org/repos/dist/release/beam/2.6.0/apache-beam-2.6.0-source-release.zip)
-[SHA-512](https://dist.apache.org/repos/dist/release/beam/2.6.0/apache-beam-2.6.0-source-release.zip.sha512)
-[signature](https://dist.apache.org/repos/dist/release/beam/2.6.0/apache-beam-2.6.0-source-release.zip.asc).
+Official [source code download](https://archive.apache.org/dist/beam/2.6.0/apache-beam-2.6.0-source-release.zip)
+[SHA-512](https://archive.apache.org/dist/beam/2.6.0/apache-beam-2.6.0-source-release.zip.sha512)
+[signature](https://archive.apache.org/dist/beam/2.6.0/apache-beam-2.6.0-source-release.zip.asc).
 
 [Release notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12319527&version=12343392).