Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mirror
rsyslog
Commits
5ab09ca4
Commit
5ab09ca4
authored
Jul 19, 2016
by
Jennifer Davis
Browse files
updating kitchen configuration, attributes for suse
parent
d0ddce5f
Changes
4
Hide whitespace changes
Inline
Side-by-side
.kitchen.docker.yml
View file @
5ab09ca4
settings
:
parallel
:
true
driver
:
name
:
docker
# privileged is required otherwise the container doesn't boot right
privileged
:
true
name
:
dokken
chef_version
:
latest
privileged
:
true
# because Docker and SystemD/Upstart
transport
:
name
:
dokken
provisioner
:
name
:
dokken
verifier
:
name
:
inspec
format
:
doc
platforms
:
-
name
:
centos-6
-
name
:
debian-7
driver
:
image
:
centos:6
image
:
debian:7
pid_one_command
:
/sbin/init
intermediate_instructions
:
-
RUN /usr/bin/apt-get update
-
RUN /usr/bin/apt-get install apt-transport-https net-tools -y
-
name
:
debian-8
driver
:
image
:
debian:8
pid_one_command
:
/bin/systemd
intermediate_instructions
:
-
RUN /usr/bin/apt-get update
-
RUN /usr/bin/apt-get install apt-transport-https net-tools -y
-
name
:
centos-5
driver
:
image
:
centos:5
platform
:
rhel
run_command
:
/sbin/init
provision_command
:
-
/usr/bin/yum install -y initscripts net-tools wget
-
name
:
centos-6
driver
:
image
:
centos:6
intermediate_instructions
:
-
RUN yum -y install tar which initscripts
-
name
:
centos-7
driver
:
image
:
centos:7
platform
:
rhel
run_command
:
/usr/lib/systemd/systemd
provision_command
:
-
/bin/yum install -y initscripts net-tools wget
pid_one_command
:
/usr/lib/systemd/systemd
intermediate_instructions
:
-
RUN yum clean all
-
RUN yum -y install net-tools lsof
-
name
:
fedora-23
driver
:
image
:
fedora:23
pid_one_command
:
/usr/lib/systemd/systemd
intermediate_instructions
:
-
RUN dnf -y install tar yum
-
name
:
ubuntu-12.04
driver
:
image
:
ubuntu-upstart:12.04
platform
:
ubuntu
disable_upstart
:
false
run_command
:
/sbin/init
provision_command
:
-
/usr/bin/apt-get update
-
/usr/bin/apt-get install apt-transport-https net-tools -y
pid_one_command
:
/sbin/init
intermediate_instructions
:
-
RUN /usr/bin/apt-get update
-
RUN /usr/bin/apt-get install apt-transport-https net-tools -y
-
name
:
ubuntu-14.04
driver
:
image
:
ubuntu-upstart:14.04
platform
:
ubuntu
disable_upstart
:
false
run_command
:
/sbin/init
provision_command
:
-
/usr/bin/apt-get update
-
/usr/bin/apt-get install apt-transport-https net-tools -y
pid_one_command
:
/sbin/init
intermediate_instructions
:
-
RUN /usr/bin/apt-get update
-
RUN /usr/bin/apt-get install apt-transport-https net-tools -y
-
name
:
ubuntu-16.04
driver
:
image
:
ubuntu:16.04
pid_one_command
:
/bin/systemd
intermediate_instructions
:
-
RUN /usr/bin/apt-get update
-
RUN /usr/bin/apt-get install apt-transport-https net-tools -y
suites
:
-
name
:
default
run_list
:
-
recipe[rsyslog::default]
-
name
:
relp
run_list
:
-
recipe[rsyslog::client]
attributes
:
rsyslog
:
use_relp
:
true
custom_remote
:
-
server
:
10.0.0.45
logs
:
auth.*,mail.*
port
:
555
protocol
:
udp
-
server
:
10.1.1.33
logs
:
authpriv.*,cron.*,daemon.*
port
:
654
protocol
:
tcp
remote_template
:
RSYSLOG_SyslogProtocol23Format
-
name
:
client
run_list
:
-
recipe[rsyslog_test::client]
attributes
:
rsyslog
:
server_ip
:
10.0.0.50
custom_remote
:
-
server
:
10.0.0.45
logs
:
auth.*,mail.*
port
:
555
protocol
:
udp
-
server
:
10.1.1.33
logs
:
authpriv.*,cron.*,daemon.*
port
:
654
protocol
:
tcp
remote_template
:
RSYSLOG_SyslogProtocol23Format
-
name
:
server
run_list
:
-
recipe[rsyslog_test::server]
-
name
:
input_file_provider
run_list
:
-
recipe[rsyslog_test::input_file_provider]
-
name
:
opensuse-13.2
driver
:
image
:
opensuse:13.2
pid_one_command
:
/bin/systemd
intermediate_instructions
:
-
RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive
-
name
:
opensuse-42.1
driver
:
image
:
opensuse:42.1
pid_one_command
:
/bin/systemd
intermediate_instructions
:
-
RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive
.kitchen.yml
View file @
5ab09ca4
...
...
@@ -16,6 +16,7 @@ platforms:
run_list
:
yum::dnf_yum_compat
-
name
:
fedora-23
run_list
:
yum::dnf_yum_compat
-
name
:
opensuse-13.2
-
name
:
ubuntu-12.04
run_list
:
apt::default
-
name
:
ubuntu-14.04
...
...
attributes/default.rb
View file @
5ab09ca4
...
...
@@ -61,6 +61,31 @@ default['rsyslog']['priv_user'] = nil
default
[
'rsyslog'
][
'priv_group'
]
=
nil
default
[
'rsyslog'
][
'modules'
]
=
%w(imuxsock imklog)
# platform specific attributes
case
node
[
'platform'
]
when
'suse'
default
[
'rsyslog'
][
'service_name'
]
=
'syslog'
default
[
'rsyslog'
][
'group'
]
=
'root'
when
'ubuntu'
# syslog user introduced with natty package
if
node
[
'platform_version'
].
to_f
>=
11.04
default
[
'rsyslog'
][
'user'
]
=
'syslog'
default
[
'rsyslog'
][
'group'
]
=
'adm'
default
[
'rsyslog'
][
'priv_seperation'
]
=
true
default
[
'rsyslog'
][
'priv_group'
]
=
'syslog'
end
when
'arch'
default
[
'rsyslog'
][
'service_name'
]
=
'rsyslogd'
when
'smartos'
default
[
'rsyslog'
][
'config_prefix'
]
=
'/opt/local/etc'
default
[
'rsyslog'
][
'modules'
]
=
%w(immark imsolaris imtcp imudp)
default
[
'rsyslog'
][
'group'
]
=
'root'
when
'omnios'
default
[
'rsyslog'
][
'service_name'
]
=
'system/rsyslogd'
default
[
'rsyslog'
][
'modules'
]
=
%w(immark imsolaris imtcp imudp)
default
[
'rsyslog'
][
'group'
]
=
'root'
end
# platform family specific attributes
case
node
[
'platform_family'
]
when
'rhel'
,
'fedora'
...
...
@@ -106,26 +131,4 @@ if (node['platform'] == 'ubuntu' && node['platform_version'].to_i < 12) || (node
default
[
'rsyslog'
][
'default_facility_logs'
][
'*.emerg'
]
=
'*'
end
# platform specific attributes
case
node
[
'platform'
]
when
'ubuntu'
# syslog user introduced with natty package
if
node
[
'platform_version'
].
to_f
>=
11.04
default
[
'rsyslog'
][
'user'
]
=
'syslog'
default
[
'rsyslog'
][
'group'
]
=
'adm'
default
[
'rsyslog'
][
'priv_seperation'
]
=
true
default
[
'rsyslog'
][
'priv_group'
]
=
'syslog'
end
when
'arch'
default
[
'rsyslog'
][
'service_name'
]
=
'rsyslogd'
when
'smartos'
default
[
'rsyslog'
][
'config_prefix'
]
=
'/opt/local/etc'
default
[
'rsyslog'
][
'modules'
]
=
%w(immark imsolaris imtcp imudp)
default
[
'rsyslog'
][
'group'
]
=
'root'
when
'omnios'
default
[
'rsyslog'
][
'service_name'
]
=
'system/rsyslogd'
default
[
'rsyslog'
][
'modules'
]
=
%w(immark imsolaris imtcp imudp)
default
[
'rsyslog'
][
'group'
]
=
'root'
when
'suse'
default
[
'rsyslog'
][
'service_name'
]
=
'syslog'
end
recipes/default.rb
View file @
5ab09ca4
...
...
@@ -31,6 +31,8 @@ directory "#{node['rsyslog']['config_prefix']}/rsyslog.d" do
mode
'0755'
end
log
node
[
'rsyslog'
][
'group'
]
directory
node
[
'rsyslog'
][
'working_dir'
]
do
owner
node
[
'rsyslog'
][
'user'
]
group
node
[
'rsyslog'
][
'group'
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment