Project

General

Profile

« Previous | Next » 

Revision 302f2403

Added by Martin Milata over 9 years ago

Remove default faf ssl settings

Why did we even have them in the first place?

View differences:

app/models/setting/abrt.rb
def self.load_defaults
return unless super
fqdn = Facter.value(:fqdn) || SETTINGS[:fqdn]
lower_fqdn = fqdn.downcase
# Try taking the provisioning SSL setup for default
ssl_cert = Setting[:ssl_certificate] || "#{SETTINGS[:puppetvardir]}/ssl/certs/#{lower_fqdn}.pem"
ssl_ca_file = Setting[:ssl_ca_file] || "#{SETTINGS[:puppetvardir]}/ssl/certs/ca.pem"
ssl_priv_key = Setting[:ssl_priv_key] || "#{SETTINGS[:puppetvardir]}/ssl/private_keys/#{lower_fqdn}.pem"
Setting.transaction do
[
self.set('abrt_server_url', N_('URL of the ABRT server to send reports to'), 'https://localhost/faf'),
self.set('abrt_server_verify_ssl', N_('Verify ABRT server certificate?'), true),
self.set('abrt_server_ssl_certificate', N_('SSL certificate path that Foreman would use to communicate with ABRT server'), ssl_cert),
self.set('abrt_server_ssl_priv_key', N_('SSL private key path that Foreman would use to communicate with ABRT server'), ssl_priv_key),
self.set('abrt_server_ssl_ca_file', N_('SSL CA file that Foreman will use to communicate with ABRT server'), ssl_ca_file),
self.set('abrt_server_ssl_certificate', N_('SSL certificate path that Foreman would use to communicate with ABRT server'), ''),
self.set('abrt_server_ssl_priv_key', N_('SSL private key path that Foreman would use to communicate with ABRT server'), ''),
self.set('abrt_server_ssl_ca_file', N_('SSL CA file that Foreman will use to communicate with ABRT server'), ''),
self.set('abrt_automatically_forward', N_('Automatically send every report to an ABRT server for analysis?'), false),
].compact.each { |s| self.create s.update(:category => 'Setting::Abrt') }
end

Also available in: Unified diff