Merge pull request #127 from ConservationInternational/client/prepari…

…ng-production-server setting up the production server for client app
ConservationInternational · Mar 29, 2023 · 455e030 · 455e030
2 parents 9a89211 + 94f3bd9
commit 455e030
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/frontend/config/deploy/production.rb b/frontend/config/deploy/production.rb
@@ -1,10 +1,4 @@
-server '52.54.50.38', user: 'ubuntu', roles: %w{web app db}, primary: true
+server 'app.resilienceatlas.org', user: 'ubuntu', roles: %w[web app db], primary: true
 
-set :ssh_options, {
-  forward_agent: true,
-  auth_methods: %w(publickey)
-}
-
-set :rvm_custom_path, '/home/ubuntu/.rvm'
 set :node_env, 'production'
 set :branch, 'master'
diff --git a/frontend/src/state/utils/api.ts b/frontend/src/state/utils/api.ts
@@ -8,8 +8,6 @@ import { merge } from 'utilities/helpers';
 export const isProd = process.env.NODE_ENV === 'production';
 
 export const PORT = process.env.NEXT_PUBLIC_API_HOST;
-// uncomment this line to see map layers quickly for local testing
-// export const PORT = 'https://staging.resilienceatlas.org';
 
 const defaultConfig = {
   baseURL: `${PORT}/api`,

diff --git a/frontend/src/utilities/getSubdomain.ts b/frontend/src/utilities/getSubdomain.ts
@@ -1,4 +1,4 @@
-import { PORT, isProd } from '../state/utils/api';
+import { isProd } from '../state/utils/api';
 import { getRouterParam } from './routeParams';
 
 export const getSubdomainFromURL = (url: string): string => {
@@ -19,7 +19,7 @@ export const getSubdomain = (): string => {
   const siteScope = getRouterParam('site_scope');
   if (siteScope && !isProd) return siteScope;
   // Site scope depends on the domain set in the API
-  const subdomain = getSubdomainFromURL(PORT);
+  const subdomain = getSubdomainFromURL(window.location.hostname);
   return subdomain;
 };