Commit 511f2df5 authored by Tim Smith's avatar Tim Smith
Browse files

Remove hash rockets

parent 5af05b4f
......@@ -16,7 +16,7 @@ module RsyslogCookbook
service_provider = 'ubuntu' == node['platform'] ? find_provider : nil
service node['rsyslog']['service_name'] do
supports :restart => true, :status => true
supports restart: true, status: true
action [:enable, :start]
provider service_provider
end
......
......@@ -20,115 +20,115 @@ source_url 'https://github.com/chef-cookbooks/rsyslog' if respond_to?(:source_ur
issues_url 'https://github.com/chef-cookbooks/rsyslog/issues' if respond_to?(:issues_url)
attribute 'rsyslog',
:display_name => 'Rsyslog',
:description => 'Hash of Rsyslog attributes',
:type => 'hash'
display_name: 'Rsyslog',
description: 'Hash of Rsyslog attributes',
type: 'hash'
attribute 'rsyslog/log_dir',
:display_name => 'Rsyslog Log Directory',
:description => 'Filesystem location of logs from clients',
:default => '/srv/rsyslog'
display_name: 'Rsyslog Log Directory',
description: 'Filesystem location of logs from clients',
default: '/srv/rsyslog'
attribute 'rsyslog/server',
:display_name => 'Rsyslog Server?',
:description => 'Is this node an rsyslog server?',
:default => 'false'
display_name: 'Rsyslog Server?',
description: 'Is this node an rsyslog server?',
default: 'false'
attribute 'rsyslog/server_ip',
:display_name => 'Rsyslog Server IP Address',
:description => 'Set rsyslog server ip address explicitly'
display_name: 'Rsyslog Server IP Address',
description: 'Set rsyslog server ip address explicitly'
attribute 'rsyslog/server_search',
:display_name => 'Rsyslog Server Search Criteria',
:description => 'Set the search criteria for rsyslog server resolving',
:default => 'role:loghost'
display_name: 'Rsyslog Server Search Criteria',
description: 'Set the search criteria for rsyslog server resolving',
default: 'role:loghost'
attribute 'rsyslog/protocol',
:display_name => 'Rsyslog Protocol',
:description => 'Set which network protocol to use for rsyslog',
:default => 'tcp'
display_name: 'Rsyslog Protocol',
description: 'Set which network protocol to use for rsyslog',
default: 'tcp'
attribute 'rsyslog/port',
:display_name => 'Rsyslog Port',
:description => 'Port that Rsyslog listens for incoming connections',
:default => '514'
display_name: 'Rsyslog Port',
description: 'Port that Rsyslog listens for incoming connections',
default: '514'
attribute 'rsyslog/remote_logs',
:display_name => 'Remote Logs',
:description => 'Specifies whether redirect all log from client to server',
:default => 'true'
display_name: 'Remote Logs',
description: 'Specifies whether redirect all log from client to server',
default: 'true'
attribute 'rsyslog/user',
:display_name => 'User',
:description => 'The owner of Rsyslog config files and directories',
:default => 'root'
display_name: 'User',
description: 'The owner of Rsyslog config files and directories',
default: 'root'
attribute 'rsyslog/group',
:display_name => 'Group',
:description => 'The group-owner of Rsyslog config files and directories',
:default => 'adm'
display_name: 'Group',
description: 'The group-owner of Rsyslog config files and directories',
default: 'adm'
attribute 'rsyslog/service_name',
:display_name => 'Service name',
:description => 'The name of the service for the platform',
:default => 'rsyslog'
display_name: 'Service name',
description: 'The name of the service for the platform',
default: 'rsyslog'
attribute 'rsyslog/max_message_size',
:display_name => 'Maximum Rsyslog message size',
:description => 'Specifies the maximum size of allowable Rsyslog messages',
:default => '2k'
display_name: 'Maximum Rsyslog message size',
description: 'Specifies the maximum size of allowable Rsyslog messages',
default: '2k'
attribute 'rsyslog/preserve_fqdn',
:display_name => 'Preserve FQDN',
:description => 'Specifies if the short or full host name will be used. The default off setting is more compatible.',
:default => 'off'
display_name: 'Preserve FQDN',
description: 'Specifies if the short or full host name will be used. The default off setting is more compatible.',
default: 'off'
attribute 'rsyslog/repeated_msg_reduction',
:display_name => 'Filter duplicated messages',
:description => 'Specifies whether or not repeated messages should be reduced.',
:default => 'on'
display_name: 'Filter duplicated messages',
description: 'Specifies whether or not repeated messages should be reduced.',
default: 'on'
attribute 'rsyslog/priv_seperation',
:display_name => 'Privilege separation',
:description => 'Whether or not to make use of Rsyslog privilege separation',
:default => 'false'
display_name: 'Privilege separation',
description: 'Whether or not to make use of Rsyslog privilege separation',
default: 'false'
attribute 'rsyslog/default_file_template',
:display_name => 'Default file log format template',
:description => 'The name of a pre-defined log format template (ie - `RSYSLOG_FileFormat`), used for local log files.'
display_name: 'Default file log format template',
description: 'The name of a pre-defined log format template (ie - `RSYSLOG_FileFormat`), used for local log files.'
attribute 'rsyslog/default_remote_template',
:display_name => 'Default remote log format template',
:description => 'The name of a pre-defined log format template (ie - `RSYSLOG_SyslogProtocol23Format`), used for remote log forwarding.'
display_name: 'Default remote log format template',
description: 'The name of a pre-defined log format template (ie - `RSYSLOG_SyslogProtocol23Format`), used for remote log forwarding.'
attribute 'rsyslog/enable_tls',
:display_name => 'Enable TLS',
:description => 'Whether or not to enable TLS encryption. When enabled, forces protocol to "tcp"',
:default => 'false'
display_name: 'Enable TLS',
description: 'Whether or not to enable TLS encryption. When enabled, forces protocol to "tcp"',
default: 'false'
attribute 'rsyslog/tls_ca_file',
:display_name => 'TLS CA file',
:description => 'Path to TLS CA file. Required for both server and clients.'
display_name: 'TLS CA file',
description: 'Path to TLS CA file. Required for both server and clients.'
attribute 'rsyslog/tls_certificate_file',
:display_name => 'TLS certificate file',
:description => 'Path to TLS certificate file. Required for server, optional for clients.'
display_name: 'TLS certificate file',
description: 'Path to TLS certificate file. Required for server, optional for clients.'
attribute 'rsyslog/tls_key_file',
:display_name => 'TLS key file',
:description => 'Path to TLS key file. Required for server, optional for clients.'
display_name: 'TLS key file',
description: 'Path to TLS key file. Required for server, optional for clients.'
attribute 'rsyslog/tls_auth_mode',
:display_name => 'TLS auth mode',
:description => 'Value for "$InputTCPServerStreamDriverAuthMode"/"$ActionSendStreamDriverAuthMode", determines whether client certs are validated.',
:default => 'anon'
display_name: 'TLS auth mode',
description: 'Value for "$InputTCPServerStreamDriverAuthMode"/"$ActionSendStreamDriverAuthMode", determines whether client certs are validated.',
default: 'anon'
attribute 'rsyslog/use_local_ipv4',
:display_name => 'Try to use local IPv4 address',
:description => 'Whether or not to make use the remote local IPv4 address on cloud systems when searching for servers (where available).',
:default => 'false'
display_name: 'Try to use local IPv4 address',
description: 'Whether or not to make use the remote local IPv4 address on cloud systems when searching for servers (where available).',
default: 'false'
attribute 'rsyslog/allow_non_local',
:display_name => 'Allow non-local messages',
:description => 'Allow processing of messages coming any IP, not just 127.0.0.1',
:default => 'false'
display_name: 'Allow non-local messages',
description: 'Allow processing of messages coming any IP, not just 127.0.0.1',
default: 'false'
......@@ -76,7 +76,7 @@ template "#{node['rsyslog']['config_prefix']}/rsyslog.d/49-remote.conf" do
owner 'root'
group 'root'
mode '0644'
variables(:servers => rsyslog_servers)
variables(servers: rsyslog_servers)
notifies :restart, "service[#{node['rsyslog']['service_name']}]"
only_if { node['rsyslog']['remote_logs'] }
end
......
......@@ -19,10 +19,10 @@
actions :create
default_action :create
attribute :name, :kind_of => String, :name_attribute => true, :required => true
attribute :file, :kind_of => String, :required => true
attribute :priority, :kind_of => Integer, :default => 99
attribute :severity, :kind_of => String
attribute :facility, :kind_of => String
attribute :cookbook, :kind_of => String, :default => 'rsyslog'
attribute :source, :kind_of => String, :default => 'file-input.conf.erb'
attribute :name, kind_of: String, name_attribute: true, required: true
attribute :file, kind_of: String, required: true
attribute :priority, kind_of: Integer, default: 99
attribute :severity, kind_of: String
attribute :facility, kind_of: String
attribute :cookbook, kind_of: String, default: 'rsyslog'
attribute :source, kind_of: String, default: 'file-input.conf.erb'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment