Browse Source

Fix Ubuntu Xenial configuration

master
Nicolas Rodriguez 7 years ago
parent
commit
7d7993d22f
2 changed files with 11 additions and 1 deletions
  1. +1
    -1
      .kitchen.yml
  2. +10
    -0
      syslog_ng/os_codename_map.yml

+ 1
- 1
.kitchen.yml View File

'*': '*':
- syslog_ng.config - syslog_ng.config


<% if %w[wheezy jessie].include?(codename) %>
<% if %w[wheezy jessie xenial].include?(codename) %>
pillars: pillars:
top.sls: top.sls:
base: base:

+ 10
- 0
syslog_ng/os_codename_map.yml View File

# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=yaml # vim: ft=yaml


# Debian
wheezy: wheezy:
version: 3.3 version: 3.3
include: include:
- scl.conf - scl.conf
last_include: last_include:
- /etc/syslog-ng/conf.d/*.conf - /etc/syslog-ng/conf.d/*.conf

# Ubuntu
xenial:
version: 3.5
include:
- scl.conf
- '`scl-root`/system/tty10.conf'
last_include:
- /etc/syslog-ng/conf.d/*.conf

Loading…
Cancel
Save