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

This commit is contained in:
Priit Tark 2015-03-27 14:44:05 +02:00
commit 71d3d9011a
3 changed files with 22 additions and 9 deletions

View file

@ -1,3 +1,7 @@
27.03.2015
* Integrated DEPP engine to Registrar. Please note new DEPP configuration in application-example.yml
25.03.2015 25.03.2015
* Added new cronjob for destroying orphaned contacts. Update cron by running `mina cron:setup` in registry project * Added new cronjob for destroying orphaned contacts. Update cron by running `mina cron:setup` in registry project

View file

@ -44,16 +44,15 @@
%li= link_to t('log_out', user: current_user), '/registrar/logout' %li= link_to t('log_out', user: current_user), '/registrar/logout'
/ /.nav-collapse / /.nav-collapse
/ = yield :tabs
/ .container
/ = render 'depp/shared/flash'
/ = render 'depp/shared/epp_results'
/ = yield
.container .container
- display = (flash.empty?) ? 'none' : 'block' - if params[:controller].start_with?('depp/')
#flash{style: "display: #{display};"} = render 'depp/shared/flash'
- type = (flash[:notice]) ? 'bg-success' : 'bg-danger' = render 'depp/shared/epp_results'
.alert{class: type}= flash[:notice] || flash[:alert] - else
- display = (flash.empty?) ? 'none' : 'block'
#flash{style: "display: #{display};"}
- type = (flash[:notice]) ? 'bg-success' : 'bg-danger'
.alert{class: type}= flash[:notice] || flash[:alert]
= yield = yield
.footer.text-right .footer.text-right

View file

@ -23,6 +23,16 @@ ca_key_password: 'your-root-key-password'
# Used only by EPP server, you can leave it empty when running admin server: # Used only by EPP server, you can leave it empty when running admin server:
webclient_ip: '127.0.0.1' webclient_ip: '127.0.0.1'
# DEPP configuration
show_ds_data_fields: 'false'
default_nameservers_count: '2'
default_admin_contacts_count: '1'
epp_port: '700'
cert_path: '/home/registry/registry/shared/ca/certs/webclient.cert.pem'
key_path: '/home/registry/registry/shared/ca/private/webclient.key.pem'
epp_hostname: 'registry.gitlab.eu'
repp_url: 'https://repp.gitlab.eu/repp/v1/'
# autotest config overwrites # autotest config overwrites
test: test:
webclient_ip: '127.0.0.1' # it should match to localhost ip address webclient_ip: '127.0.0.1' # it should match to localhost ip address