aboutsummaryrefslogtreecommitdiffstats
path: root/json
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-02-19 07:08:01 +0000
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-02-19 07:08:01 +0000
commit045ca4a948940c3257efd3997d3aa0ff6acc8b8a (patch)
tree3fb0f0558daf6ffcc2110f312df95f4d0fbb6164 /json
parentcb6011fac4342a4cb6a913ae0e3a82306260c188 (diff)
downloadawall-045ca4a948940c3257efd3997d3aa0ff6acc8b8a.tar.bz2
awall-045ca4a948940c3257efd3997d3aa0ff6acc8b8a.tar.xz
ensure that awall's default policies are processed first
(and thus allow overriding them)
Diffstat (limited to 'json')
-rw-r--r--json/default-log.json5
-rw-r--r--json/services.json2
2 files changed, 6 insertions, 1 deletions
diff --git a/json/default-log.json b/json/default-log.json
index c85a5a7..da387e0 100644
--- a/json/default-log.json
+++ b/json/default-log.json
@@ -1 +1,4 @@
-{ "log": { "_default": { "limit": 1 } } }
+{
+ "before": "%defaults",
+ "log": { "_default": { "limit": 1 } }
+}
diff --git a/json/services.json b/json/services.json
index 5016c04..25216af 100644
--- a/json/services.json
+++ b/json/services.json
@@ -1,4 +1,6 @@
{
+ "before": "%defaults",
+
"service": {
"babel": { "proto": "tcp", "port": 6697 },
"bacula-dir": { "proto": "tcp", "port": 9101 },