[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5597dafa78a057353d8613d52eedac035e2bcbb9
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 3.x development tree".
The branch, master has been updated via 5597dafa78a057353d8613d52eedac035e2bcbb9 (commit) via 1ad5a7c48e39b98d54e14d9e554f8927ebfd83d6 (commit) from 02013b2c25b7d7cd6933855ec5e23d8900569c5e (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 5597dafa78a057353d8613d52eedac035e2bcbb9 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 25 21:19:49 2011 +0200
rsyslog: Add this to the base installation and fix files.
commit 1ad5a7c48e39b98d54e14d9e554f8927ebfd83d6 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 25 21:15:16 2011 +0200
chrony: Use the "ipfire ntp servers".
-----------------------------------------------------------------------
Summary of changes: pkgs/chrony/chrony.conf | 8 ++-- pkgs/rsyslog/rsyslog.log | 67 +++------------------------------------ pkgs/rsyslog/rsyslog.nm | 4 +- pkgs/rsyslog/rsyslog.sysconfig | 65 +++----------------------------------- 4 files changed, 17 insertions(+), 127 deletions(-)
Difference in files: diff --git a/pkgs/chrony/chrony.conf b/pkgs/chrony/chrony.conf index 7e3690b..3d58b81 100644 --- a/pkgs/chrony/chrony.conf +++ b/pkgs/chrony/chrony.conf @@ -1,9 +1,9 @@ # Use public servers from the pool.ntp.org project. # Please consider joining the pool (http://www.pool.ntp.org/join.html). -server 0.fedora.pool.ntp.org iburst -server 1.fedora.pool.ntp.org iburst -server 2.fedora.pool.ntp.org iburst -server 3.fedora.pool.ntp.org iburst +server 0.ipfire.pool.ntp.org iburst +server 1.ipfire.pool.ntp.org iburst +server 2.ipfire.pool.ntp.org iburst +server 3.ipfire.pool.ntp.org iburst
# Ignore stratum in source selection. stratumweight 0 diff --git a/pkgs/rsyslog/rsyslog.log b/pkgs/rsyslog/rsyslog.log index 777a666..b2d41f1 100644 --- a/pkgs/rsyslog/rsyslog.log +++ b/pkgs/rsyslog/rsyslog.log @@ -1,61 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"> -<!-- git web interface version 1.7.0.2, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke --> -<!-- git core binaries version 1.7.2.1 --> -<head> -<meta http-equiv="content-type" content="text/html; charset=utf-8"/> -<meta name="generator" content="gitweb/1.7.0.2 git/1.7.2.1"/> -<meta name="robots" content="index, nofollow"/> -<title>Fedora Packages Git Repositories - rsyslog.git/blob - rsyslog.log</title> -<link rel="stylesheet" type="text/css" href="/gitweb/gitweb.css"/> -<link rel="alternate" title="rsyslog.git - history of rsyslog.log - RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.log" type="application/rss+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.log - RSS feed (no merges)" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.log;opt=--no-merges" type="application/rss+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.log - Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.log;opt=--no-merges" type="application/atom+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.log - Atom feed (no merges)" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.log;opt=--no-merges" type="application/atom+xml" /> -<link rel="shortcut icon" href="http://fedoraproject.org/static/images/favicon.ico" type="image/png" /> -</head> -<body> -<div class="page_header"> -<a title="Fedora" href="http://fedoraproject.org"><img src="http://fedoraproject.org/static/images/fedora-logo-27.png" width="72" height="27" alt="git" class="logo"/></a><a href="/gitweb/">git://pkgs.fedoraproject.org</a> / <a href="/gitweb/?p=rsyslog.git;a=summary">rsyslog.git</a> / blob -</div> -<form method="get" action="/gitweb/" enctype="application/x-www-form-urlencoded"> -<div class="search"> -<input name="p" type="hidden" value="rsyslog.git" /> -<input name="a" type="hidden" value="search" /> -<input name="h" type="hidden" value="HEAD" /> -<select name="st" > -<option selected="selected" value="commit">commit</option> -<option value="grep">grep</option> -<option value="author">author</option> -<option value="committer">committer</option> -<option value="pickaxe">pickaxe</option> -</select><sup><a href="/gitweb/?p=rsyslog.git;a=search_help">?</a></sup> search: -<input type="text" name="s" /> -<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span></div> -</form> -</div> -<div class="page_nav"> -<a href="/gitweb/?p=rsyslog.git;a=summary">summary</a> | <a href="/gitweb/?p=rsyslog.git;a=shortlog">shortlog</a> | <a href="/gitweb/?p=rsyslog.git;a=log">log</a> | <a href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">commit</a> | <a href="/gitweb/?p=rsyslog.git;a=commitdiff;h=HEAD">commitdiff</a> | <a href="/gitweb/?p=rsyslog.git;a=tree;h=4d7fc435d7037ee9c5baa895bb8d4cc3da575400;hb=HEAD">tree</a><br/> -<a href="/gitweb/?p=rsyslog.git;a=history;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD">history</a> | <a href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD">raw</a> | <a href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;hb=HEAD">HEAD</a><br/> -</div> -<div class="header"> -<a class="title" href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)</a> -</div> -<div class="page_path"><a title="tree root" href="/gitweb/?p=rsyslog.git;a=tree;hb=HEAD">[rsyslog.git]</a> / <a title="rsyslog.log" href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.log;hb=HEAD">rsyslog.log</a><br/></div> -<div class="page_body"> -<div class="pre"><a id="l1" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l1" class="linenr"> 1</a> /var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {</div> -<div class="pre"><a id="l2" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l2" class="linenr"> 2</a> sharedscripts</div> -<div class="pre"><a id="l3" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l3" class="linenr"> 3</a> postrotate</div> -<div class="pre"><a id="l4" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l4" class="linenr"> 4</a> /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true</div> -<div class="pre"><a id="l5" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l5" class="linenr"> 5</a> endscript</div> -<div class="pre"><a id="l6" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l6" class="linenr"> 6</a> }</div> -</div><div class="page_footer"> -<div class="cachetime">Cache Last Updated: Sat Mar 26 12:27:46 2011 GMT</div> -<div class="page_footer_text">rsyslog</div> -<a class="rss_logo" title="history of rsyslog.log RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.log">RSS</a> -<a class="rss_logo" title="history of rsyslog.log Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.log">Atom</a> -</div> -<script type="text/javascript" src="/gitweb/gitweb.js"></script> -</body> -</html> \ No newline at end of file +/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron { + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true + endscript +} diff --git a/pkgs/rsyslog/rsyslog.nm b/pkgs/rsyslog/rsyslog.nm index a356c8e..de7362c 100644 --- a/pkgs/rsyslog/rsyslog.nm +++ b/pkgs/rsyslog/rsyslog.nm @@ -26,10 +26,10 @@ include $(PKGROOT)/Include
PKG_NAME = rsyslog PKG_VER = 5.8.0 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = -PKG_GROUPS = System/Daemons +PKG_GROUPS = Base System/Daemons PKG_URL = http://www.rsyslog.com/ PKG_LICENSE = GPLv3+ PKG_SUMMARY = Enhanced system logging and kernel message trapping daemon. diff --git a/pkgs/rsyslog/rsyslog.sysconfig b/pkgs/rsyslog/rsyslog.sysconfig index 0eca916..ad9723f 100644 --- a/pkgs/rsyslog/rsyslog.sysconfig +++ b/pkgs/rsyslog/rsyslog.sysconfig @@ -1,60 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"> -<!-- git web interface version 1.7.0.2, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke --> -<!-- git core binaries version 1.7.2.1 --> -<head> -<meta http-equiv="content-type" content="text/html; charset=utf-8"/> -<meta name="generator" content="gitweb/1.7.0.2 git/1.7.2.1"/> -<meta name="robots" content="index, nofollow"/> -<title>Fedora Packages Git Repositories - rsyslog.git/blob - rsyslog.sysconfig</title> -<link rel="stylesheet" type="text/css" href="/gitweb/gitweb.css"/> -<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.sysconfig" type="application/rss+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - RSS feed (no merges)" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.sysconfig;opt=--no-merges" type="application/rss+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.sysconfig;opt=--no-merges" type="application/atom+xml" /> -<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - Atom feed (no merges)" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.sysconfig;opt=--no-merges" type="application/atom+xml" /> -<link rel="shortcut icon" href="http://fedoraproject.org/static/images/favicon.ico" type="image/png" /> -</head> -<body> -<div class="page_header"> -<a title="Fedora" href="http://fedoraproject.org"><img src="http://fedoraproject.org/static/images/fedora-logo-27.png" width="72" height="27" alt="git" class="logo"/></a><a href="/gitweb/">git://pkgs.fedoraproject.org</a> / <a href="/gitweb/?p=rsyslog.git;a=summary">rsyslog.git</a> / blob -</div> -<form method="get" action="/gitweb/" enctype="application/x-www-form-urlencoded"> -<div class="search"> -<input name="p" type="hidden" value="rsyslog.git" /> -<input name="a" type="hidden" value="search" /> -<input name="h" type="hidden" value="HEAD" /> -<select name="st" > -<option selected="selected" value="commit">commit</option> -<option value="grep">grep</option> -<option value="author">author</option> -<option value="committer">committer</option> -<option value="pickaxe">pickaxe</option> -</select><sup><a href="/gitweb/?p=rsyslog.git;a=search_help">?</a></sup> search: -<input type="text" name="s" /> -<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span></div> -</form> -</div> -<div class="page_nav"> -<a href="/gitweb/?p=rsyslog.git;a=summary">summary</a> | <a href="/gitweb/?p=rsyslog.git;a=shortlog">shortlog</a> | <a href="/gitweb/?p=rsyslog.git;a=log">log</a> | <a href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">commit</a> | <a href="/gitweb/?p=rsyslog.git;a=commitdiff;h=HEAD">commitdiff</a> | <a href="/gitweb/?p=rsyslog.git;a=tree;h=4d7fc435d7037ee9c5baa895bb8d4cc3da575400;hb=HEAD">tree</a><br/> -<a href="/gitweb/?p=rsyslog.git;a=history;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD">history</a> | <a href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD">raw</a> | <a href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;hb=HEAD">HEAD</a><br/> -</div> -<div class="header"> -<a class="title" href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)</a> -</div> -<div class="page_path"><a title="tree root" href="/gitweb/?p=rsyslog.git;a=tree;hb=HEAD">[rsyslog.git]</a> / <a title="rsyslog.sysconfig" href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.sysconfig;hb=HEAD">rsyslog.sysconfig</a><br/></div> -<div class="page_body"> -<div class="pre"><a id="l1" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l1" class="linenr"> 1</a> # Options for rsyslogd</div> -<div class="pre"><a id="l2" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l2" class="linenr"> 2</a> # Syslogd options are deprecated since rsyslog v3.</div> -<div class="pre"><a id="l3" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l3" class="linenr"> 3</a> # If you want to use them, switch to compatibility mode 2 by "-c 2"</div> -<div class="pre"><a id="l4" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l4" class="linenr"> 4</a> # See rsyslogd(8) for more details</div> -<div class="pre"><a id="l5" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l5" class="linenr"> 5</a> SYSLOGD_OPTIONS="-c 5"</div> -</div><div class="page_footer"> -<div class="cachetime">Cache Last Updated: Sat Mar 26 12:28:03 2011 GMT</div> -<div class="page_footer_text">rsyslog</div> -<a class="rss_logo" title="history of rsyslog.sysconfig RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.sysconfig">RSS</a> -<a class="rss_logo" title="history of rsyslog.sysconfig Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.sysconfig">Atom</a> -</div> -<script type="text/javascript" src="/gitweb/gitweb.js"></script> -</body> -</html> \ No newline at end of file +# Options for rsyslogd +# Syslogd options are deprecated since rsyslog v3. +# If you want to use them, switch to compatibility mode 2 by "-c 2" +# See rsyslogd(8) for more details +SYSLOGD_OPTIONS="-c 5"
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org