diff options
| author | Steffen Zieger <me@saz.sh> | 2014-04-29 00:59:49 +0200 |
|---|---|---|
| committer | Steffen Zieger <me@saz.sh> | 2014-04-29 00:59:49 +0200 |
| commit | 8b38b4872d7f5e2cca5c119006a54884c060947a (patch) | |
| tree | 7f45bd04c9d25dfe08aae5eb24d32523f246275d | |
| parent | 3127e207653b55ff0547bbf358b16760250776c0 (diff) | |
| parent | 5fd2b5f6e91964989fa8828cb309f35aed5056c7 (diff) | |
Merge pull request #76 from mstrzele/master
preserve_fqdn moved to rsyslog class
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | manifests/client.pp | 3 | ||||
| -rw-r--r-- | manifests/init.pp | 3 | ||||
| -rw-r--r-- | manifests/params.pp | 1 | ||||
| -rw-r--r-- | templates/rsyslog.conf.erb | 2 |
5 files changed, 5 insertions, 6 deletions
@@ -26,7 +26,6 @@ Manage rsyslog client and server via Puppet custom_config => undef,
server => 'log',
port => '514',
- preserve_fqdn => undef,
}
```
for read from file
@@ -155,7 +154,6 @@ The following lists all the class parameters this module accepts. log_auth_local true,false Just log auth facility locally. Defaults to false.
custom_config STRING Specify your own template to use for client config. Defaults to undef. Example usage: custom_config => 'rsyslog/my_config.erb
server STRING Rsyslog server to log to. Will be used in the client configuration file.
- preserve_fqdn true,false Whether or not to preserve the fully qualified domain name when logging.
log_templates HASH Provides a has defining custom logging templates using the `$template` configuration parameter.
actionfiletemplate STRING If set this defines the `ActionFileDefaultTemplate` which sets the default logging format for remote and local logging.
diff --git a/manifests/client.pp b/manifests/client.pp index b5fa04b..c563c71 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -38,8 +38,7 @@ class rsyslog::client ( $remote_servers = false,
$ssl_ca = undef,
$log_templates = false,
- $actionfiletemplate = false,
- $preserve_fqdn = false
+ $actionfiletemplate = false
) inherits rsyslog {
$content_real = $custom_config ? {
diff --git a/manifests/init.pp b/manifests/init.pp index fbe22f6..ec988f5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -34,7 +34,8 @@ class rsyslog ( $client_conf = $rsyslog::params::client_conf, $server_conf = $rsyslog::params::server_conf, $ssl = $rsyslog::params::ssl, - $modules = $rsyslog::params::modules + $modules = $rsyslog::params::modules, + $preserve_fqdn = $rsyslog::params::preserve_fqdn ) inherits rsyslog::params { class { 'rsyslog::install': } class { 'rsyslog::config': } diff --git a/manifests/params.pp b/manifests/params.pp index b00908a..1b19773 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -42,6 +42,7 @@ class rsyslog::params { '$ModLoad imklog # provides kernel logging support (previously done by rklogd)', '#$ModLoad immark # provides --MARK-- message capability', ] + $preserve_fqdn = false } redhat: { if $::operatingsystem == 'Amazon' { diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index d289f2a..b65d6a7 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -14,7 +14,7 @@ # # Set the default permissions for all log files. # -<% if scope.lookupvar('rsyslog::client::preserve_fqdn') -%> +<% if scope.lookupvar('rsyslog::preserve_fqdn') -%> $PreserveFQDN on <% end -%> $FileOwner <%= scope.lookupvar('rsyslog::log_user') %> |