This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via fffc646e743adb4aebdf75972bb2c9fb12e0675e (commit) from 7535861c50af78230d509e0440e00abacf3057cb (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit fffc646e743adb4aebdf75972bb2c9fb12e0675e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jul 24 13:32:05 2014 +0200

logs: Add dynamic DNS logging section.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/80/filelists/files | 1 + html/cgi-bin/logs.cgi/log.dat | 2 ++ lfs/ddns | 2 ++ ...3-Add-a-program-prefix-to-syslog-messages.patch | 25 ++++++++++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch

Difference in files: diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files index 822baa2..d5973f7 100644 --- a/config/rootfiles/core/80/filelists/files +++ b/config/rootfiles/core/80/filelists/files @@ -7,6 +7,7 @@ etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/networking/red.up/30-ddns srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/netexternal.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index dacd518..1813862 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -51,6 +51,7 @@ $cgiparams{'SECTION'} = 'ipfire'; my %sections = ( 'ipfire' => '(ipfire: )', 'red' => '(red:|pppd[.*]: |chat[.*]|pppoe[.*]|pptp[.*]|pppoa[.*]|pppoa3[.*]|pppoeci[.*]|ipppd|ipppd[.*]|kernel: ippp\d|kernel: isdn.*|ibod[.*]|dhcpcd[.*]|modem_run[.*])', + 'ddns' => '(ddns[\d+]:)', 'dns' => '(dnsmasq[.*]: )', 'dhcp' => '(dhcpd: )', 'clamav' => '(clamd[.*]: |freshclam[.*]: )', @@ -70,6 +71,7 @@ my %sections = ( my %trsections = ( 'ipfire' => 'IPFire', 'red' => 'RED', + 'ddns' => $Lang::tr{'dynamic dns'}, 'dns' => 'DNS', 'dhcp' => "$Lang::tr{'dhcp server'}", 'cron' => 'Cron', diff --git a/lfs/ddns b/lfs/ddns index c8348ce..975c8c3 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -71,6 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)

+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch + cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch b/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch new file mode 100644 index 0000000..978db85 --- /dev/null +++ b/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch @@ -0,0 +1,25 @@ +From 21fd4b8d26d01d622185ab8de971a9ee934220a3 Mon Sep 17 00:00:00 2001 +From: Michael Tremer michael.tremer@ipfire.org +Date: Thu, 24 Jul 2014 13:23:36 +0200 +Subject: [PATCH] Add a program prefix to syslog messages. + +--- + src/ddns/__init__.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py +index 22764e6..6fe3a33 100644 +--- a/src/ddns/__init__.py ++++ b/src/ddns/__init__.py +@@ -42,6 +42,8 @@ def setup_logging(): + handler = logging.handlers.SysLogHandler(address="/dev/log", + facility=logging.handlers.SysLogHandler.LOG_DAEMON + ) ++ formatter = logging.Formatter("ddns[%(process)d]: %(message)s") ++ handler.setFormatter(formatter) + handler.setLevel(logging.INFO) + rootlogger.addHandler(handler) + +-- +1.9.3 +

hooks/post-receive -- IPFire 2.x development tree