diff options
| author | Karel Klic <kklic@redhat.com> | 2010-02-08 17:12:16 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2010-02-08 17:12:16 +0100 |
| commit | 8468ed5328f3126c9809cab8b7cb79b44781bb29 (patch) | |
| tree | 1988e3595bf4ae3d105663e52bae46e2b6ae664c /src | |
| parent | 05d155a334c2d25ad1e40b82375c045d717159ac (diff) | |
Readd RHEL6 changes after a merge from master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Daemon/abrt.conf | 16 | ||||
| -rw-r--r-- | src/Daemon/gpg_keys | 8 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/Daemon/abrt.conf b/src/Daemon/abrt.conf index 32ba211..00e18be 100644 --- a/src/Daemon/abrt.conf +++ b/src/Daemon/abrt.conf @@ -12,15 +12,17 @@ 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") -#ActionsAndReporters = FileTransfer("store") -ActionsAndReporters = RunApp("test x\"`cat component`\" = x\"xorg-x11-server-Xorg\" && cp /var/log/Xorg.0.log .") +#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 # What actions or reporters to run on each crash type [ AnalyzerActionsAndReporters ] -Kerneloops = KerneloopsReporter -CCpp = Bugzilla, Logger -Python = Bugzilla, Logger +Kerneloops = TicketUploader, Bugzilla +CCpp = TicketUploader, Bugzilla +Python = TicketUploader, Bugzilla #CCpp:xorg-x11-apps = RunApp("date", "date.txt") # Which Action plugins to run repeatedly @@ -28,4 +30,4 @@ Python = Bugzilla, Logger # h:m - at h:m # s - every s seconds 120 = KerneloopsScanner -#02:00 = FileTransfer
\ No newline at end of file +#02:00 = FileTransfer diff --git a/src/Daemon/gpg_keys b/src/Daemon/gpg_keys index cde50f1..99e1711 100644 --- a/src/Daemon/gpg_keys +++ b/src/Daemon/gpg_keys @@ -1 +1,7 @@ -/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora +/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 |