diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ed888140..c11607bb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +27.03.2015 + +* Integrated DEPP engine to Registrar. Please note new DEPP configuration in application-example.yml + 25.03.2015 * Added new cronjob for destroying orphaned contacts. Update cron by running `mina cron:setup` in registry project diff --git a/app/views/layouts/depp/application.haml b/app/views/layouts/depp/application.haml index 7a87a12f7..c28f83a1e 100644 --- a/app/views/layouts/depp/application.haml +++ b/app/views/layouts/depp/application.haml @@ -44,16 +44,15 @@ %li= link_to t('log_out', user: current_user), '/registrar/logout' / /.nav-collapse - / = yield :tabs - / .container - / = render 'depp/shared/flash' - / = render 'depp/shared/epp_results' - / = yield .container - - display = (flash.empty?) ? 'none' : 'block' - #flash{style: "display: #{display};"} - - type = (flash[:notice]) ? 'bg-success' : 'bg-danger' - .alert{class: type}= flash[:notice] || flash[:alert] + - if params[:controller].start_with?('depp/') + = render 'depp/shared/flash' + = render 'depp/shared/epp_results' + - 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 .footer.text-right diff --git a/config/application-example.yml b/config/application-example.yml index 3e621f04a..8576d54ec 100644 --- a/config/application-example.yml +++ b/config/application-example.yml @@ -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: 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 test: webclient_ip: '127.0.0.1' # it should match to localhost ip address