Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate login.gov url #218

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Consolidate login.gov url #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d8d1d6
add redirect to `https://login.gov` in all instances
jmdembe Aug 3, 2023
59f8876
add redirects for www.login.gov -> login.gov
jmdembe Aug 8, 2023
cde64e0
Merge branch 'main' into login-redirect-revisit
jmdembe Aug 9, 2023
706bd95
change from and to redirects
jmdembe Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ services:
- app:components.designsystem.digital.gov
- app:climate-data-user-study.18f.gov
- app:govconnect.18f.gov
- app:www.login.gov
- app:portfolios.18f.gov
- app:fac.gov
- app:usdigitalregistry.digitalgov.gov
Expand Down
3 changes: 3 additions & 0 deletions pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
toPath: /playbook
- innovation-toolkit-prototype
- lean-product-design
- from: login.gov
to: www.login.gov
toDomain: login.gov
Comment on lines +52 to +54
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed? Stands out to me that toDomain is the legacy domain. Should it be the new domain?

- open-source-guide
- open-source-program
- partnership-playbook
Expand Down
8 changes: 8 additions & 0 deletions templates/_federalist-redirects.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,14 @@ server {
return 301 https://$target_domain;
}

# www.login.gov to login.gov
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# www.login.gov to login.gov
# login.gov to www.login.gov

server {
listen {{ PORT }};
set $target_domain login.gov;
server_name www.login.gov;
return 301 https://$target_domain$request_uri;
}

# portfolios.18f.gov to 18f.gsa.gov
server {
listen {{ PORT }};
Expand Down
1 change: 1 addition & 0 deletions templates/manifest-prod.yml.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ routes:
- route: components.designsystem.digital.gov
- route: climate-data-user-study.18f.gov
- route: govconnect.18f.gov
- route: www.login.gov
- route: portfolios.18f.gov
- route: fac.gov
{% for page in PAGE_CONFIGS -%}
Expand Down
1 change: 1 addition & 0 deletions test/integration/test_federalist_redirects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const expectedRedirects = [
{ from: 'usability.gov', to: 'www.usability.gov', redirectCode: 301 },
{ from: 'emerging.digital.gov', to: 'digital.gov/topics/emerging-tech', redirectCode: 301, noPath: true },
{ from: 'components.designsystem.digital.gov', to: 'designsystem.digital.gov/components', redirectCode: 301, noPath: true },
{ from: 'www.login.gov', to: 'login.gov', redirectCode: 301}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a syntax error with missing comma

Suggested change
{ from: 'www.login.gov', to: 'login.gov', redirectCode: 301}
{ from: 'www.login.gov', to: 'login.gov', redirectCode: 301 },

{ from: 'partners.login.gov', to: 'www.login.gov/partners', redirectCode: 301, noPath: true },
{ from: 'partners.login.gov/product/', to: 'www.login.gov/partners/our-services', redirectCode: 301, noPath: true },
{ from: 'partners.login.gov/product', to: 'www.login.gov/partners/our-services', redirectCode: 301, noPath: true },
Expand Down