Skip to content

Commit

Permalink
Cleanup rails config (#4080)
Browse files Browse the repository at this point in the history
  • Loading branch information
sylvain-morin committed May 13, 2024
1 parent 67bd798 commit 960fd1f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
16 changes: 3 additions & 13 deletions config/config.docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,11 @@ base: &base
session_key: _inaturalist_session
secret: <%= ENV.fetch("INAT_SECRET_KEY_BASE") { "INAT_SECRET_KEY_BASE" } %>

yahoo_dev_network:
app_id: <%= ENV.fetch("INAT_YAHOO_APP_ID") { "INAT_YAHOO_APP_ID" } %>

tile_servers:
elasticsearch: <%= ENV.fetch("INAT_TILES_URL") { "http://localhost:4000/v1" } %>
# observations: http://www.inaturalist.org/observations/tiles
# tilestache: http://geo.inaturalist.org
# tilestache_public_path: /home/inaturalist/deployment/TileStache/public

facebook:
namespace: <%= ENV.fetch("INAT_FACEBOOK_NAMESPACE") { "INAT_FACEBOOK_NAMESPACE" } %>
app_id: <%= ENV.fetch("INAT_FACEBOOK_APP_ID") { "INAT_FACEBOOK_APP_ID" } %>
app_secret: <%= ENV.fetch("INAT_FACEBOOK_APP_SECRET") { "INAT_FACEBOOK_APP_SECRET" } %>
admin_ids: <%= ENV.fetch("INAT_FACEBOOK_ADMIN_IDS") { "INAT_FACEBOOK_ADMIN_IDS" } %>
namespace: inaturalist

twitter:
key: <%= ENV.fetch("INAT_TWITTER_KEY") { "INAT_TWITTER_KEY" } %>
Expand Down Expand Up @@ -55,9 +46,6 @@ base: &base
client_id: <%= ENV.fetch("INAT_GOOGLE_CLIENT_ID") { "INAT_GOOGLE_CLIENT_ID" } %>
secret: <%= ENV.fetch("INAT_GOOGLE_SECRET") { "INAT_GOOGLE_SECRET" } %>

bing:
key: <%= ENV.fetch("INAT_BING_KEY") { "INAT_BING_KEY" } %>

soundcloud:
client_id: <%= ENV.fetch("INAT_SOUNDCLOUD_CLIENT_ID") { "INAT_SOUNDCLOUD_CLIENT_ID" } %>
secret: <%= ENV.fetch("INAT_SOUNDCLOUD_SECRET") { "INAT_SOUNDCLOUD_SECRET" } %>
Expand Down Expand Up @@ -115,6 +103,8 @@ base: &base

admin_user_email: <%= ENV.fetch("INAT_ADMIN_USER_EMAIL") { "INAT_ADMIN_USER_EMAIL" } %>

dangerous_taxa_list_id: <%= ENV.fetch("INAT_DANGEROUS_TAXA_LIST_ID") { "INAT_DANGEROUS_TAXA_LIST_ID" } %>

development:
<<: *base

Expand Down
6 changes: 0 additions & 6 deletions config/config.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ base: &base
# EXPERIMENTAL: These endpoints should return map tiles when hit with
# requests like /{Z}/{X}/{Y}.png.
# See http://bitbucket.org/springmeyer/tilelite/
observations: 'http://localhost:8000'
tilestache: 'http://localhost:8080'
elasticsearch: http://localhost:4000/v1

google_webmaster:
Expand Down Expand Up @@ -60,10 +58,6 @@ base: &base
# cloudmade:
# key: 09af09af09af09af09af09af09af09af09af09af

# bing:
# # http://www.bingmapsportal.com/
# key: 09af09af09af09af09af09af09af09af09af09af

flickr:
# http://www.flickr.com/services/api/keys/apply/
key: 09af09af09af09af09af09af09af09af
Expand Down

0 comments on commit 960fd1f

Please sign in to comment.