diff --git a/README.md b/README.md index 4cede362b..ee8f9a81d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ There are only a handful of use cases where running a third party server is advi FarmBot, Inc. provides a publicly accessible server at [https://my.farm.bot/](https://my.farm.bot/) for end users that are not familiar with Ruby on Rails application development. Hosting your own server will require an understanding of how Ruby on Rails applications (and databases) operate. It is designed for use by software engineers. Self-hosting the Web App will not provide you with a more stable user experience and may result in accidental security issues or data loss. -**If you are not a Ruby on Rails developer**, or you have never written a Ruby on Rails application, you are encouraged to use [the publicly available web app](http://my.farmbot.io/). Running a server is *a non-trivial task with security implications*. Data loss and security issues are possible in some circumstances. Self hosting requires an intermediate background in Ruby, SQL and Linux system administration. +**If you are not a Ruby on Rails developer**, or you have never written a Ruby on Rails application, you are encouraged to use [the publicly available web app](http://my.farm.bot/). Running a server is *a non-trivial task with security implications*. Data loss and security issues are possible in some circumstances. Self hosting requires an intermediate background in Ruby, SQL and Linux system administration. We do not have the resources available to help novice developers learn to setup servers, environments, configurations, or perform basic Linux command line instructions. diff --git a/config/environments/production.rb b/config/environments/production.rb index 569d0c4b2..4bb1cdc44 100755 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -2,7 +2,7 @@ FarmBot::Application.configure do config .action_mailer - .default_url_options = { host: ENV.fetch("API_HOST", "my.farmbot.io") } + .default_url_options = { host: ENV.fetch("API_HOST", "my.farm.bot") } config.active_support.deprecation = :notify config.cache_classes = true config.consider_all_requests_local = false diff --git a/frontend/__tests__/interceptors_test.ts b/frontend/__tests__/interceptors_test.ts index 0e6e0da03..0161d8b68 100644 --- a/frontend/__tests__/interceptors_test.ts +++ b/frontend/__tests__/interceptors_test.ts @@ -45,7 +45,7 @@ function fakeResponse(config: Partial): AxiosResponse { headers: { "X-Farmbot-Rpc-Id": config.uuid || uuid() }, config: { method: config.method || "put", - url: config.url || "http://my.farmbot.io/api/tools/6" + url: config.url || "http://my.farm.bot/api/tools/6" } }; @@ -56,7 +56,7 @@ describe("responseFulfilled", () => { it("won't fire for webcam feed updates", () => { const resp = fakeResponse({ method: "post", - url: "https://staging.farmbot.io/api/webcam_feeds/" + url: "https://staging.farm.bot/api/webcam_feeds/" }); responseFulfilled(resp); expect(startTracking).not.toHaveBeenCalled(); diff --git a/frontend/devices/components/fbos_settings/__tests__/nonsecure_content_warning_test.tsx b/frontend/devices/components/fbos_settings/__tests__/nonsecure_content_warning_test.tsx index b0c6d7449..92065ab66 100644 --- a/frontend/devices/components/fbos_settings/__tests__/nonsecure_content_warning_test.tsx +++ b/frontend/devices/components/fbos_settings/__tests__/nonsecure_content_warning_test.tsx @@ -4,7 +4,7 @@ import { shallow } from "enzyme"; describe("allUrlsAreSafe", () => { const HTTP = "http://farm.bot"; - const HTTPS = "https://farmbot.io"; + const HTTPS = "https://farm.bot"; it("catches HTTPS vs HTTP urls", () => { /** Always fails if there is even one http: URL */ expect(allAreHttps([HTTP, HTTPS])).toBeFalsy(); diff --git a/frontend/front_page/__tests__/front_page_test.tsx b/frontend/front_page/__tests__/front_page_test.tsx index 1de0c4de3..320775b6a 100644 --- a/frontend/front_page/__tests__/front_page_test.tsx +++ b/frontend/front_page/__tests__/front_page_test.tsx @@ -56,7 +56,7 @@ describe("", () => { const el = mount(); ["Privacy Policy", "Terms of Use"].map(string => expect(el.text()).toContain(string)); - ["https://farmbot.io/privacy/", "https://farmbot.io/tos/"] + ["https://farm.bot/privacy/", "https://farm.bot/tos/"] .map(string => expect(el.html()).toContain(string)); }); diff --git a/frontend/tos_update/__tests__/component_test.tsx b/frontend/tos_update/__tests__/component_test.tsx index 9cdf74b24..08d0495f6 100644 --- a/frontend/tos_update/__tests__/component_test.tsx +++ b/frontend/tos_update/__tests__/component_test.tsx @@ -74,7 +74,7 @@ describe("", () => { const el = mount(); ["Privacy Policy", "Terms of Use"].map(string => expect(el.text()).toContain(string)); - ["https://farmbot.io/privacy/", "https://farmbot.io/tos/"] + ["https://farm.bot/privacy/", "https://farm.bot/tos/"] .map(string => expect(el.html()).toContain(string)); }); }); diff --git a/package.json b/package.json index b6be51732..edd3ab3bc 100644 --- a/package.json +++ b/package.json @@ -94,8 +94,8 @@ }, "globalConfig": { "NODE_ENV": "development", - "TOS_URL": "https://farmbot.io/tos/", - "PRIV_URL": "https://farmbot.io/privacy/", + "TOS_URL": "https://farm.bot/tos/", + "PRIV_URL": "https://farm.bot/privacy/", "LONG_REVISION": "------------", "SHORT_REVISION": "--------" } diff --git a/public/404.html b/public/404.html index c4c127dea..b91d15ee7 100755 --- a/public/404.html +++ b/public/404.html @@ -64,7 +64,7 @@
- + @@ -92,4 +92,4 @@
- \ No newline at end of file + diff --git a/public/500.html b/public/500.html index 81a965d37..1f3cdbdda 100755 --- a/public/500.html +++ b/public/500.html @@ -65,7 +65,7 @@
- + @@ -93,4 +93,4 @@
- \ No newline at end of file +