Merge branch 'master' into develop

unepwcmc · Oct 9, 2019 · fb76287 · fb76287
2 parents c847179 + 12d9449
commit fb76287
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,8 @@
+## 0.0.1
+
+**Ocean+ Habitats first release**
+
+* Full user journey implementation
+* Dyanimic charts
+* Mapbox map with WDPA Carto layer and ArcGIS habitats layers
+* Import static stats from file
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
@@ -1,11 +1,11 @@
 set :stage, :production
-set :branch, "master"
+set :branch, "supported-production"
 
 
-server "web-production.linode.unep-wcmc.org", user: 'wcmc', roles: %w{app web db}
+server "web-supported-production.linode.unep-wcmc.org", user: 'wcmc', roles: %w{app web db}
 
 set :application, "ocean-plus-habitats"
-set :server_name, "ocean-plus-habitats.web-production.linode.unep-wcmc.org"
+set :server_name, "ocean-plus-habitats.web-supported-production.linode.unep-wcmc.org"
 set :sudo_user, "wcmc"
 set :app_port, "80"