GitLab upgraded to 14.4.0-ee.0 - changelog: https://gitlab.com/gitlab-org/gitlab/blob/master/CHANGELOG-EE.md

Commit 3fa5781d authored by Richard Mcleod's avatar Richard Mcleod
Browse files

adding ability to override more options

parent 90b40aa6
......@@ -62,6 +62,11 @@ default['rsyslog']['priv_seperation'] = false
default['rsyslog']['priv_user'] = nil
default['rsyslog']['priv_group'] = nil
default['rsyslog']['modules'] = %w(imuxsock imklog)
default['rsyslog']['file_create_mode'] = '0640'
default['rsyslog']['dir_create_mode'] = '0755'
default['rsyslog']['umask'] = '0022'
default['rsyslog']['dir_owner'] = 'root'
default['rsyslog']['dir_group'] = 'adm'
# platform specific attributes
case node['platform']
......
......@@ -6,6 +6,8 @@
# /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
#
# Default logging rules can be found in /etc/rsyslog.d/50-default.conf
# Umask should be set at the top of the file
$Umask <%= node['rsyslog']['umask']%>
#
# Set hostname
#
......@@ -89,9 +91,11 @@ $WorkDirectory <%= node['rsyslog']['working_dir'] %>
#
$FileOwner <%= node['rsyslog']['user'] %>
$FileGroup <%= node['rsyslog']['group'] %>
$FileCreateMode 0640
$DirCreateMode 0755
$Umask 0022
$FileCreateMode <%= node['rsyslog']['file_create_mode'] %>
$DirOwner <%= node['rsyslog']['dir_owner'] %>
$DirGroup <%= node['rsyslog']['dir_group'] %>
$DirCreateMode <%= node['rsyslog']['dir_create_mode'] %>
<% if node['rsyslog']['priv_seperation'] %>
$PrivDropToUser <%= node['rsyslog']['priv_user'] || node['rsyslog']['user'] %>
$PrivDropToGroup <%= node['rsyslog']['priv_group'] || node['rsyslog']['group'] %>
......
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