From aec35cbabecdbfba3eb13c961f39a37d8828eabf Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 2 Nov 2016 00:30:51 +0200 Subject: [PATCH 1/6] Remove new relic config #203 --- config/application-example.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/config/application-example.yml b/config/application-example.yml index 4db92097f..9bdfb56f8 100644 --- a/config/application-example.yml +++ b/config/application-example.yml @@ -22,12 +22,12 @@ smtp_enable_starttls_auto: 'true' # 'false' # If your mail server requires authentication, please change. smtp_authentication: 'plain' # 'plain', 'login', 'cram_md5' registrant_url: 'https:/registrant.example.com' # for valid email body registrant links -# Staging env does not send any emails unless they are whitelisted +# Staging env does not send any emails unless they are whitelisted whitelist_emails_for_staging: > - test@example.org, + test@example.org, old@example.org, - new@example.org, - old@example.com, + new@example.org, + old@example.com, new@example.com # @@ -110,11 +110,6 @@ sk_digi_doc_service_name: 'EIS test' # # MISC -# -# 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. -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. # Your secret key is used for verifying the integrity of signed cookies. From 106ee20f7ccb31f76e7195eeeb9fbb111d100413 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 2 Nov 2016 00:31:27 +0200 Subject: [PATCH 2/6] Update readme and changelog #203 --- CHANGELOG.md | 3 +++ README.md | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89abb51bd..0b0cce516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ 25.10.2016 * Outdated specs removed, failing specs fixed, rspec config improved +20.10.2016 +* Travis CI integration added + 19.10.2016 * BUG fix: Record current time for outzone on domain:delete EPP request * ForceDelete automatic notice: fixed et and ee wording to reflect the date the domain is actually deleted. diff --git a/README.md b/README.md index 1af56f5e9..0f40284b6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ Domain Registry =============== +[![Build Status](https://travis-ci.org/internetee/registry.svg?branch=master)](https://travis-ci.org/internetee/registry) Full stack top-level domain (TLD) management. @@ -404,6 +405,10 @@ sudo apt-get install libxext-dev libxrender1 fontconfig * [Testing](/doc/testing.md) +### Travis CI + +* Travis is configured to build against master and staging branches by default. +* Notification emails are sent to committer by default. ### EPP web client From a1da7a547e8aceb646f7e84aaf75d07a92460af8 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 2 Nov 2016 00:32:47 +0200 Subject: [PATCH 3/6] Build master branch on travis #203 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 30ee49737..4e6723544 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,4 +20,5 @@ addons: postgresql: "9.4" branches: only: + - master - staging From e3582d336cdf6b860c8491c03415c6ef4e5c3784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Wed, 2 Nov 2016 15:12:23 +0200 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b0cce516..49cd0b4e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ * Outdated specs removed, failing specs fixed, rspec config improved 20.10.2016 -* Travis CI integration added +* Travis CI integration added, New Relic removed 19.10.2016 * BUG fix: Record current time for outzone on domain:delete EPP request From 7cfb460401c8a7ce5ff9dd428142da67d29036dd Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 3 Nov 2016 16:18:06 +0200 Subject: [PATCH 5/6] Remove staging env config #219 --- config/environments/staging.rb | 91 ---------------------------------- 1 file changed, 91 deletions(-) delete mode 100644 config/environments/staging.rb diff --git a/config/environments/staging.rb b/config/environments/staging.rb deleted file mode 100644 index 242cc29df..000000000 --- a/config/environments/staging.rb +++ /dev/null @@ -1,91 +0,0 @@ -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # Code is not reloaded between requests. - config.cache_classes = true - - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both threaded web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. - config.eager_load = true - - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Enable Rack::Cache to put a simple HTTP cache in front of your application - # Add `rack-cache` to your Gemfile before enabling this. - # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. - # config.action_dispatch.rack_cache = true - - # Disable Rails's static asset server (Apache or nginx will already do this). - config.serve_static_files = false - - # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier - # config.assets.css_compressor = :sass - - # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false - - # Generate digests for assets URLs. - config.assets.digest = true - - # Version of your assets, change this if you want to expire all your assets. - config.assets.version = '1.0' - - # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # Set to :debug to see everything in the log. - config.log_level = :debug - - # Prepend all log lines with the following tags. - config.log_tags = [:subdomain, :uuid, :remote_ip] - - # Use a different logger for distributed setups. - config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new(ENV['app_name'] || 'registry')) - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = "http://assets.example.com" - - # Precompile additional assets. - # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. - # config.assets.precompile += %w( search.js ) - - # Ignore bad email addresses and do not raise email delivery errors. - # Set this to true and configure the email server for immediate delivery to raise delivery errors. - # config.action_mailer.raise_delivery_errors = false - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :log - - # Disable automatic flushing of the log to improve performance. - # config.autoflush_log = false - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new - - # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false - - # TODO: Change this: - config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } -end - -# In off mode, queueing a job will simply insert it into the database - -# the current process will make no effort to run it. -# You should use this if you want to use a dedicated process to work tasks -Que.mode = :off From 39976405c3562940efb3095da23c950941330b10 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 3 Nov 2016 16:19:15 +0200 Subject: [PATCH 6/6] Introduce staging env config sample #219 --- config/environments/staging-example.rb | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/environments/staging-example.rb diff --git a/config/environments/staging-example.rb b/config/environments/staging-example.rb new file mode 100644 index 000000000..8af2ff60d --- /dev/null +++ b/config/environments/staging-example.rb @@ -0,0 +1 @@ +require_relative 'production'