From 02b46defa634d4a9cf75f7e6aa272eba89095a64 Mon Sep 17 00:00:00 2001 From: Hubot Date: Thu, 11 Jun 2015 18:35:37 +0000 Subject: [PATCH] Sync changes from upstream repository --- content/changes/2015-06-11-pages-a-records.md | 33 +++++++++++++++++++ content/v3/meta.md | 5 +-- lib/resources.rb | 8 +++-- 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 content/changes/2015-06-11-pages-a-records.md diff --git a/content/changes/2015-06-11-pages-a-records.md b/content/changes/2015-06-11-pages-a-records.md new file mode 100644 index 0000000000..047354655f --- /dev/null +++ b/content/changes/2015-06-11-pages-a-records.md @@ -0,0 +1,33 @@ +--- +kind: change +title: GitHub Pages' A Records Added to Meta API +created_at: 2015-06-11 +author_name: leereilly +--- + +The [Meta API](/v3/meta/) now includes the A record IP addresses for [GitHub Pages](https://pages.github.com/). + +
+$ curl https://api.github.com/meta
+
+ +

+{
+  "verifiable_password_authentication": true,
+  "github_services_sha": "23c6105183b626cf74c045f6d53af7a178bfdb4c",
+  "hooks": [
+    "192.30.252.0/22"
+  ],
+  "git": [
+    "192.30.252.0/22"
+  ],
+  "pages": [
+    "192.30.252.153/32",
+    "192.30.252.154/32"
+  ]
+}
+
+ +These IP addresses are used to [configure A records with your DNS provider for GitHub Pages](https://help.github.com/articles/tips-for-configuring-an-a-record-with-your-dns-provider/). These addresses have changed a few times in the past. This API always provides the current addresses so that you can automate the process of keeping your DNS records up to date. + +If you have any questions, please [get in touch](https://github.com/contact?form%5Bsubject%5D=GitHub+Pages+A+Records+Added+to+API). We’ll be happy to help. diff --git a/content/v3/meta.md b/content/v3/meta.md index 5d8755aa96..299b294785 100644 --- a/content/v3/meta.md +++ b/content/v3/meta.md @@ -18,7 +18,8 @@ Or, if you access this endpoint on your organization's [GitHub Enterprise](https Name | Type | Description -----|------|-------------- -`hooks`|`array` of `strings` | An Array of IP addresses in CIDR format specifying the addresses that incoming service hooks will originate from on GitHub.com. Subscribe to the [API Changes blog](https://developer.github.com/changes/) or follow [@GitHubAPI](https://twitter.com/GitHubAPI) on Twitter to get updated when this list changes. -`git`|`array` of `strings` | An Array of IP addresses in CIDR format specifying the Git servers for GitHub.com. `verifiable_password_authentication`|`boolean` | Whether authentication with username and password is supported. (GitHub Enterprise instances using CAS or OAuth for authentication will return `false`. Features like [Basic Authentication with a username and password](/v3/auth/#via-username-and-password), [sudo mode](https://help.github.com/articles/sudo-mode), and [two-factor authentication](https://help.github.com/articles/about-two-factor-authentication) are not supported on these servers.) `github_services_sha` | `string` | The currently-deployed SHA of [`github-services`](https://github.com/github/github-services). +`hooks`|`array` of `strings` | An Array of IP addresses in CIDR format specifying the addresses that incoming service hooks will originate from on GitHub.com. Subscribe to the [API Changes blog](https://developer.github.com/changes/) or follow [@GitHubAPI](https://twitter.com/GitHubAPI) on Twitter to get updated when this list changes. +`git`|`array` of `strings` | An Array of IP addresses in CIDR format specifying the Git servers for GitHub.com. +`pages`|`array` of `strings` | An Array of IP addresses in CIDR format specifying the A records for [GitHub Pages](https://pages.github.com/). diff --git a/lib/resources.rb b/lib/resources.rb index 4df79ccf02..e00f2185a5 100644 --- a/lib/resources.rb +++ b/lib/resources.rb @@ -1847,10 +1847,14 @@ def fetch_content(key) } META ||= { + :verifiable_password_authentication => true, + :github_services_sha => "3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15", :hooks => ['127.0.0.1/32'], :git => ['127.0.0.1/32'], - :verifiable_password_authentication => true, - :github_services_sha => "3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15" + :pages => [ + "192.30.252.153/32", + "192.30.252.154/32" + ] } BLOB ||= {