Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch 2 #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Patch 2 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c2e4ab
Remove template, create perms
jdshewey Jun 19, 2017
d446655
Setting more values to optional
jdshewey Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions rsyslog/files/rsyslog.default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,26 @@ $SystemLogRateLimitInterval {{ global.system_log_rate_limit_interval }}
{% if global.system_log_rateLimit_burst is defined -%}
$SystemLogRateLimitBurst {{ global.system_log_rateLimit_burst }}
{% endif -%}
{% if global.perm_dir is defined -%}
$DirCreateMode {{ global.perm_dir }}
{% endif -%}
{% if global.run_user is defined -%}
$PrivDropToUser {{ global.run_user }}
{% endif -%}
{% if global.run_group is defined -%}
$PrivDropToGroup {{ global.run_group }}
{% endif -%}

$WorkDirectory {{ global.spool_dir }}

{% if global.format is defined -%}
{% if global.format.template is defined -%}
$Template {{ global.format.name }}, "{{ global.format.template }}"
{% endif -%}
$ActionFileDefaultTemplate {{ global.format.name }}
{% else -%}
$template RSYSLOG_TraditionalFileFormat
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
{% endif -%}


{# Additional configurations should be included after defining the global format otherwise they won't benefit from it #}
$IncludeConfig {{ global.rsyslog_d }}/*.conf

Expand Down
9 changes: 1 addition & 8 deletions rsyslog/map.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,12 @@ Debian:
non_kernel_facility: true
msg_reduction: true
manage_file_perms: true
perm_dir: "0755"
run_user: syslog
run_group: syslog
rsyslog_d: /etc/rsyslog.d
modules:
- imuxsock
- imklog
format:
name: Rfc3164Log
template: '<%PRI%>%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag:1:32%%msg:::sp-if-no-1st-sp%%msg%\n'
output:
file:
/var/log/syslog:
Expand Down Expand Up @@ -78,6 +74,7 @@ Debian:
action: "@@remote-host:514"
filter: "*.*"
enabled: false
RedHat:
RedHat:
pkgs:
- rsyslog
Expand All @@ -90,16 +87,12 @@ RedHat:
non_kernel_facility: false
msg_reduction: false
manage_file_perms: true
perm_dir: "0755"
run_user: root
run_group: root
rsyslog_d: /etc/rsyslog.d
modules:
- imjournal
- imuxsock
format:
name: Rfc3164Log
template: '<%PRI%>%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag:1:32%%msg:::sp-if-no-1st-sp%%msg%\n'
output:
file:
/var/log/messages:
Expand Down