[PATCH ulogd2 1/2] ulogd.conf: harmonize log file options with module default values

[PATCH ulogd2 1/2] ulogd.conf: harmonize log file options with module default values

[Kaarle Ritvanen]

Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
---
 ulogd.conf.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ulogd.conf.in b/ulogd.conf.in
index 2fcf39a..6e7bdf4 100644
--- a/ulogd.conf.in
+++ b/ulogd.conf.in
@@ -183,15 +183,15 @@ nlgroup=1
 socket_path="/tmp/nuauth_ulogd2.sock"
 
 [emu1]
-file="/var/log/ulogd_syslogemu.log"
+file="/var/log/ulogd.syslogemu"
 sync=1
 
 [op1]
-file="/var/log/ulogd_oprint.log"
+file="/var/log/ulogd.pktlog"
 sync=1
 
 [gp1]
-file="/var/log/ulogd_gprint.log"
+file="/var/log/ulogd.gprint"
 sync=1
 timestamp=1
 
@@ -311,7 +311,7 @@ facility=LOG_LOCAL2
 
 [nacct1]
 sync = 1
-#file = /var/log/ulogd_nacct.log
+#file = /var/log/nacctdata.log
 
 [mark1]
 mark = 1
-- 
2.9.3

[PATCH ulogd2 2/2] rotate all default output files

[Kaarle Ritvanen]

Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
---
 ulogd.logrotate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ulogd.logrotate b/ulogd.logrotate
index b3fb6d1..3b4c487 100644
--- a/ulogd.logrotate
+++ b/ulogd.logrotate
@@ -1,4 +1,4 @@
-/var/log/ulogd.log /var/log/ulogd.syslogemu /var/log/ulogd.pktlog /var/log/ulogd.pcap {
+/var/log/ulogd.log /var/log/ulogd.syslogemu /var/log/ulogd.pktlog /var/log/ulogd.gprint /var/log/ulogd.json /var/log/ulogd.pcap /var/log/ulogd.sqlite3db /var/log/nacctdata.log {
     missingok
     sharedscripts
     postrotate
-- 
2.9.3

Re: [PATCH ulogd2 1/2] ulogd.conf: harmonize log file options with module default values

[Eric Leblond]

Hello Kaarle,

Thanks for the cleaning work. Some comment inside.

On Mon, 2017-02-13 at 11:47 +0200, Kaarle Ritvanen wrote:
> Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
> ---
>  ulogd.conf.in | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/ulogd.conf.in b/ulogd.conf.in
> index 2fcf39a..6e7bdf4 100644
> --- a/ulogd.conf.in
> +++ b/ulogd.conf.in
> @@ -183,15 +183,15 @@ nlgroup=1
>  socket_path="/tmp/nuauth_ulogd2.sock"
>  
>  [emu1]
> -file="/var/log/ulogd_syslogemu.log"
> +file="/var/log/ulogd.syslogemu"

I really like the idea of getting an harmonized naming for the log
files but I think we should do it reverse for values that are not
commented in the configuration file. Most distributions and install are
shipping with a copy of default configuration. 

Most users won't have changed the values that are uncommented. So they
will have on disk the log file with name defined in the configuration
file. And they will benefit from a new logrotate file. Thus we should
use the file name defined in the conf as value of the default file name
in code.

Could you resubmit a patchset ?

BR,
-- 
Eric Leblond <eric@regit.org>
Blog: https://home.regit.org/

Re: [PATCH ulogd2 1/2] ulogd.conf: harmonize log file options with module default values

[Kaarle Ritvanen]

On Tue, 7 Mar 2017, Eric Leblond wrote:

> I really like the idea of getting an harmonized naming for the log
> files but I think we should do it reverse for values that are not
> commented in the configuration file. Most distributions and install are
> shipping with a copy of default configuration. 
> 
> Most users won't have changed the values that are uncommented. So they
> will have on disk the log file with name defined in the configuration
> file. And they will benefit from a new logrotate file. Thus we should
> use the file name defined in the conf as value of the default file name
> in code.
> 
> Could you resubmit a patchset ?

I preprared a new patch set according to your feedback:

http://marc.info/?l=netfilter-devel&m=149064027208491&w=2
http://marc.info/?l=netfilter-devel&m=149064028308496&w=2

Please take a look at them.

BR,
Kaarle

Re: [PATCH ulogd2 1/2] ulogd.conf: harmonize log file options with module default values

[Eric Leblond]

Hello,

On Wed, 2017-04-12 at 14:40 +0300, Kaarle Ritvanen wrote:
> On Tue, 7 Mar 2017, Eric Leblond wrote:
> 
> > I really like the idea of getting an harmonized naming for the log
> > files but I think we should do it reverse for values that are not
> > commented in the configuration file. Most distributions and install
> > are
> > shipping with a copy of default configuration. 
> > 
> > Most users won't have changed the values that are uncommented. So
> > they
> > will have on disk the log file with name defined in the
> > configuration
> > file. And they will benefit from a new logrotate file. Thus we
> > should
> > use the file name defined in the conf as value of the default file
> > name
> > in code.
> > 
> > Could you resubmit a patchset ?
> 
> I preprared a new patch set according to your feedback:
> 
> http://marc.info/?l=netfilter-devel&m=149064027208491&w=2
> http://marc.info/?l=netfilter-devel&m=149064028308496&w=2
> 
> Please take a look at them.

No excuse on me to have missed that. Really sorry. I've just pushed
that to git.

Best regards,
-- 
Eric Leblond <eric@regit.org>