diff --git a/packages/web/robots.txt b/packages/web/robots.txt index 3a96e1c2a2..643153fab0 100644 --- a/packages/web/robots.txt +++ b/packages/web/robots.txt @@ -2,7 +2,7 @@ User-agent: * Allow: / -Sitemap: https://discoveryprovider.audius.co/sitemaps/default.xml -Sitemap: https://discoveryprovider.audius.co/sitemaps/track/index.xml -Sitemap: https://discoveryprovider.audius.co/sitemaps/playlist/index.xml -Sitemap: https://discoveryprovider.audius.co/sitemaps/user/index.xml \ No newline at end of file +Sitemap: https://audius.co/sitemaps/default.xml +Sitemap: https://audius.co/sitemaps/track/index.xml +Sitemap: https://audius.co/sitemaps/playlist/index.xml +Sitemap: https://audius.co/sitemaps/user/index.xml \ No newline at end of file diff --git a/packages/web/scripts/workers-site/index.js b/packages/web/scripts/workers-site/index.js index 826cc31ab3..99e74b4d49 100644 --- a/packages/web/scripts/workers-site/index.js +++ b/packages/web/scripts/workers-site/index.js @@ -237,6 +237,13 @@ async function handleEvent(event) { return Response.redirect(url.origin, 302) } + const isSitemap = pathname.startsWith('/sitemaps') + if (isSitemap) { + const destinationURL = discoveryNode + pathname + search + hash + const newRequest = new Request(destinationURL, event.request) + return await fetch(newRequest) + } + const userAgent = event.request.headers.get('User-Agent') || '' const is204 = pathname === '/204' @@ -259,13 +266,6 @@ async function handleEvent(event) { return await fetch(newRequest) } - const isSitemap = pathname.startsWith('/sitemaps') - if (isSitemap) { - const destinationURL = SITEMAP + pathname + search + hash - const newRequest = new Request(destinationURL, event.request) - return await fetch(newRequest) - } - const options = {} // Always map requests to `/` options.mapRequestToAsset = (request) => { diff --git a/packages/web/wrangler.toml b/packages/web/wrangler.toml index c8f28c286c..1d0658cd28 100644 --- a/packages/web/wrangler.toml +++ b/packages/web/wrangler.toml @@ -8,22 +8,22 @@ entry-point = "./scripts/workers-site" [env.staging] name = "audius-staging" -vars = { ENVIRONMENT = "staging", GA = "https://general-admission.staging.audius.co", SITEMAP = "http://staging.audius.co.s3-website-us-west-1.amazonaws.com", DISCOVERY_NODES = "https://discoveryprovider.staging.audius.co,https://discoveryprovider2.staging.audius.co,https://discoveryprovider3.staging.audius.co,https://discoveryprovider5.staging.audius.co" } +vars = { ENVIRONMENT = "staging", GA = "https://general-admission.staging.audius.co", DISCOVERY_NODES = "https://discoveryprovider.staging.audius.co,https://discoveryprovider2.staging.audius.co,https://discoveryprovider3.staging.audius.co,https://discoveryprovider5.staging.audius.co" } [env.staging-release] name = "audius-staging-release-candidate" -vars = { ENVIRONMENT = "staging", GA = "https://general-admission.staging.audius.co", SITEMAP = "http://staging.audius.co.s3-website-us-west-1.amazonaws.com", DISCOVERY_NODES = "https://discoveryprovider.staging.audius.co,https://discoveryprovider2.staging.audius.co,https://discoveryprovider3.staging.audius.co,https://discoveryprovider5.staging.audius.co" } +vars = { ENVIRONMENT = "staging", GA = "https://general-admission.staging.audius.co", DISCOVERY_NODES = "https://discoveryprovider.staging.audius.co,https://discoveryprovider2.staging.audius.co,https://discoveryprovider3.staging.audius.co,https://discoveryprovider5.staging.audius.co" } [env.release] name = "audius-release-candidate" -vars = { ENVIRONMENT = "production", GA = "https://general-admission.audius.co", SITEMAP = "http://audius.co.s3-website-us-west-1.amazonaws.com", DISCOVERY_NODES = "https://discoveryprovider.audius.co,https://discoveryprovider2.audius.co,https://discoveryprovider3.audius.co" } +vars = { ENVIRONMENT = "production", GA = "https://general-admission.audius.co", DISCOVERY_NODES = "https://discoveryprovider.audius.co,https://discoveryprovider2.audius.co,https://discoveryprovider3.audius.co" } [env.production] name = "audius" -vars = { ENVIRONMENT = "production", GA = "https://general-admission.audius.co", SITEMAP = "http://audius.co.s3-website-us-west-1.amazonaws.com", DISCOVERY_NODES = "https://discoveryprovider.audius.co,https://discoveryprovider2.audius.co,https://discoveryprovider3.audius.co" } +vars = { ENVIRONMENT = "production", GA = "https://general-admission.audius.co", DISCOVERY_NODES = "https://discoveryprovider.audius.co,https://discoveryprovider2.audius.co,https://discoveryprovider3.audius.co" } # Test environment, replace `test` with subdomain # Invoke with npx wrangler preview --watch --env test [env.test] name = "test" -vars = { ENVIRONMENT = "production", GA = "https://general-admission.audius.co", SITEMAP = "http://audius.co.s3-website-us-west-1.amazonaws.com", DISCOVERY_NODES = "https://discoveryprovider.audius.co,https://discoveryprovider2.audius.co,https://discoveryprovider3.audius.co" } \ No newline at end of file +vars = { ENVIRONMENT = "production", GA = "https://general-admission.audius.co", DISCOVERY_NODES = "https://discoveryprovider.audius.co,https://discoveryprovider2.audius.co,https://discoveryprovider3.audius.co" } \ No newline at end of file