From b3c0b5d824cfd5d166713ca1e24648170e62f969 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 20 Jan 2015 10:25:08 +0200 Subject: [PATCH 01/10] Don't load test related tasks in other env --- lib/tasks/test.rake | 66 +++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake index e8dc5ccfa..20e3f5f91 100644 --- a/lib/tasks/test.rake +++ b/lib/tasks/test.rake @@ -1,43 +1,45 @@ begin - require 'rspec/core/rake_task' - require 'open3' + if Rails.env.test? || Rails.env.development? + require 'rspec/core/rake_task' + require 'open3' - desc 'Run all specs against server' - task 'test' do - test_against_server { Rake::Task['spec'].invoke } - end + desc 'Run all specs against server' + task 'test' do + test_against_server { Rake::Task['spec'].invoke } + end - desc 'Run EPP specs against server' - task 'test:epp' do - test_against_server { Rake::Task['spec:epp'].invoke } - end + desc 'Run EPP specs against server' + task 'test:epp' do + test_against_server { Rake::Task['spec:epp'].invoke } + end - desc 'Run all but EPP specs' - RSpec::Core::RakeTask.new('test:other') do |t| - t.rspec_opts = '--tag ~epp' - end + desc 'Run all but EPP specs' + RSpec::Core::RakeTask.new('test:other') do |t| + t.rspec_opts = '--tag ~epp' + end - desc 'Run all but EPP specs' - RSpec::Core::RakeTask.new('test:all_but_features') do |t| - t.rspec_opts = '--tag ~feature' - end + desc 'Run all but EPP specs' + RSpec::Core::RakeTask.new('test:all_but_features') do |t| + t.rspec_opts = '--tag ~feature' + end - desc 'Generate EPP doc from specs' - RSpec::Core::RakeTask.new('test:epp_doc') do |t| - ENV['EPP_DOC'] = 'true' - t.rspec_opts = '--tag epp --require support/epp_doc.rb --format EppDoc' - end + desc 'Generate EPP doc from specs' + RSpec::Core::RakeTask.new('test:epp_doc') do |t| + ENV['EPP_DOC'] = 'true' + t.rspec_opts = '--tag epp --require support/epp_doc.rb --format EppDoc' + end - Rake::Task[:default].prerequisites.clear - task default: :test + Rake::Task[:default].prerequisites.clear + task default: :test - def test_against_server - _stdin, _stdout, _stderr, wait_thr = Open3.popen3('unicorn -E test -p 8989') - pid = wait_thr.pid - begin - yield - ensure - `kill #{pid}` + def test_against_server + _stdin, _stdout, _stderr, wait_thr = Open3.popen3('unicorn -E test -p 8989') + pid = wait_thr.pid + begin + yield + ensure + `kill #{pid}` + end end end rescue LoadError => e From 821b29273c7545d39551e415c46a4e5f3d63bd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 20 Jan 2015 11:03:30 +0200 Subject: [PATCH 02/10] Update domain.md Table design changes to improve readability ie first column in one line, Mardown Extra table design best practices (https://github.com/carwin/markdown-styleguide) --- doc/epp/domain.md | 214 +++++++++++++++++++++++----------------------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/doc/epp/domain.md b/doc/epp/domain.md index 50b68a32f..be6fa5547 100644 --- a/doc/epp/domain.md +++ b/doc/epp/domain.md @@ -2,142 +2,142 @@ ### Domain create -| Field name | Min-max | Field description | -| ----------------------- |---------|------------------ | -| `` | 1 | | -| `-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" | -| `--` | 1 | Domain name. Can contain unicode characters. | -| `--` | 0-1 | Registration period for domain. Must add up to 1 / 2 / 3 years. Attribute: unit="y/m/d"| -| `--` | 1 | Contact reference to the registrant | -| `--` | 0-n | Contact reference. Admin contact is required if registrant is a juridical person. Attribute: type="admin / tech" | -| `--` | 1 | | -| `---` | 2-11 | | -| `----` | 1 | Hostname of the nameserver | -| `----` | 0-2 | Required if nameserver is under domain zone. Attribute ip="v4 / v6" | -| `` | 1 | | -| `-` | 0-1 | Attribute: xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" | -| `--` | 1-n | | -| `---` | 1 | Allowed values: 0, 256, 257 | -| `---` | 1 | Allowed values: 3 | -| `---` | 1 | Allowed values: 3, 5, 6, 7, 8, 252, 253, 254, 255 | -| `---` | 1 | Public key | -| `-` | 1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" | -| `--` | 1 | Base64 encoded document. Attribute: type="pdf" | -| `` | 0-1 | Client transaction id | +Field name | Min-max | Field description +----------------------- | ------- | ----------------- +`` | 1 | +`-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" +`--` | 1 | Domain name. Can contain unicode characters. +`--` | 0-1 | Registration period for domain. Must add up to 1 / 2 / 3 years.
Attribute: unit="y/m/d" +`--` | 1 | Contact reference to the registrant +`--` | 0-n | Contact reference. Admin contact is required if registrant is a
juridical person. Attribute: type="admin / tech" +`--` | 1 | +`---` | 2-11 | +`----` | 1 | Hostname of the nameserver +`----` | 0-2 | Required if nameserver is under domain zone. Attribute ip="v4 / v6" +`` | 1 | +`-` | 0-1 | Attribute: xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" +`--` | 1-n | +`---` | 1 | Allowed values: 0, 256, 257 +`---` | 1 | Allowed values: 3 +`---` | 1 | Allowed values: 3, 5, 6, 7, 8, 252, 253, 254, 255 +`---` | 1 | Public key +`-` | 1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" +`--` | 1 | Base64 encoded document. Attribute: type="pdf" +`` | 0-1 | Client transaction id [EXAMPLE REQUEST AND RESPONSE](/doc/epp-doc.md#epp-domain-with-valid-user-with-citizen-as-an-owner-creates-a-domain) ### Domain update -| Field name | Min-max | Field description | -| ------------------------ |---------|------------------ | -| `` | 1 | | -| `-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" | -| `--` | 1 | Domain name. Can contain unicode characters. | -| `--` | 0-1 | Attributes to change | -| `---` | 0-1 | Contact reference to the registrant | -| `--` | 0-1 | Objects to add | -| `---` | 0-n | Contact reference. Attribute: type="admin / tech" | -| `---` | 0-n | Status description. Attribute: s="clientDeleteProhibited / clientHold / clientRenewProhibited / clientTransferProhibited / clientUpdateProhibited" | -| `---` | 0-1 | | -| `----` | 1 | | -| `-----` | 1 | Hostname of the nameserver | -| `-----` | 0-2 | Required if nameserver is under domain zone. Attribute ip="v4 / v6" | -| `--` | 0-1 | Objects to remove | -| `---` | 0-n | Contact reference. Attribute: type="admin / tech" | -| `---` | 0-n | Attribute: s="clientDeleteProhibited / clientHold / clientRenewProhibited / clientTransferProhibited / clientUpdateProhibited" | -| `---` | 0-1 | | -| `----` | 1 | | -| `-----` | 1 | Hostname of the nameserver | -| `` | 0-1 | Required if registrant is changing | -| `-` | 0-1 | Attribute: xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" | -| `--` | 0-1 | | -| `---` | 1-n | | -| `----` | 1 | Allowed values: 0, 256, 257 | -| `----` | 1 | Allowed values: 3 | -| `----` | 1 | Allowed values: 3, 5, 6, 7, 8, 252, 253, 254, 255 | -| `----` | 1 | Public key | -| `--` | 0-1 | | -| `---` | 1-n | | -| `----` | 1 | Public key | -| `-` | 0-1 | Required if registrant is changing. Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" | -| `--` | 1 | Base64 encoded document. Attribute: type="pdf" | -| `` | 0-1 | Client transaction id | +Field name | Min-max | Field description +------------------------ | -------- | ----------------- +`` | 1 | +`-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" +`--` | 1 | Domain name. Can contain unicode characters. +`--` | 0-1 | Attributes to change +`---` | 0-1 | Contact reference to the registrant +`--` | 0-1 | Objects to add +`---` | 0-n | Contact reference. Attribute: type="admin / tech" +`---` | 0-n | Status description. Attribute: s="clientDeleteProhibited / clientHold /
clientRenewProhibited / clientTransferProhibited / clientUpdateProhibited" +`---` | 0-1 | +`----` | 1 | +`-----` | 1 | Hostname of the nameserver +`-----` | 0-2 | Required if nameserver is under domain zone. Attribute ip="v4 / v6" +`--` | 0-1 | Objects to remove +`---` | 0-n | Contact reference. Attribute: type="admin / tech" +`---` | 0-n | Attribute: s="clientDeleteProhibited / clientHold / clientRenewProhibited /
clientTransferProhibited / clientUpdateProhibited" +`---` | 0-1 | +`----` | 1 | +`-----` | 1 | Hostname of the nameserver +`` | 0-1 | Required if registrant is changing +`-` | 0-1 | Attribute: xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" +`--` | 0-1 | +`---` | 1-n | +`----` | 1 | Allowed values: 0, 256, 257 +`----` | 1 | Allowed values: 3 +`----` | 1 | Allowed values: 3, 5, 6, 7, 8, 252, 253, 254, 255 +`----` | 1 | Public key +`--` | 0-1 | +`---` | 1-n | +`----` | 1 | Public key +`-` | 0-1 | Required if registrant is changing.
Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" +`--` | 1 | Base64 encoded document. Attribute: type="pdf" +`` | 0-1 | Client transaction id [EXAMPLE REQUEST AND RESPONSE](/doc/epp-doc.md#epp-domain-with-valid-user-with-valid-domain-updates-domain-and-adds-objects) ### Domain delete -| Field name | Min-max | Field description | -| ----------------------- |---------|------------------ | -| `` | 1 | | -| `-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" | -| `--` | 1 | Domain name. Can contain unicode characters. | -| `` | 1 | | -| `-` | 1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" | -| `--` | 1 | Base64 encoded document. Attribute: type="pdf" | -| `` | 0-1 | Client transaction id | +Field name | Min-max | Field description +----------------------- | ------- | ----------------- +`` | 1 | +`-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" +`--` | 1 | Domain name. Can contain unicode characters. +`` | 1 | +`-` | 1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" +`--` | 1 | Base64 encoded document. Attribute: type="pdf" +`` | 0-1 | Client transaction id [EXAMPLE REQUEST AND RESPONSE](/doc/epp-doc.md#epp-domain-with-valid-user-with-valid-domain-deletes-domain) ### Domain info -| Field name | Min-max | Field description | -| ----------------------- |---------|------------------ | -| `` | 1 | | -| `-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" | -| `--` | 1 | Domain name. Can contain unicode characters. Attribute: hosts="all / TODO" | -| `--` | 0-1 | Required if registrar is not the owner of the domain. | -| `---` | 1 | Domain password. Attribute: roid="String" | -| `` | 0-1 | | -| `-` | 0-1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" | -| `--` | 1 | Base64 encoded document. Attribute: type="pdf" | -| `` | 0-1 | Client transaction id | +Field name | Min-max | Field description +----------------------- | ------- | ----------------- +`` | 1 | +`-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" +`--` | 1 | Domain name. Can contain unicode characters.
Attribute: hosts="all / TODO" +`--` | 0-1 | Required if registrar is not the owner of the domain. +`---` | 1 | Domain password. Attribute: roid="String" +`` | 0-1 | +`-` | 0-1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" +`--` | 1 | Base64 encoded document. Attribute: type="pdf" +`` | 0-1 | Client transaction id [EXAMPLE REQUEST AND RESPONSE](/doc/epp-doc.md#epp-domain-with-valid-user-with-valid-domain-returns-domain-info) ### Domain renew -| Field name | Min-max | Field description | -| ----------------------- |---------|------------------ | -| `` | 1 | | -| `-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" | -| `--` | 1 | Domain name. Can contain unicode characters. Attribute: hosts="all / TODO" | -| `--` | 1 | Current expiry date (ISO8601 format) | -| `--` | 1 | Registration period for domain. Must add up to 1 / 2 / 3 years. Attribute: unit="y/m/d" | -| `` | 0-1 | | -| `-` | 0-1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" | -| `--` | 1 | Base64 encoded document. Attribute: type="pdf" | -| `` | 0-1 | Client transaction id | +Field name | Min-max | Field description +----------------------- | ------- | ----------------- +`` | 1 | +`-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" +`--` | 1 | Domain name. Can contain unicode characters.
Attribute: hosts="all / TODO" +`--` | 1 | Current expiry date (ISO8601 format) +`--` | 1 | Registration period for domain. Must add up to 1 / 2 / 3 years.
Attribute: unit="y/m/d" +`` | 0-1 | +`-` | 0-1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" +`--` | 1 | Base64 encoded document. Attribute: type="pdf" +`` | 0-1 | Client transaction id [EXAMPLE REQUEST AND RESPONSE](/doc/epp-doc.md#epp-domain-with-valid-user-with-valid-domain-renews-a-domain) ### Domain transfer -| Field name | Min-max | Field description | -| ----------------------- |---------|------------------ | -| `` | 1 | | -| `-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" | -| `--` | 1 | Domain name. Can contain unicode characters. Attribute: hosts="all / TODO" | -| `--` | 1 | | -| `---` | 1 | Domain password. Attribute: roid="String" | -| `` | 0-1 | | -| `-` | 0-1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" | -| `--` | 1 | Base64 encoded document. Attribute: type="pdf" | -| `` | 0-1 | Client transaction id | +Field name | Min-max | Field description +----------------------- | ------- | ----------------- +`` | 1 | +`-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" +`--` | 1 | Domain name. Can contain unicode characters.
Attribute: hosts="all / TODO" +`--` | 1 | +`---` | 1 | Domain password. Attribute: roid="String" +`` | 0-1 | +`-` | 0-1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" +`--` | 1 | Base64 encoded document. Attribute: type="pdf" +`` | 0-1 | Client transaction id [EXAMPLE REQUEST AND RESPONSE](/doc/epp-doc.md#epp-domain-with-valid-user-with-two-epp-users-transfers-a-domain) ### Domain check -| Field name | Min-max | Field description | -| ----------------------- |---------|------------------ | -| `` | 1 | | -| `-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" | -| `--` | 1 | Domain name. Can contain unicode characters. Attribute: hosts="all / TODO" | -| `` | 0-1 | | -| `-` | 0-1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" | -| `--` | 1 | Base64 encoded document. Attribute: type="pdf" | -| `` | 0-1 | Client transaction id | +Field name | Min-max | Field description +----------------------- | ------- | ----------------- +`` | 1 | +`-` | 1 | Attribute: xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" +`--` | 1 | Domain name. Can contain unicode characters.
Attribute: hosts="all / TODO" +`` | 0-1 | +`-` | 0-1 | Attribute: xmlns:eis="urn:ee:eis:xml:epp:eis-1.0" +`--` | 1 | Base64 encoded document. Attribute: type="pdf" +`` | 0-1 | Client transaction id [EXAMPLE REQUEST AND RESPONSE](/doc/epp-doc.md#epp-domain-with-valid-user-checks-a-domain) From 3c64c11dc2234c065727500468be1bec48909d53 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 20 Jan 2015 12:46:20 +0200 Subject: [PATCH 03/10] Added epp deploy --- config/deploy.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/config/deploy.rb b/config/deploy.rb index 0884e6140..ea88266b3 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -33,6 +33,14 @@ task :st do set :branch, 'master' # same as production end +# staging +task :stepp do + set :domain, 'registry-st' + set :deploy_to, '$HOME/epp' + set :repository, 'https://github.com/internetee/registry' # production repo + set :branch, 'master' # same as production +end + # production task :pr do set :domain, 'registry' @@ -41,6 +49,15 @@ task :pr do set :branch, 'master' # same as staging end +# production +task :prepp do + set :domain, 'registry' + set :deploy_to, '$HOME/epp' + set :repository, 'https://github.com/internetee/registry' # production repo + set :branch, 'master' # same as staging +end + + # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server. # They will be linked in the 'deploy:link_shared_paths' step. set :shared_paths, [ From d3669892f2d217ae323873cbcbf9d1aa7c864522 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 20 Jan 2015 12:50:24 +0200 Subject: [PATCH 04/10] added epp domains to deploy --- config/deploy.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index ea88266b3..c6d506ba2 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -35,7 +35,7 @@ end # staging task :stepp do - set :domain, 'registry-st' + set :domain, 'registry-st-epp' set :deploy_to, '$HOME/epp' set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'master' # same as production @@ -51,7 +51,7 @@ end # production task :prepp do - set :domain, 'registry' + set :domain, 'registry-epp' set :deploy_to, '$HOME/epp' set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'master' # same as staging From 910aabc4375369ba8f67ded954b1f94a3e242782 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 20 Jan 2015 12:52:19 +0200 Subject: [PATCH 05/10] epp domains renamed --- config/deploy.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index c6d506ba2..60a1b4e24 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -35,7 +35,7 @@ end # staging task :stepp do - set :domain, 'registry-st-epp' + set :domain, 'epp-st' set :deploy_to, '$HOME/epp' set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'master' # same as production @@ -51,7 +51,7 @@ end # production task :prepp do - set :domain, 'registry-epp' + set :domain, 'epp' set :deploy_to, '$HOME/epp' set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'master' # same as staging From ff236a9d1b64872045d49c670dea2adfb21543b7 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 20 Jan 2015 13:02:11 +0200 Subject: [PATCH 06/10] Readme update --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d9cc0a649..147dc77ef 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,6 @@ Production install (database schema should be loaded and seeds should be present cd registry cp current/config/application-example.yml shared/config/application.yml # and edit it cp current/config/database-example.yml shared/config/database.yml # and edit it - cp current/config/initializers/devise_secret_example.rb.txt shared/config/initializers/devise_secret.rb # and edit it vi /etc/apache2/sites-enabled/registry.conf # add conf and all needed serts vi /etc/apache2/sites-enabled/epp.conf # add epp conf, restart apache From 78c07613d661baa885cb13e73437e7168e587587 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 20 Jan 2015 13:30:48 +0200 Subject: [PATCH 07/10] Added mina cron:setup and mina cron:clear --- CHANGELOG.md | 3 +++ README.md | 5 +++-- config/deploy.rb | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 995c8ec75..60dca9174 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +20.01.2015 + +* Added dedicated mina cron:setup Now cron is not updated automatically and should update manually. 19.01.2015 * Added application-exapmle.yml and removed application.yml from repo, please diff --git a/README.md b/README.md index 147dc77ef..e601b62a7 100644 --- a/README.md +++ b/README.md @@ -201,9 +201,10 @@ Deployment CRON ---- -Crontab is automatically updated after each deploy. Jobs can be viewed [here](https://github.com/internetee/registry/blob/master/config/schedule.rb). +Crontab can be setup after deploy. Jobs can be viewed [here](https://github.com/internetee/registry/blob/master/config/schedule.rb). -Alternatively you can run `mina pr whenever:update` to update the crontab. + mina pr cron:setup # to update the crontab. + mina pr cron:clear # to clear crontab. Autotesting ----------- diff --git a/config/deploy.rb b/config/deploy.rb index 60a1b4e24..0d86bf505 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -125,7 +125,6 @@ task deploy: :environment do invoke :'rails:db_migrate' invoke :'rails:assets_precompile' to :launch do - invoke :'whenever:update' invoke :restart end end @@ -139,7 +138,6 @@ task rollback: :environment do ls -Art "#{deploy_to}/releases" | sort | tail -n 2 | head -n 1 | xargs -I active ln -nfs "#{deploy_to}/releases/active" "#{deploy_to}/current" ) - invoke :'whenever:update' to :launch do invoke :restart end @@ -158,6 +156,20 @@ task restart: :environment do queue "mkdir -p #{deploy_to}/current/tmp; touch #{deploy_to}/current/tmp/restart.txt" end +namespace :cron do + desc 'Setup cron tasks.' + task setup: :environment do + invoke :'rbenv:load' + invoke :'whenever:update' + end + + desc 'Clear cron tasks.' + task clear: :environment do + invoke :'rbenv:load' + invoke :'whenever:clear' + end +end + # For help in making your deploy script, see the Mina documentation: # # - http://nadarei.co/mina From 76bc5cea9c43330ee8f0a849b731226a430d93d3 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 20 Jan 2015 13:37:28 +0200 Subject: [PATCH 08/10] fix schema load --- lib/tasks/db.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index 4c627ea95..e77cba8c4 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -8,9 +8,9 @@ namespace :db do when databases.first 'schema.rb' when databases.second - 'api_log_schema.rb' - when databases.third 'whois_schema.rb' + when databases.third + 'api_log_schema.rb' end end From 0ab35aafb6f57db0c653135e34aadb8f4635b5a3 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 20 Jan 2015 13:38:13 +0200 Subject: [PATCH 09/10] fix schema load --- lib/tasks/db.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index e77cba8c4..3108ad02f 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -6,11 +6,11 @@ namespace :db do def schema_file(db) case db when databases.first - 'schema.rb' + 'api_log_schema.rb' when databases.second 'whois_schema.rb' when databases.third - 'api_log_schema.rb' + 'schema.rb' end end From e55ebe50bd01d61e75037f7b388a7e39534ef442 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 20 Jan 2015 16:51:47 +0200 Subject: [PATCH 10/10] renamed mina deploy commands --- config/deploy.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index 0d86bf505..f3afa7d86 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -34,7 +34,7 @@ task :st do end # staging -task :stepp do +task :eppst do set :domain, 'epp-st' set :deploy_to, '$HOME/epp' set :repository, 'https://github.com/internetee/registry' # production repo @@ -50,7 +50,7 @@ task :pr do end # production -task :prepp do +task :epppr do set :domain, 'epp' set :deploy_to, '$HOME/epp' set :repository, 'https://github.com/internetee/registry' # production repo