Merge pull request #1966 from consul/chore/update_secrets_example

Update secrets and deploy secrets example files

config/deploy-secrets.yml.example

@@ -1,25 +1,28 @@
 staging:
   deploy_to: "/var/www/consul"
   ssh_port: 21
-  server: staging.consul.es
-  user: xxxxx
-  full_app_name: consul
-  server_name: staging.consul.es
-  db_server: postgre.consul.es
+  server: "staging.consul.es"
+  db_server: "postgre.consul.es"
+  user: "xxxxx"
+  server_name: "staging.consul.es"
+  full_app_name: "consul"
 
 preproduction:
   deploy_to: "/var/www/consul"
   ssh_port: 2222
   server1: xxx.xxx.xxx.xxx
   server2: xxx.xxx.xxx.xxx
-  user: xxxxx
-  full_app_name: consul
   db_server: xxx.xxx.xxx.xxx
+  user: xxxxx
+  server_name: pre.consul.es
+  full_app_name: "consul"
 
 production:
   deploy_to: "/var/www/consul"
-  ssh_port: 2222
-  server: xxx.xxx.xxx.xxx
-  user: xxxxx
-  full_app_name: consul
-
+  ssh_port: 22
+  server1: xxx.xxx.xxx.xxx
+  server2: xxx.xxx.xxx.xxx
+  db_server: xxx.xxx.xxx.xxx
+  user: "deploy"
+  server_name: "consul.es"
+  full_app_name: "consul"

config/secrets.yml.example

@@ -1,46 +1,74 @@
 default: &default
-  secret_key_base: "56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4"
+  secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
+
+maps: &maps
   map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
   map_tiles_provider_attribution: "&copy; <a href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors"
 
-development:
-  <<: *default
-
-test:
-  <<: *default
-
-staging:
-  server_name: ""
-  <<: *default
-
-production: &production
-  secret_key_base: "817232feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4"
-
+apis: &apis
   census_api_end_point: ""
   census_api_institution_code: ""
   census_api_portal_name: ""
   census_api_user_code: ""
-
   sms_end_point:  ""
   sms_username: ""
   sms_password: ""
 
+http_basic_auth: &http_basic_auth
+  http_basic_auth: true
+
+
+development:
+  http_basic_username: "dev"
+  http_basic_password: "pass"
+  <<: *default
+
+test:
+  <<: *default
+  <<: *maps
+
+staging:
+  secret_key_base: ""
+  server_name: ""
+  rollbar_server_token: ""
   http_basic_username: ""
   http_basic_password: ""
+  managers_url: ""
+  managers_application_key: ""
+  <<: *default
+  <<: *maps
+  <<: *apis
 
+preproduction:
+  secret_key_base: ""
+  server_name: ""
+  rollbar_server_token: ""
+  http_basic_username: ""
+  http_basic_password: ""
+  managers_url: ""
+  managers_application_key: ""
   twitter_key: ""
   twitter_secret: ""
   facebook_key: ""
   facebook_secret: ""
   google_oauth2_key: ""
   google_oauth2_secret: ""
+  <<: *maps
+  <<: *apis
 
+production:
+  secret_key_base: ""
+  server_name: ""
   rollbar_server_token: ""
-  server_name: ""
-
-  map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-  map_tiles_provider_attribution: "&copy; <a href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors"
-
-preproduction:
-  server_name: ""
-  <<: *production
+  http_basic_username: ""
+  http_basic_password: ""
+  managers_url: ""
+  managers_application_key: ""
+  twitter_key: ""
+  twitter_secret: ""
+  facebook_key: ""
+  facebook_secret: ""
+  google_oauth2_key: ""
+  google_oauth2_secret: ""
+  <<: *maps
+  <<: *apis