File ulogd-conf.diff of Package ulogd

---
 ulogd.conf.in |   29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

Index: ulogd-2.0.4/ulogd.conf.in
===================================================================
--- ulogd-2.0.4.orig/ulogd.conf.in
+++ ulogd-2.0.4/ulogd.conf.in
@@ -6,9 +6,10 @@
 # GLOBAL OPTIONS
 ######################################################################
 
+user="ulogd"
 
 # logfile for status messages
-logfile="/var/log/ulogd.log"
+logfile="/var/log/ulogd/ulogd.log"
 
 # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) (default 5)
 # loglevel=1
@@ -57,9 +58,6 @@ plugin="@pkglibdir@/ulogd_output_GRAPHIT
 # this is a stack for packet-based logging via LOGEMU
 #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
-# this is a stack for ULOG packet-based logging via LOGEMU
-#stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
-
 # this is a stack for packet-based logging via LOGEMU with filtering on MARK
 #stack=log2:NFLOG,mark1:MARK,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
@@ -174,34 +172,29 @@ numeric_label=1 # you can label the log
 #netlink_socket_buffer_maxsize=1085440
 #bind=1
 
-[ulog1]
-# netlink multicast group (the same as the iptables --ulog-nlgroup param)
-nlgroup=1
-#numeric_label=0 # optional argument
-
 [nuauth1]
 socket_path="/tmp/nuauth_ulogd2.sock"
 
 [emu1]
-file="/var/log/ulogd_syslogemu.log"
+file="/var/log/ulogd/syslogemu.log"
 sync=1
 
 [op1]
-file="/var/log/ulogd_oprint.log"
+file="/var/log/ulogd/oprint.log"
 sync=1
 
 [gp1]
-file="/var/log/ulogd_gprint.log"
+file="/var/log/ulogd/gprint.log"
 sync=1
 timestamp=1
 
 [xml1]
-directory="/var/log/"
+directory="/var/log/ulogd/"
 sync=1
 
 [json1]
 sync=1
-#file="/var/log/ulogd.json"
+#file="/var/log/ulogd/ulogd.json"
 #timestamp=0
 # device name to be used in JSON message
 #device="My awesome Netfilter firewall"
@@ -212,7 +205,7 @@ sync=1
 
 [pcap1]
 #default file is /var/log/ulogd.pcap
-#file="/var/log/ulogd.pcap"
+#file="/var/log/ulogd/ulogd.pcap"
 sync=1
 
 [mysql1]
@@ -297,12 +290,12 @@ procedure="INSERT_PACKET_FULL"
 
 [sqlite3_ct]
 table="ulog_ct"
-db="/var/log/ulogd.sqlite3db"
+db="/var/log/ulogd/ulogd.sqlite3db"
 buffer=200
 
 [sqlite3_pkt]
 table="ulog_pkt"
-db="/var/log/ulogd.sqlite3db"
+db="/var/log/ulogd/ulogd.sqlite3db"
 buffer=200
 
 [sys2]
@@ -310,7 +303,7 @@ facility=LOG_LOCAL2
 
 [nacct1]
 sync = 1
-#file = /var/log/ulogd_nacct.log
+#file = /var/log/ulogd/nacct.log
 
 [mark1]
 mark = 1