diff --git a/.github/workflows/staging-deploy-pr.yml b/.github/workflows/staging-deploy-pr.yml
index c6ca90ef81..b9ceb82047 100644
--- a/.github/workflows/staging-deploy-pr.yml
+++ b/.github/workflows/staging-deploy-pr.yml
@@ -13,6 +13,7 @@ on:
env:
EARLY_ACCESS_SCRIPT_PATH: script/early-access/clone-for-build.js
+ EARLY_ACCESS_SUPPORT_FILES: script/package.json
# In this specific workflow relationship, the `github.event.workflow_run.pull_requests`
# array will always contain only 1 item! Specifically, it will contain the PR associated
# with the `github.event.workflow_run.head_branch` that triggered the preceding
@@ -64,7 +65,7 @@ jobs:
name: Download the script to clone early access
uses: Bhacaz/checkout-files@c8f01756bfd894ba746d5bf48205e19000b0742b
with:
- files: ${{ env.EARLY_ACCESS_SCRIPT_PATH }}
+ files: ${{ env.EARLY_ACCESS_SCRIPT_PATH }} ${{ env.EARLY_ACCESS_SUPPORT_FILES }}
token: ${{ secrets.GITHUB_TOKEN }}
# Add any dependencies that are needed for this workflow below
@@ -85,8 +86,8 @@ jobs:
run: npm prune --production
- if: ${{ github.repository == 'github/docs-internal' }}
- name: Delete the script to clone early access
- run: rm ${{ env.EARLY_ACCESS_SCRIPT_PATH }}
+ name: Delete the script directory after cloning early access
+ run: rm -rf script/
- name: Create a gzipped archive
run: tar -cfz app.tar.gz ./
diff --git a/assets/images/installing-github-enterprise-server-on-aws.png b/assets/images/installing-github-enterprise-server-on-aws.png
new file mode 100644
index 0000000000..d6f6a150f5
Binary files /dev/null and b/assets/images/installing-github-enterprise-server-on-aws.png differ
diff --git a/components/DefaultLayout.tsx b/components/DefaultLayout.tsx
index 4869cf0d9c..40d0b1823d 100644
--- a/components/DefaultLayout.tsx
+++ b/components/DefaultLayout.tsx
@@ -11,7 +11,7 @@ import { useTranslation } from './hooks/useTranslation'
type Props = { children?: React.ReactNode }
export const DefaultLayout = (props: Props) => {
- const { page, error, isHomepageVersion, currentPathWithoutLanguage } = useMainContext()
+ const { page, error, isHomepageVersion, currentPathWithoutLanguage, fullUrl } = useMainContext()
const { t } = useTranslation('errors')
return (
@@ -40,6 +40,19 @@ export const DefaultLayout = (props: Props) => {
/>
)
})}
+
+ {page.fullTitle && (
+ <>
+
+
+
+
+
+ >
+ )}
diff --git a/components/context/MainContext.tsx b/components/context/MainContext.tsx
index 438f95082b..9629871f06 100644
--- a/components/context/MainContext.tsx
+++ b/components/context/MainContext.tsx
@@ -104,6 +104,7 @@ export type MainContextT = {
searchVersions: Record
nonEnterpriseDefaultVersion: string
+ fullUrl: string
}
export const getMainContextFromRequest = (req: any): MainContextT => {
@@ -165,6 +166,7 @@ export const getMainContextFromRequest = (req: any): MainContextT => {
featureFlags: {},
searchVersions: req.context.searchVersions,
nonEnterpriseDefaultVersion: req.context.nonEnterpriseDefaultVersion,
+ fullUrl: req.protocol + '://' + req.get('host') + req.originalUrl,
}
}
diff --git a/content/admin/installation/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-aws.md b/content/admin/installation/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-aws.md
index 348f278cf5..4472e55f31 100644
--- a/content/admin/installation/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-aws.md
+++ b/content/admin/installation/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-aws.md
@@ -26,7 +26,9 @@ This guide assumes you are familiar with the following AWS concepts:
- [EC2 and Virtual Private Cloud](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-vpc.html) (If you plan to launch into a Virtual Private Cloud)
- [AWS Pricing](https://aws.amazon.com/pricing/) (For calculating and managing costs)
- This guide recommends the principle of least privilege when setting up {% data variables.product.product_location %} on AWS. For more information, refer to the [AWS Identity and Access Management (IAM) documentation](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#grant-least-privilege).
+For an architectural overview, see the "[AWS Architecture Diagram for Deploying GitHub Enterprise Server](/assets/images/installing-github-enterprise-server-on-aws.png)".
+
+This guide recommends the principle of least privilege when setting up {% data variables.product.product_location %} on AWS. For more information, refer to the [AWS Identity and Access Management (IAM) documentation](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#grant-least-privilege).
## Hardware considerations
diff --git a/data/variables/contact.yml b/data/variables/contact.yml
index 6d6e830430..9e3f84ac44 100644
--- a/data/variables/contact.yml
+++ b/data/variables/contact.yml
@@ -39,7 +39,7 @@ contact_ae_portal: '[Azure Support portal](https://portal.azure.com/#blade/Micro
# GitHub Support portal (for dotcom - this sends users to a contact form)
support_portal: 'GitHub Support portal'
-contact_support_portal: '[GitHub Support portal](https://support.github.com/contact)'
+contact_support_portal: '[GitHub Support portal](https://support.github.com/contact?tags=docs-generic)'
# GitHub Support portal (this sends users to the Support landing page)
landing_page_portal: 'GitHub Support portal'