Merge pull request #224 from cloud-gov/chore-remove-guides.18f.gov

chore: Remove guides.18f.gov

docker-compose.yml

@@ -54,7 +54,6 @@ services:
       - app:api-usability-testing.18f.gov
       - app:digitalaccelerator.18f.gov
       - app:innovation-toolkit-prototype.18f.gov
-      - app:guides.18f.gov
       - app:open-source-program.18f.gov
       - app:modularcontracting.18f.gov
       - app:v2.designsystem.digital.gov

pages.yml

@@ -31,7 +31,6 @@
 - govconnect
 - grouplet-playbook
 - guides-template
-- guides
 - iaa-forms
 - from: identity-dev-docs
   to: developers

templates/_federalist-redirects.njk

@@ -196,65 +196,6 @@ server {
 }
 
 
-# guides.18f.gov to 18f.gsa.gov/guides/
-# individual guides re-routed to their current
-# addresses, for example:
-#    guides.18f.gov/<guide-name> to <guide-name>.18f.gov
-server {
-  listen {{ PORT }};
-  server_name guides.18f.gov;
-
-  location ~ ^/?$ {
-    return 302 $scheme://18f.gsa.gov/guides/;
-  }
-
-  location ~ ^/accessibility/? {
-    rewrite ^/accessibility/(.*)$ $scheme://accessibility.18f.gov/$1;
-    return 302 $scheme://accessibility.18f.gov/;
-  }
-
-  location ~ ^/agile/? {
-    rewrite ^/agile/(.*)$ $scheme://agile.18f.gov/$1;
-    return 302 $scheme://agile.18f.gov/;
-  }
-
-  location ~ ^/brand/? {
-    rewrite ^/brand/(.*)$ $scheme://brand.18f.gov/$1;
-    return 302 $scheme://brand.18f.gov/;
-  }
-
-  location ~ ^/content-guide/? {
-    rewrite ^/content-guide/(.*)$ $scheme://content-guide.18f.gov/$1;
-    return 302 $scheme://content-guide.18f.gov/;
-  }
-
-  location ~ ^/derisking/? {
-    rewrite ^/derisking/(.*)$ $scheme://derisking.18f.gov/$1;
-    return 302 $scheme://derisking.18f.gov/;
-  }
-
-  location ~ ^/eng-hiring/? {
-    rewrite ^/eng-hiring/(.*)$ $scheme://eng-hiring.18f.gov/$1;
-    return 302 $scheme://eng-hiring.18f.gov/;
-  }
-
-  location ~ ^/engineering/? {
-    rewrite ^/engineering/(.*)$ $scheme://engineering.18f.gov/$1;
-    return 302 $scheme://engineering.18f.gov/;
-  }
-
-  location ~ ^/product/? {
-    rewrite ^/product/(.*)$ $scheme://product.18f.gov/$1;
-    return 302 $scheme://product.18f.gov/;
-  }
-
-  location ~ ^/ux-guide/? {
-    rewrite ^/ux-guide/(.*)$ $scheme://ux-guide.18f.gov/$1;
-    return 302 $scheme://ux-guide.18f.gov/;
-  }
-}
-
-
 # guides-template.18f.gov to github.com/18F/guides-template
 server {
   listen {{ PORT }};

templates/nginx.conf.njk

@@ -47,7 +47,6 @@ http {
     rewrite ^/intake/.* https://18f.gsa.gov/contact/ redirect;
     rewrite ^/designstandards/.* https://standards.usa.gov/ redirect;
     rewrite ^/joining-18f/.* https://18f.gsa.gov/join/ redirect;
-    rewrite ^/$ https://guides.18f.gov redirect;
     # -- end custom pages.18f.gov redirects
 
     # For everything else, show an error message

test/integration/test_pages_redirects.js

@@ -8,16 +8,6 @@ const lib = require('../../lib');
 const HOST = process.env.TARGET_HOST || 'http://localhost:8080';
 const PAGES_FILE = path.join(__dirname, '../..', 'pages.yml');
 
-test('redirects "/" to guides.18f.gov', (t) => {
-  const reqObj = { url: HOST, followRedirect: false };
-  request(reqObj, (err, res) => {
-    t.notOk(err);
-    t.equal(res.statusCode, 302);
-    t.equal(res.headers.location, 'https://guides.18f.gov');
-    t.end();
-  });
-});
-
 const pageConfigs = lib.getPageConfigs(fs.readFileSync(PAGES_FILE, 'utf-8'));