zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 17:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:domify/registry

Browse source
This commit is contained in:
Martin Lensment 2015-06-26 17:26:55 +03:00
commit dc8f30f646
6 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
26.06.2015
* Added new relic license key ta application-example.yml, please update application.yml
22.06.2015 22.06.2015
* Update zonefile * Update zonefile

2
Gemfile
View file

@ -67,7 +67,7 @@ gem 'data_migrate',
ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81' ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81'
# monitors # monitors
gem 'newrelic_rpm', '~> 3.9.9.275' gem 'newrelic_rpm', '~> 3.12.0.288'
# country listing # country listing
gem 'countries', '~> 0.10.0' gem 'countries', '~> 0.10.0'

4
Gemfile.lock
View file

@ -295,7 +295,7 @@ GEM
railties (>= 3.0) railties (>= 3.0)
multi_json (1.11.1) multi_json (1.11.1)
multi_xml (0.5.5) multi_xml (0.5.5)
newrelic_rpm (3.9.9.275) newrelic_rpm (3.12.0.288)
nokogiri (1.6.6.2) nokogiri (1.6.6.2)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
nori (2.6.0) nori (2.6.0)
@ -563,7 +563,7 @@ DEPENDENCIES
launchy (~> 2.4.3) launchy (~> 2.4.3)
mina (~> 0.3.1) mina (~> 0.3.1)
money-rails (~> 1.4.1) money-rails (~> 1.4.1)
newrelic_rpm (~> 3.9.9.275) newrelic_rpm (~> 3.12.0.288)
nokogiri (~> 1.6.6.2) nokogiri (~> 1.6.6.2)
nprogress-rails (~> 0.1.6.7) nprogress-rails (~> 0.1.6.7)
paper_trail! paper_trail!

1
config/application-example.yml
View file

@ -9,6 +9,7 @@ time_zone: 'Tallinn' # more zones by rake time:zones:all
# New Relic app name, keep only current mode, remove other names. # New Relic app name, keep only current mode, remove other names.
# Example: 'Admin, EPP, REPP' will have name 'Admin, EPP, REPP - production' at New Relic. # Example: 'Admin, EPP, REPP' will have name 'Admin, EPP, REPP - production' at New Relic.
new_relic_app_name: 'Admin, EPP, REPP, Registrar, Registrant' new_relic_app_name: 'Admin, EPP, REPP, Registrar, Registrant'
new_relic_license_key: '42d1c2ba4ed17a9cf6297c59d80e563a3dd3c4fa'
# You can use `rake secret` to generate a secure secret key. # You can use `rake secret` to generate a secure secret key.
# Your secret key is used for verifying the integrity of signed cookies. # Your secret key is used for verifying the integrity of signed cookies.

4
config/initializers/new_relic_app_name.rb
View file

@ -1,4 +0,0 @@
if !Rails.env.test? && ENV['new_relic_app_name'].present?
require 'newrelic'
NewRelic::Agent.config[:app_name] = "#{ENV['new_relic_app_name']} - #{Rails.env}"
end

7
config/newrelic.yml
View file

@ -15,7 +15,7 @@ common: &default_settings
# You must specify the license key associated with your New Relic # You must specify the license key associated with your New Relic
# account. This key binds your Agent's data to your account in the # account. This key binds your Agent's data to your account in the
# New Relic service. # New Relic service.
license_key: '42d1c2ba4ed17a9cf6297c59d80e563a3dd3c4fa' license_key: <%= ENV['new_relic_license_key'] || '42d1c2ba4ed17a9cf6297c59d80e563a3dd3c4fa' %>
# Agent Enabled (Ruby/Rails Only) # Agent Enabled (Ruby/Rails Only)
# Use this setting to force the agent to run or not run. # Use this setting to force the agent to run or not run.
@ -49,7 +49,7 @@ common: &default_settings
# See https://newrelic.com/docs/site/renaming-applications for more details # See https://newrelic.com/docs/site/renaming-applications for more details
# on renaming your New Relic applications. # on renaming your New Relic applications.
# #
app_name: Registry app_name: <%= "#{ENV['new_relic_app_name']} - #{Rails.env}" %>
# When "true", the agent collects performance data about your # When "true", the agent collects performance data about your
# application and reports this data to the New Relic service at # application and reports this data to the New Relic service at
@ -192,7 +192,6 @@ development:
<<: *default_settings <<: *default_settings
# Turn on communication to New Relic service in development mode # Turn on communication to New Relic service in development mode
monitor_mode: false monitor_mode: false
app_name: Registry (Development)
# Rails Only - when running in Developer Mode, the New Relic Agent will # Rails Only - when running in Developer Mode, the New Relic Agent will
# present performance information on the last 100 transactions you have # present performance information on the last 100 transactions you have
@ -213,7 +212,6 @@ test:
alpha: alpha:
<<: *default_settings <<: *default_settings
monitor_mode: true monitor_mode: true
app_name: Registry (Alpha)
# Many applications have a staging environment which behaves # Many applications have a staging environment which behaves
# identically to production. Support for that environment is provided # identically to production. Support for that environment is provided
@ -221,7 +219,6 @@ alpha:
staging: staging:
<<: *default_settings <<: *default_settings
monitor_mode: true monitor_mode: true
app_name: Registry (Staging)
# Turn on the agent in production for 24x7 monitoring. NewRelic # Turn on the agent in production for 24x7 monitoring. NewRelic
# testing shows an average performance impact of < 5 ms per # testing shows an average performance impact of < 5 ms per