syslog-ng: including user settings after system settings 12038/head
authorPhilip Prindeville <philipp@redfish-solutions.com>
Fri, 1 May 2020 17:15:57 +0000 (11:15 -0600)
committerPhilip Prindeville <philipp@redfish-solutions.com>
Sat, 2 May 2020 23:22:50 +0000 (17:22 -0600)
commitf8443ae8295fd391f4927e4bb921b5fe9154d224
tree7eef21400f723b04ab5d23f731c8d57a031ab461
parent07998f702e1e9bf125145db6e73dd825f18898a5
syslog-ng: including user settings after system settings

Initially we included user-specific settings last, so that they
could turn off or replace system settings... otherwise we only get
to change what's NOT explicitly set by the system.  This is overly
constraining.

Restore the original functionality of allowing the user to
override settings defined by the distribution's configuration.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
admin/syslog-ng/Makefile
admin/syslog-ng/files/syslog-ng.conf