doc/Makefile | 4 ++--
doc/ulogd.sgml | 6 +++---
output/pcap/ulogd_output_PCAP.c | 2 +-
output/ulogd_output_GPRINT.c | 2 +-
output/ulogd_output_LOGEMU.c | 2 +-
output/ulogd_output_NACCT.c | 2 +-
output/ulogd_output_OPRINT.c | 2 +-
output/ulogd_output_XML.c | 2 +-
src/ulogd.c | 14 +++++++-------
ulogd.8 | 2 +-
ulogd.conf.in | 22 +++++++++++-----------
11 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/doc/Makefile b/doc/Makefile
index 8ccb9ad..88f5823 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,7 +1,7 @@
all:
sgml2txt ulogd.sgml
- sgml2latex --papersize=a4 --output=dvi ulogd.sgml
- dvips -t a4 -o ulogd.ps ulogd.dvi
+# sgml2latex --papersize=a4 --output=dvi ulogd.sgml
+# dvips -t a4 -o ulogd.ps ulogd.dvi
sgml2html -s 0 ulogd.sgml
clean:
rm -f ulogd.dvi ulogd.txt ulogd.html ulogd.ps
diff --git a/doc/ulogd.sgml b/doc/ulogd.sgml
index 30bfecb..23b1f16 100644
--- a/doc/ulogd.sgml
+++ b/doc/ulogd.sgml
@@ -422,7 +422,7 @@ to a file. The only useful application is debugging.
dumpfile
The filename where it should log to. The default is
-/var/log/ulogd.pktlog
+/var/log/ulogd/ulogd.pktlog
ulogd_output_LOGEMU.so
@@ -433,7 +433,7 @@ as possible. Logging is done to a seperate textfile instead of syslog, though.
The module defines the following configuration directives:
fileThe filename where it should log to. The default is
-/var/log/ulogd.syslogemu
+/var/log/ulogd/ulogd.syslogemu
syncSet this to 1 if you want to have your logfile written
synchronously. This may reduce performance, but makes your log-lines appear
immediately. The default is 0
@@ -557,7 +557,7 @@ The module defines the following configuration directives:
file
The filename where it should log to. The default is:
-/var/log/ulogd.pcap
+/var/log/ulogd/ulogd.pcap
sync
Set this to 1 if you want to have your pcap logfile written
synchronously. This may reduce performance, but makes your packets appear
diff --git a/output/pcap/ulogd_output_PCAP.c b/output/pcap/ulogd_output_PCAP.c
index e7798f2..35e39f2 100644
--- a/output/pcap/ulogd_output_PCAP.c
+++ b/output/pcap/ulogd_output_PCAP.c
@@ -75,7 +75,7 @@ struct pcap_sf_pkthdr {
};
#ifndef ULOGD_PCAP_DEFAULT
-#define ULOGD_PCAP_DEFAULT "/var/log/ulogd.pcap"
+#define ULOGD_PCAP_DEFAULT "/var/log/ulogd/ulogd.pcap"
#endif
#ifndef ULOGD_PCAP_SYNC_DEFAULT
diff --git a/output/ulogd_output_GPRINT.c b/output/ulogd_output_GPRINT.c
index 4f49c34..3a45a2d 100644
--- a/output/ulogd_output_GPRINT.c
+++ b/output/ulogd_output_GPRINT.c
@@ -31,7 +31,7 @@
#include
#ifndef ULOGD_GPRINT_DEFAULT
-#define ULOGD_GPRINT_DEFAULT "/var/log/ulogd.gprint"
+#define ULOGD_GPRINT_DEFAULT "/var/log/ulogd/ulogd.gprint"
#endif
struct gprint_priv {
diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c
index bb27209..4f5856e 100644
--- a/output/ulogd_output_LOGEMU.c
+++ b/output/ulogd_output_LOGEMU.c
@@ -37,7 +37,7 @@
#endif
#ifndef ULOGD_LOGEMU_DEFAULT
-#define ULOGD_LOGEMU_DEFAULT "/var/log/ulogd.syslogemu"
+#define ULOGD_LOGEMU_DEFAULT "/var/log/ulogd/ulogd.syslogemu"
#endif
#ifndef ULOGD_LOGEMU_SYNC_DEFAULT
diff --git a/output/ulogd_output_NACCT.c b/output/ulogd_output_NACCT.c
index 04c5ab1..e4c4ed9 100644
--- a/output/ulogd_output_NACCT.c
+++ b/output/ulogd_output_NACCT.c
@@ -29,7 +29,7 @@
#include
#include
-#define NACCT_FILE_DEFAULT "/var/log/nacctdata.log"
+#define NACCT_FILE_DEFAULT "/var/log/ulogd/nacctdata.log"
/* config accessors (lazy me...) */
#define NACCT_CFG_FILE(pi) ((pi)->config_kset->ces[0].u.string)
diff --git a/output/ulogd_output_OPRINT.c b/output/ulogd_output_OPRINT.c
index e390c84..bfe5b7a 100644
--- a/output/ulogd_output_OPRINT.c
+++ b/output/ulogd_output_OPRINT.c
@@ -28,7 +28,7 @@
#include
#ifndef ULOGD_OPRINT_DEFAULT
-#define ULOGD_OPRINT_DEFAULT "/var/log/ulogd.pktlog"
+#define ULOGD_OPRINT_DEFAULT "/var/log/ulogd/ulogd.pktlog"
#endif
#define NIPQUAD(addr) \
diff --git a/output/ulogd_output_XML.c b/output/ulogd_output_XML.c
index ba33739..e2dc5f2 100644
--- a/output/ulogd_output_XML.c
+++ b/output/ulogd_output_XML.c
@@ -36,7 +36,7 @@
#include
#ifndef ULOGD_XML_DEFAULT_DIR
-#define ULOGD_XML_DEFAULT_DIR "/var/log/"
+#define ULOGD_XML_DEFAULT_DIR "/var/log/ulogd/"
#endif
enum {
diff --git a/src/ulogd.c b/src/ulogd.c
index e09ba9e..ce5ed6b 100644
--- a/src/ulogd.c
+++ b/src/ulogd.c
@@ -1235,6 +1235,13 @@ int main(int argc, char* argv[])
warn_and_exit(daemonize);
}
+ errno = 0;
+ if (nice(-1) == -1) {
+ if (errno != 0)
+ ulogd_log(ULOGD_ERROR, "Could not nice process: %s\n",
+ strerror(errno));
+ }
+
if (change_uid) {
ulogd_log(ULOGD_NOTICE, "Changing UID / GID\n");
if (setgid(gid)) {
@@ -1261,13 +1268,6 @@ int main(int argc, char* argv[])
}
}
- errno = 0;
- if (nice(-1) == -1) {
- if (errno != 0)
- ulogd_log(ULOGD_ERROR, "Could not nice process: %s\n",
- strerror(errno));
- }
-
if (daemonize){
if (fork()) {
diff --git a/ulogd.8 b/ulogd.8
index 9cbad7c..b8a086c 100644
--- a/ulogd.8
+++ b/ulogd.8
@@ -60,7 +60,7 @@ display infos about plugin
.SH FILES
.I /etc/ulogd.conf
.br
-.I /var/log/ulogd.log
+.I /var/log/ulogd/ulogd.log
.SH SEE ALSO
There is more documentation about the daemon and the database plugins
(including examples) in the directories
diff --git a/ulogd.conf.in b/ulogd.conf.in
index f4f63d9..a66fc3d 100644
--- a/ulogd.conf.in
+++ b/ulogd.conf.in
@@ -8,7 +8,7 @@
# 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
@@ -51,7 +51,7 @@ plugin="@pkglibdir@/ulogd_inpflow_NFACCT.so"
plugin="@pkglibdir@/ulogd_output_GRAPHITE.so"
# this is a stack for logging packet send by system via LOGEMU
-#stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
# this is a stack for packet-based logging via LOGEMU
#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
@@ -179,25 +179,25 @@ nlgroup=1
socket_path="/tmp/nuauth_ulogd2.sock"
[emu1]
-file="/var/log/ulogd_syslogemu.log"
+file="/var/log/ulogd/ulogd_syslogemu.log"
sync=1
[op1]
-file="/var/log/ulogd_oprint.log"
+file="/var/log/ulogd/ulogd_oprint.log"
sync=1
[gp1]
-file="/var/log/ulogd_gprint.log"
+file="/var/log/ulogd/ulogd_gprint.log"
sync=1
timestamp=1
[xml1]
-directory="/var/log/"
+directory="/var/log/ulogd/"
sync=1
[pcap1]
-#default file is /var/log/ulogd.pcap
-#file=/var/log/ulogd.pcap
+#default file is /var/log/ulogd/ulogd.pcap
+#file=/var/log/ulogd/ulogd.pcap
sync=1
[mysql1]
@@ -263,12 +263,12 @@ procedure="INSERT_PACKET_FULL"
[sqlite3_ct]
table="ulog_ct"
-db="/var/log/ulogd.sqlite3db"
+db="/var/lib/ulogd/ulogd.sqlite3db"
buffer=200
[sqlite3_pkt]
table="ulog_pkt"
-db="/var/log/ulogd.sqlite3db"
+db="/var/lib/ulogd/ulogd.sqlite3db"
buffer=200
[sys2]
@@ -276,7 +276,7 @@ facility=LOG_LOCAL2
[nacct1]
sync = 1
-#file = /var/log/ulogd_nacct.log
+#file = /var/log/ulogd/ulogd_nacct.log
[mark1]
mark = 1