diff options
| author | Karel Klic <kklic@redhat.com> | 2010-02-08 17:03:05 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2010-02-08 17:03:05 +0100 |
| commit | 05d155a334c2d25ad1e40b82375c045d717159ac (patch) | |
| tree | 2e66c853326fb7017e5599a3f38c000f8a25b23b /src | |
| parent | 13228841c417a9d12789aeee79720c347320b0c2 (diff) | |
| parent | f80fd803eab649f6b245b3169b165ba2fd170a6e (diff) | |
Manual merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/Daemon/abrt.conf | 15 | ||||
| -rw-r--r-- | src/Daemon/gpg_keys | 9 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/Daemon/abrt.conf b/src/Daemon/abrt.conf index 8ed5179..32ba211 100644 --- a/src/Daemon/abrt.conf +++ b/src/Daemon/abrt.conf @@ -12,17 +12,15 @@ Database = SQLite3 MaxCrashReportsSize = 1000 # Vector of actions and reporters which are activated immediately # after a crash occurs, comma separated. -#ActionsAndReporters = Mailx("[abrt] new crash was detected"), RunApp("cp /etc/mtab .") -# If you don't want sosreport to be run immediately after crash, -# you may comment it out here and add ", SOSreport" to "CCpp =" -# and "Python =" lines below. -ActionsAndReporters = SOSreport +#ActionsAndReporters = Mailx("[abrt] new crash was detected") +#ActionsAndReporters = FileTransfer("store") +ActionsAndReporters = RunApp("test x\"`cat component`\" = x\"xorg-x11-server-Xorg\" && cp /var/log/Xorg.0.log .") # What actions or reporters to run on each crash type [ AnalyzerActionsAndReporters ] -Kerneloops = TicketUploader, Bugzilla -CCpp = TicketUploader, Bugzilla -Python = TicketUploader, Bugzilla +Kerneloops = KerneloopsReporter +CCpp = Bugzilla, Logger +Python = Bugzilla, Logger #CCpp:xorg-x11-apps = RunApp("date", "date.txt") # Which Action plugins to run repeatedly @@ -30,3 +28,4 @@ Python = TicketUploader, Bugzilla # h:m - at h:m # s - every s seconds 120 = KerneloopsScanner +#02:00 = FileTransfer
\ No newline at end of file diff --git a/src/Daemon/gpg_keys b/src/Daemon/gpg_keys index 2c59d0a..cde50f1 100644 --- a/src/Daemon/gpg_keys +++ b/src/Daemon/gpg_keys @@ -1,8 +1 @@ -/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta-2 -/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-auxiliary -/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta-2 -/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-beta -/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former -/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release -/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx -/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release-2 +/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora |