Syslog: accept include directive

Add syslog.conf from
https://svnweb.freebsd.org/base?view=revision&revision=308160 to test root,
too

Fixes hercules-team#486

NEWS

@@ -1,6 +1,7 @@
 1.12.0 - ????-??-??
   - Lens changes/additions
     * Multipath: accept values enclosed in quotes (Issue #583)
+    * Syslog: accept 'include' directive (Issue #486)
 
 1.11.0 - 2018-08-24
   - General changes/additions

lenses/syslog.aug

@@ -221,7 +221,7 @@ module Syslog =
 	(* View: entries
 	 entries are either comments/empty lines or entries
 	 *)
-	let entries = (empty | comment | entry)*
+	let entries = (empty | comment | entry )*
 
 	(* Group: Program matching *)
 
@@ -253,10 +253,13 @@ module Syslog =
 
 	(* Group: Top of the tree *)
 
+    let include =
+      [ key "include" . sep_tab . store file_r . eol ]
+
 	(* View: lns
 	 generic entries then programs or hostnames matching blocs
 	 *)
-        let lns = entries . ( program | hostname )*
+        let lns = entries . ( program | hostname | include )*
 
 	(* Variable: filter
 	 all you need is /etc/syslog.conf

lenses/tests/test_syslog.aug

@@ -351,3 +351,6 @@ daemon.info                                     /var/log/cvsupd.log
     (* allow space before comments *)
     test Syslog.lns get "  \t# space comment\n" =
       { "#comment" = "space comment" }
+
+    test Syslog.lns get "include /etc/syslog.d\n" =
+      { "include" = "/etc/syslog.d" }

tests/root/etc/syslog.conf

@@ -0,0 +1,38 @@
+# $FreeBSD$
+#
+#	Spaces ARE valid field separators in this file. However,
+#	other *nix-like systems still insist on using tabs as field
+#	separators. If you are sharing this file between systems, you
+#	may want to use only tabs as field separators here.
+#	Consult the syslog.conf(5) manpage.
+*.err;kern.warning;auth.notice;mail.crit		/dev/console
+*.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err	/var/log/messages
+security.*					/var/log/security
+auth.info;authpriv.info				/var/log/auth.log
+mail.info					/var/log/maillog
+lpr.info					/var/log/lpd-errs
+ftp.info					/var/log/xferlog
+cron.*						/var/log/cron
+!-devd
+*.=debug					/var/log/debug.log
+*.emerg						*
+# uncomment this to log all writes to /dev/console to /var/log/console.log
+# touch /var/log/console.log and chmod it to mode 600 before it will work
+#console.info					/var/log/console.log
+# uncomment this to enable logging of all log messages to /var/log/all.log
+# touch /var/log/all.log and chmod it to mode 600 before it will work
+#*.*						/var/log/all.log
+# uncomment this to enable logging to a remote loghost named loghost
+#*.*						@loghost
+# uncomment these if you're running inn
+# news.crit					/var/log/news/news.crit
+# news.err					/var/log/news/news.err
+# news.notice					/var/log/news/news.notice
+# Uncomment this if you wish to see messages produced by devd
+# !devd
+# *.>=notice					/var/log/devd.log
+!ppp
+*.*						/var/log/ppp.log
+!*
+include						/etc/syslog.d
+include						/usr/local/etc/syslog.d