Merge remote-tracking branch 'origin/dev', 0.8.1

Merge pull request #288 from draios/fix-rule-loading
Fix built-in falco config location.
2026-03-22 12:43:24 +00:00 · 2017-10-10 10:49:27 -07:00 · 2017-10-10 10:48:08 -07:00 · 2017-10-10 09:43:44 -07:00 · 2017-10-10 09:42:06 -07:00
2 changed files with 9 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@

 This file documents all notable changes to Falco. The release numbering uses [semantic versioning](http://semver.org).

+## v0.8.1
+
+Released 2017-10-10
+
+### Bug Fixes
+
+* Fix packaging to specify correct built-in config file [[#288](https://github.com/draios/falco/pull/288)]
+
 ## v0.8.0

 Released 2017-10-10
--- a/userspace/falco/config_falco.h.in
+++ b/userspace/falco/config_falco.h.in
@@ -5,7 +5,7 @@
 #define FALCO_LUA_DIR "${CMAKE_INSTALL_PREFIX}/${FALCO_SHARE_DIR}/lua/"
 #define FALCO_SOURCE_DIR "${PROJECT_SOURCE_DIR}"
 #define FALCO_SOURCE_CONF_FILE "${PROJECT_SOURCE_DIR}/falco.yaml"
-#define FALCO_INSTALL_CONF_FILE "/etc/falco.yaml"
+#define FALCO_INSTALL_CONF_FILE "/etc/falco/falco.yaml"
 #define FALCO_SOURCE_LUA_DIR "${PROJECT_SOURCE_DIR}/userspace/falco/lua/"

 #define PROBE_NAME "${PROBE_NAME}"
Author	SHA1	Message	Date
Mark Stemm	e8aee19f6c	Merge remote-tracking branch 'origin/dev', 0.8.1	2017-10-10 10:49:27 -07:00
Mark Stemm	9b35e06db8	Merge pull request #288 from draios/fix-rule-loading Fix built-in falco config location.	2017-10-10 10:48:08 -07:00
Mark Stemm	60d609b8ec	Also update changelog.	2017-10-10 09:43:44 -07:00
Mark Stemm	38f1d20ab2	Fix built-in falco config location. Also needed to be updated from /etc/ to /etc/falco.	2017-10-10 09:42:06 -07:00