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

Story #107192666 - change setting value and symbol, admin configures ds_digest_type

Browse source
This commit is contained in:
Matt Farnsworth 2015-11-24 13:23:01 +02:00
parent bcf38e55ad
commit 88973c5241
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/settings_controller.rb
View file

@ -51,7 +51,7 @@ class Admin::SettingsController < AdminController
:admin_contacts_max_count, :admin_contacts_max_count,
:tech_contacts_min_count, :tech_contacts_min_count,
:tech_contacts_max_count, :tech_contacts_max_count,
:ds_algorithm, :ds_digest_type,
:dnskeys_min_count, :dnskeys_min_count,
:dnskeys_max_count, :dnskeys_max_count,
:ns_min_count, :ns_min_count,

2
app/models/dnskey.rb
View file

@ -69,7 +69,7 @@ class Dnskey < ActiveRecord::Base
def generate_digest def generate_digest
return unless flags == 257 || flags == 256 # require ZoneFlag, but optional SecureEntryPoint return unless flags == 257 || flags == 256 # require ZoneFlag, but optional SecureEntryPoint
self.ds_alg = alg self.ds_alg = alg
self.ds_digest_type = Setting.ds_algorithm if ds_digest_type.blank? || !DS_DIGEST_TYPE.include?(ds_digest_type) self.ds_digest_type = Setting.ds_digest_type if self.ds_digest_type.blank? || !DS_DIGEST_TYPE.include?(ds_digest_type)
flags_hex = self.class.int_to_hex(flags) flags_hex = self.class.int_to_hex(flags)
protocol_hex = self.class.int_to_hex(protocol) protocol_hex = self.class.int_to_hex(protocol)

4
app/views/admin/settings/index.haml
View file

@ -47,8 +47,8 @@
%th{class: 'col-xs-6'}= t(:setting) %th{class: 'col-xs-6'}= t(:setting)
%th{class: 'col-xs-6'}= t(:value) %th{class: 'col-xs-6'}= t(:value)
%tbody %tbody
/= render 'setting_row', var: :transfer_wait_time = render 'setting_row', var: :transfer_wait_time
= render 'setting_row', var: :ds_algorithm = render 'setting_row', var: :ds_digest_type
= render 'setting_row', var: :client_side_status_editing_enabled = render 'setting_row', var: :client_side_status_editing_enabled
= render 'setting_row', var: :api_ip_whitelist_enabled = render 'setting_row', var: :api_ip_whitelist_enabled
= render 'setting_row', var: :registrar_ip_whitelist_enabled = render 'setting_row', var: :registrar_ip_whitelist_enabled

2
config/initializers/initial_settings.rb
View file

@ -12,7 +12,7 @@ if con.present? && con.table_exists?('settings')
Setting.save_default(:tech_contacts_max_count, 10) Setting.save_default(:tech_contacts_max_count, 10)
Setting.save_default(:expire_pending_confirmation, 48) Setting.save_default(:expire_pending_confirmation, 48)
Setting.save_default(:ds_algorithm, 2) Setting.save_default(:ds_digest_type, 2)
Setting.save_default(:ds_data_allowed, false) Setting.save_default(:ds_data_allowed, false)
Setting.save_default(:key_data_allowed, true) Setting.save_default(:key_data_allowed, true)

2
config/locales/en.yml
View file

@ -443,7 +443,7 @@ en:
ds_data_allowed: 'DS data allowed' ds_data_allowed: 'DS data allowed'
ds_data_with_key_allowed: 'Allow DS data with key' ds_data_with_key_allowed: 'Allow DS data with key'
key_data_allowed: 'Allow key data' key_data_allowed: 'Allow key data'
ds_algorithm: 'DS algorithm' ds_digest_type: 'DS digest type'
zonefile_settings: 'Zonefile settings' zonefile_settings: 'Zonefile settings'
background_jobs: Background jobs background_jobs: Background jobs
domain_history: Domain history domain_history: Domain history