Skip to content

Commit

Permalink
Merge pull request #1970 from MushroomObserver/incorporate-production…
Browse files Browse the repository at this point in the history
…-config-changes

Pushing some old lingering changes from production.
  • Loading branch information
pellaea committed Feb 27, 2024
2 parents 3566820 + fc1ef13 commit 755804f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
12 changes: 9 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,14 @@ coverage
# Ignore VS Code config
.vscode

# Ignore master key for decrypting credentials and more.
# Ignore sensitive config stuff.
/config/master.key

/config/newrelic.yml
/config/credentials/production.key
checkpoint_stripped.gz

# This is created by a cronjob, not checked in.
public/name_list_data.js

# DB snapshots are often lying about, don't want them accidentally checked in.
checkpoint*
db/checkpoint*
2 changes: 1 addition & 1 deletion config/image_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ production:
:mycolab:
:test: :transferred_flag
:read: https://mushroomobserver.org/images
:write: ssh://mo@204.93.192.148:/data/images/mo
:write: ssh://mo@images.mushroomobserver.org:/data/images/mo
keep_these_image_sizes_local: []

test:
Expand Down
6 changes: 3 additions & 3 deletions config/newrelic.yml → config/newrelic.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ common: &default_settings

# Your application name. Renaming here affects where data displays in New
# Relic. For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications
app_name: MushroomObserver
app_name: mushroomobserver

distributed_tracing:
enabled: true
Expand Down Expand Up @@ -50,7 +50,7 @@ common: &default_settings
# If your application has other named environments, configure them here.
development:
<<: *default_settings
app_name: MushroomObserver (Development)
app_name: mushroomobserver (Development)

test:
<<: *default_settings
Expand All @@ -59,7 +59,7 @@ test:

staging:
<<: *default_settings
app_name: MushroomObserver (Staging)
app_name: mushroomobserver (Staging)

production:
<<: *default_settings

0 comments on commit 755804f

Please sign in to comment.