From f067192c38e4af6208b1f35a76f0c952266869f8 Mon Sep 17 00:00:00 2001 From: rhatto Date: Wed, 3 Sep 2008 03:48:23 +0000 Subject: merging with changes made since 21th May git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@233 18ef50b8-d735-4ccd-97c1-689132df3dd9 --- app/admin/hddtemp/hddtemp.db | 523 ++++++++++++++++++++++++++ app/admin/syslog-ng/logrotate.d/syslog-ng | 6 + app/admin/syslog-ng/rc.syslog-ng.new | 37 ++ app/admin/syslog-ng/syslog-ng-anon-2.0.6.diff | 277 ++++++++++++++ app/admin/syslog-ng/syslog-ng.conf.new | 270 +++++++++++++ app/admin/syslog-ng/syslog-ng.mkbuild | 117 ++++++ 6 files changed, 1230 insertions(+) create mode 100644 app/admin/hddtemp/hddtemp.db create mode 100644 app/admin/syslog-ng/logrotate.d/syslog-ng create mode 100644 app/admin/syslog-ng/rc.syslog-ng.new create mode 100644 app/admin/syslog-ng/syslog-ng-anon-2.0.6.diff create mode 100644 app/admin/syslog-ng/syslog-ng.conf.new create mode 100644 app/admin/syslog-ng/syslog-ng.mkbuild (limited to 'app/admin') diff --git a/app/admin/hddtemp/hddtemp.db b/app/admin/hddtemp/hddtemp.db new file mode 100644 index 0000000..4a061cf --- /dev/null +++ b/app/admin/hddtemp/hddtemp.db @@ -0,0 +1,523 @@ +# +# Insert a regular expression for support of the model or the serie of your hard drive. +# If you don't know what to put in the second field, put the number +# that appears most often for your brand :o) +# A value of zero meens that we know that the drive doesn't have +# a temperature sensor (you can set the unit to C or F). +# +############################################################################ +# The following list was found at (http://www.almico.com/forumharddisks.php) +# If your drive is in the list send me a mail. +# +# Manufacturer Model Size Notes +# FUJITSU FUJITSU MPF3102AH 10.0GB +# FUJITSU FUJITSU MPG3204AH E 20.0GB +# FUJITSU FUJITSU MPG3307AT 30.0GB +# FUJITSU FUJITSU MPG3409AH 40.0GB +# FUJITSU FUJITSU MPG3409AH EF 40.0GB +# HITACHI HITACHI_DK23CA-10 9.8GB +# HITACHI HITACHI_DK23CA-15 14.7GB +# SAMSUNG SAMSUNG SV3012H 29.4GB +# SEAGATE ST310210A 10.0GB +# SEAGATE ST310211A 9.8GB +# SEAGATE ST310215A 10.0GB +# SEAGATE ST315320A 14.9GB +# SEAGATE ST320410A 19.6GB +# SEAGATE ST320413A 19.6GB +# SEAGATE ST320420A 19.9GB +# SEAGATE ST330610A 29.3GB +# SEAGATE ST330620A 29.3GB +# SEAGATE ST330621A 29.3GB +# SEAGATE ST330630A 29.9GB +# SEAGATE ST340016A 39.1GB +# SEAGATE ST340810ACE 39.1GB +# SEAGATE ST380020ACE 78.2GB +# WESTERN DIGITAL WDC AC210200D 10.0GB +# WESTERN DIGITAL WDC AC29100D 8.9GB +# WESTERN DIGITAL WDC AC420400D 19.9GB +# WESTERN DIGITAL WDC WD102AA 10.0GB +# +################################################# + +######################################## +############# ExcelStor drives +######################################## +# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" +"ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" +"ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)" +"ExcelStor Technology J680" 194 C "ExcelStor Technology J680 (80 GB)" +"ExcelStor Technology J860" 194 C "ExcelStor Technology J860 (60 GB)" +"ExcelStor Technology J880" 194 C "ExcelStor Technology J880 (80 GB)" + + + +######################################## +############# Fujitsu drives +######################################## +"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" + +"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" +"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" +"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" + +"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" +"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" + +"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" +"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" +"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" + +"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)" + +"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" +"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" +"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" +"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" +"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" +"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" + +"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)" + +"FUJITSU MHV2100AH" 194 C "FUJITSU MHV2100AH" +"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT" +"FUJITSU MHV2080[AB]H" 194 C "FUJITSU MHV2080AH" + +"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" + +"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" +"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" +"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" +"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" +"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" +"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E" + + + +######################################## +############# Hitachi drives +######################################## +"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B" +"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" +"HITACHI_DK23CA-(15|20|30|30B|75)" 194 C "Hitachi DK23CA series" +"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" +"HITACHI_DK23EA-[2346]0" 194 C "Hitachi DK23EA series" +"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" +"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series" +"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" + +"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" +"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" +"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB" +"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache" +"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" +"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA" +"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" + +"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA" +"HDS722516VLSA80" 194 C "Hitachi Deskstar 7K250 160GB 8Mo cache SATA" +"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" +"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" + +"HDS724040KLAT80" 194 C "Hitachi Deskstar 7K400 400GB 8Mo cache PATA" + +"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA" +"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" +"HDT722525DLA380" 194 C "Hitachi Deskstar T7K250 250GB 8Mo cache SATAII" +"HDT725050VLA360" 194 C "Hitachi Deskstar T7K500 500GB, 7200RPM, 16MB, SATA II" + +"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)" +"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" +"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" +"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" +"HTS541010G9SA00" 194 C "Hitachi Travelstar 100GB SATA" +"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" +"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" +"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" +"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" +"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" +"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)" +"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" + + +######################################## +############# IBM drives +######################################## + +# DJSA serie is using F0h command to report temperature and also have +# SMART capabilties but it was reported not to work. +# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" + +"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" +"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" + +# according to specifications they do not seems to have sensor +# but I prefer waiting for a report +#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" + +"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" +"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" +"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" +"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" +"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" +"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" +"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" +"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" +"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" +"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" +"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" +"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" +"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" +"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" +"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" +"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" + +######################################## +############# Maxtor drives +######################################## +#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" +"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" +# which one must I trust ? +#"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" +#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" +#"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" +#"Maxtor 4D060H3" 12 C "Maxtor DiamondMax D540X-4D" +#"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" +"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" +"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1" +"Maxtor 4A300J0" 194 C "Maxtor MaxLine II 300GB 5400RPM" +"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" +"Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)" 0 C "Maxtor DiamondMax Plus 40" +"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" +"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" +"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" +"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" +"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" +"Maxtor 6V320F0" 194 C "Maxtor Diamond Max 10 SATA II 320 GB" +"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" +"Maxtor 7L300[RS]0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm" +"Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine Plus II 250GB 7200RPM" +"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" + +#"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" +"Maxtor 6B080M0" 194 C "Maxtor DiamondMax 10 80GB 8MB SATA" +"Maxtor 6B120M0" 194 C "Maxtor DiamondMax 10 120GB 8MB SATA" +"Maxtor 6B160M0" 194 C "Maxtor DiamondMax 10 160GB 8MB SATA" +"Maxtor 6B160P0" 194 C "Maxtor DiamondMax 10 160GB 8MB ATA/133" +"Maxtor 6B200M0" 194 C "Maxtor DiamondMax 10 200GB 8MB SATA" +"Maxtor 6B200P0" 194 C "Maxtor DiamondMax 10 200GB 8MB ATA/133" +"Maxtor 6B250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB ATA/133" +"Maxtor 6B250S0" 194 C "Maxtor DiamondMax 10 250GB 16MB SATA" +"Maxtor 6B300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB ATA/133" +"Maxtor 6B300S0" 194 C "Maxtor DiamondMax 10 300GB 16MB SATA" +"Maxtor 6L080L0" 194 C "Maxtor DiamondMax 10 80GB 2MB ATA/133 RoHS" +"Maxtor 6L080M0" 194 C "Maxtor DiamondMax 10 80GB 8MB SATA RoHS" +"Maxtor 6L080P0" 194 C "Maxtor DiamondMax 10 80GB 8MB ATA/133 RoHS" +"Maxtor 6L120M0" 194 C "Maxtor DiamondMax 10 120GB 8MB SATA RoHS" +"Maxtor 6L120P0" 194 C "Maxtor DiamondMax 10 120GB 8MB ATA/133 RoHS" +"Maxtor 6L160M0" 194 C "Maxtor DiamondMax 10 160GB 8MB SATA RoHS" +"Maxtor 6L160P0" 194 C "Maxtor DiamondMax 10 160GB 8MB ATA/133 RoHS" +"Maxtor 6L200M0" 194 C "Maxtor DiamondMax 10 200GB 8MB SATA RoHS" +"Maxtor 6L200P0" 194 C "Maxtor DiamondMax 10 200GB 8MB ATA/133 RoHS" +"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB ATA/133 RoHS" +"Maxtor 6L250S0" 194 C "Maxtor DiamondMax 10 250GB 16MB SATA RoHS" +"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB ATA/133 RoHS" +"Maxtor 6L300S0" 194 C "Maxtor DiamondMax 10 300GB 16MB SATA RoHS" +"Maxtor 6V080E0" 194 C "Maxtor DiamondMax 10 80GB 8MB SATAII RoHS" +"Maxtor 6V160E0" 194 C "Maxtor DiamondMax 10 160GB 8MB SATAII RoHS" +"Maxtor 6V200E0" 194 C "Maxtor DiamondMax 10 200GB 8MB SATAII RoHS" +"Maxtor 6V250F0" 194 C "Maxtor DiamondMax 10 250GB 16MB SATAII RoHS" +"Maxtor 6V300F0" 194 C "Maxtor DiamondMax 10 300GB 16MB SATAII RoHS" + + + +######################################## +############# Quantum drives +######################################## +"QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" +"QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" +#"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" +# I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... +# "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" + + + +######################################## +############# Samsung drives +######################################## +# somenone reported a problem with the SP8004H which reports a temperature +# 10°C below the ambient temperature +"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series" +"SAMSUNG HD160JJ" 194 C "Samsung 160GB, 7200RPM, 8MB cache, SATA" +"SAMSUNG HD160JJ/P" 194 C "Samsung SpinPoint P80 SD 160GB (7200RPM, 8MB cache)" +"SAMSUNG HD[30|32|40][01]L[DJ]" 194 C "Samsung SpinPoint T133 series (300-400MB)" +"SAMSUNG HD250KD" 194 C "Samsung SpinPoint T133 series (250 MB PATA)" +"SAMSUNG HD321KJ" 194 C "Samsung Spinpoint T166 (7200RPM, 16MB cache) - SATA" +"SAMSUNG HD501LJ" 194 C "Samsung HD501LJ" +"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" +"SAMSUNG SW0434A" 0 C "Samsung SW0434A" +"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" +"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" +"SAMSUNG SP0822N" 194 C "Samsung SP0822N" +"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" +"SAMSUNG SP2[05]14N" 194 C "Samsung SpinPoint P120 series (7200RPM, 8MB cache)" +"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA" +"SAMSUNG SV0432A" 0 C "Samsung SV0432A" +"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" +"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" +#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" +#"SAMSUNG SV1204H" 194 C "Samsung 120G" +"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" +"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache" + +######################################## +############# Seagate drives +######################################## +"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" +"ST3412A" 0 C "Seagate ST3412A" +"ST38641A" 0 C "Seagate ST38641A" +"ST310014A" 194 C "Seagate ST310014A" +"ST310210A" 0 C "Seagate ST310210A" +"ST310211A" 194 C "Seagate ST310211A" +"ST310220A" 0 C "Seagate ST310220A" +# SEAGATE ST313021A 13.0GB +"ST313021A" 0 C "Seagate U8 ST313021A" +"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" +"ST315320A" 194 C "Seagate ST315320A" +"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" +"ST320011A" 194 C "Seagate ST320011A" +"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" +"ST320410A" 194 C "Seagate ST320410A" +"ST320413A" 194 C "Seagate ST320413A" +"ST320414A" 194 C "Seagate ST320414A" +"ST320420A" 194 C "Seagate Barracuda II ST320420A" +"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm" +"ST330620A" 194 C "Seagate ST330620A" +"ST330621A" 194 C "Seagate ST330621A" +"ST330630A" 194 C "Seagate Barracuda ST330630A" +"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" +"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" +"ST340016A" 194 C "Seagate ST340016A" +"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" +"ST340823A" 194 C "Seagate U Series 5 40823" +"ST340824A" 194 C "Seagate Barracuda III" +"ST360015A" 194 C "Seagate Barracuda V ST360015A" +"ST360020A" 194 C "Seagate U Series 60020" +"ST360021A" 194 C "Seagate Barracuda IV ST360021A" +"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380012A" 194 C "Seagate ST380012A 80GB" +"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" +"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" +"ST380021A" 194 C "Seagate Barracuda IV ST380021A" +"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" +"ST380023A" 194 C "Seagate Barracuda V ST380023A" +"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA" +"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" +"ST3120020A" 194 C "Seagate ST3120020A" +"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" +"ST3120023A" 194 C "Seagate Barracuda V ST3120023A" +"ST3120024A" 194 C "Seagate Barracuda V ST3120024A" +"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE" +"ST3120026A" 194 C "Seagate Barracuda V ST3120026A" +"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" +"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)" +"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)" +"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" +"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)" +"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb" +"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB" +"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB" +"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB" +"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB" +"ST3300831A" 194 C "Seagate 300GB ST3300831A" +"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" +"ST3400633(A|AS)" 194 C "Seagate Barracuda 7200.7 400 GB" +"ST3500630NS" 194 C "Seagate" +"ST3400632NS" 194 C "Seagate" +"ST3320620AS" 194 C "Seagate Barracuda 7200.7 320 GB" +"ST3500630AS" 194 C "Seagate Barracuda 7200.7 500 GB" +"ST3802110A" 194 C "Seagate Barracuda 7200.9 80 GB" +"ST910021A" 194 C "Seagate Momentus 7200.1 100GB" +"ST910082[35]A" 194 C "Seagate Momentus 5400.2 100GB" +"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB" +"ST94019A" 194 C "Seagate ST94019A" +"ST94813A" 194 C "Seagate Momentus 5400.2 40GB" +"ST94[08]11A" 194 C "Seagate ST94011A" +"ST960821A" 194 C "Seagate ST960821A" +"ST960822A" 194 C "Seagate Momentus 5400.2 60GB" +"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA" +"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB" + +######################################## +############# TOSHIBA Laptops +######################################## +"MK4313MAT" 220 C "Toshiba MK4313MAT" +"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX" +"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" +"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" +"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" + +"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" +"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" +"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS" + +#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" +"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" +"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" +"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" +"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX" + +"TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" +"TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" +"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" +"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX" +"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" +"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" + +"MK4025GAS" 194 C "Toshiba MK4025GAS" + + +######################################## +############# Western Digital drives +######################################## +# WDC AC310100B and WDC AC2850F are reported not working +# no more informations were given +"WDC AC22000L" 0 C "Western Digital Caviar AC22000" +"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" +"WDC AC418000D" 231 C "Western Digital AC418000D" +"WDC WD135BA" 231 C "Western Digital WD135BA" + +"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" +"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" +#"WDC WD200BB-60DGA0" 0 C "Western Digital Caviar WD200BB" +"WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" +"WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" +"WDC WD400BB-00CAA0" 0 C "Western Digital 400BB-00CAA0" +"WDC WD400BB-00J[KH]A0" 194 C "Western Digital Caviar WD400BB" +"WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0" +#"WDC WD400BB-00GFA0" 0 C "" +"WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB" +"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" +"WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB" +"WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" +"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" +"WDC WD400JB-00ETA0" 194 C "Western Digital 400JB-00ETA0" +"WDC WD400JB-00JJC0" 194 C "Western Digital 400JB-00JJC0 40GB" +"WDC WD400LB-00DNA0" 194 C "Western Digital 400LB-00DNA0" +"WDC WD400UE-22HCT0" 194 C "Western Digital 40GB Notebook HDD" +"WDC WD400VE-75HDT1" 194 C "Western Digital Scorpio 40GB" +"WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" +"WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0" +"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" +"WDC WD600VE-75HDT0" 194 C "Western Digital 600VE-75HDT0" +"WDC WD600VE-00HDT0" 194 C "Western Digital 600VE-00HDT0" +"WDC WD740GD-00FL21.0" 194 C "Western Digital SATA Raptor" +"WDC WD740GD-([05]0FL[AC]0|75FLA1)" 194 C "Western Digital SATA Raptor 74GB 8MB" +"WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" +"WDC WD800BB-(00|22)DKA0" 194 C "Western Digital WD800BB 80 Go" +"WDC WD800BB-32CCB0" 194 C "Western Digital 800BB-32CCB0" +"WDC WD800BB-55HEA0" 194 C "Western Digital 800BB-55HEA0" +"WDC WD800BB-00JHA0" 194 C "Western Digital 800BB-00JHA0" +"WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0" +"WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" +"WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB" +"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" +"WDC WD800JB-00(ET|FM|FS)A0" 194 C "Western Digital Caviar 80GB Special Edition 8MB" +"WDC WD800JB-00JJ[AC]0" 194 C "Western Digital WD800JB" +"WDC WD800JD-(00|55)(HK|JR)A0" 194 C "Western Digital SATA 80GB, 8MB Cache" +"WDC WD800JD-00(HK|JN)A0" 194 C "Western Digital SATA 80GB, 8MB Cache" +"WDC WD800LB-(00|55)DNA0" 194 C "Western Digital Caviar WD800LB 80 Go ATA-100" +"WDC WD800VE-07HDT0" 194 C "Western Digital 800VE-07HDT0" +"WDC WD1200BB-00(FTA|GUA)0" 194 C "Western Digital Caviar EIDE 2MB Cache" +"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" +"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB" +"WDC WD1200JD-00(GBB|HBC)0" 194 C "Western Digital WD1200JD" +"WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" +"WDC WD1200SB-01KB[AC]0" 194 C "Western Digital Caviar RE (Raid Edition) 120 GB" +"WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" +"WDC WD1600JB-(00EV|00FU|00GV|22GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" +"WDC WD2000BB-00FTA0" 194 C "Western Digital WD2000BB" +"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" +"WDC WD2000JB-00GVC0" 194 C "Western Digital WD2000JB" +"WDC WD2000JS-00MHB1" 194 C "Western Digital SATA 200GB" +"WDC WD2500JB-(00RE|00EV|00FU|32FU|00GV|55GV)A0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" +"WDC WD2500JB-00GVC0" 194 C "Western Digital 250GB" +"WDC WD2500JD-(00G|32H)BB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB" +"WDC WD2500JD-40HBC0" 194 C "Western Digital WD2500JD-40HBC0" +"WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" +"WDC WD2500PD-00FZB1" 194 C "Western Digital WD2500PD-00FZB1" +"WDC WD2500SD-01KCB0" 194 C "Western Digital Caviar RE 250GB 8MB" +"WDC WD3000JB-00KFA0" 194 C "Western Digital WD3000JB" +"WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB" +"WDC WD4000KD-00NAB0" 194 C "Western Digital Caviar SE16 400GB 16MB" +"WDC WD4000YR-01PLB0" 194 C "Western Digital Caviar RE2 400GB 16MB" +"WD4000YS-01MPB0" 194 C "Western Digital RE2 7200 SATA II 400 GB" + +# not sure for next +# "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" +# "WDC WD273BA" 9 C "Western Digital WD273BA" + + + + +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## +######################################################################################################################## + +"ST3750640AS" 194 C "Seagate Barracuda 7200.10 SATA 750GB" +"ST3750840AS" 194 C "Seagate Barracuda 7200.10 SATA 750GB" +"ST3500630AS" 194 C "Seagate Barracuda 7200.10 SATA 500GB" +"ST3500830AS" 194 C "Seagate Barracuda 7200.10 SATA 500GB" +"ST3400620AS" 194 C "Seagate Barracuda 7200.10 SATA 400GB" +"ST3400620A" 194 C "Seagate Barracuda 7200.10 400GB" +"ST3400820AS" 194 C "Seagate Barracuda 7200.10 SATA 400GB" +"ST3320620AS" 194 C "Seagate Barracuda 7200.10 SATA 320GB" +"ST3320820AS" 194 C "Seagate Barracuda 7200.10 SATA 320GB" +"ST3300620AS" 194 C "Seagate Barracuda 7200.10 SATA 300GB" +"ST3300820AS" 194 C "Seagate Barracuda 7200.10 SATA 300GB" +"ST3250620AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB" +"ST3250820AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB" +"ST3250410AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB" +"ST3250310AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB" +"ST3200820AS" 194 C "Seagate Barracuda 7200.10 SATA 200GB" +"ST3160815AS" 194 C "Seagate Barracuda 7200.10 SATA 160GB" +"ST3160215AS" 194 C "Seagate Barracuda 7200.10 SATA 160GB" +"ST3120815AS" 194 C "Seagate Barracuda 7200.10 SATA 120GB" +"ST3120215AS" 194 C "Seagate Barracuda 7200.10 SATA 120GB" +"ST380815AS" 194 C "Seagate Barracuda 7200.10 SATA 80GB" +"ST380215AS" 194 C "Seagate Barracuda 7200.10 SATA 80GB" +"ST340815AS" 194 C "Seagate Barracuda 7200.10 SATA 40GB" +"ST340215AS" 194 C "Seagate Barracuda 7200.10 SATA 40GB" +"ST3300622AS" 194 C "Seagate Barracuda 7200.9 SATA2.5 300GB" +"ST3300831A" 194 C "Seagate Barracuda 7200.8 PATA 300GB" + +"Maxtor 7(L|V)250(F|R|S)0" 194 C "Maxtor MaXLine III 250GB 7200rpm" +"Maxtor 7(L|V)300(F|R|S)0" 194 C "Maxtor MaXLine III 300GB 7200rpm" +"MAXTOR STM3320620AS" 194 C "" + +"WDC WD1500ADFD-00NLR1" 194 C "Western Digital Raptor 150GB" +"WDC WD1600JS-00NCB1" 194 C "Western Digital Caviar 1600JS 160GB Sata" +"WDC WD1600SD-01KCC0" 194 C "Western Digital Caviar RE Serial ATA series" +"WDC WD2500JD-57HBC0" 194 C "Western Digital Caviar SE (Serial ATA) 250 GB" +"WDC WD2500JS" 194 C "Western Digital WD2500JS" +"WDC WD2500JS-41MVB1" 194 C "Western Digital SATAII Caviar 250GB Special Edition 8MB" +"WDC WD2500JD-00HBB0" 194 C "Western Digital SATA 250GB" +"WDC WD2500KS-00MJB0" 194 C "Western Digital SATA-II Caviar 250GB Special Edition 16MB" +"WDC WD3000JS-00PDB0" 194 C "Western Digital WD3000JS" +"WDC WD3200KS-00PFB0" 194 C "" +"WDC WD3200JD-22KLB0" 194 C "Western Digital Caviar SE 320GB 8MB" diff --git a/app/admin/syslog-ng/logrotate.d/syslog-ng b/app/admin/syslog-ng/logrotate.d/syslog-ng new file mode 100644 index 0000000..b6a7e1d --- /dev/null +++ b/app/admin/syslog-ng/logrotate.d/syslog-ng @@ -0,0 +1,6 @@ +/var/log/cron /var/log/debug /var/log/maillog /var/log/messages /var/log/secure /var/log/spooler /var/log/syslog { + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid`2>/dev/null || true + endscript +} diff --git a/app/admin/syslog-ng/rc.syslog-ng.new b/app/admin/syslog-ng/rc.syslog-ng.new new file mode 100644 index 0000000..513154f --- /dev/null +++ b/app/admin/syslog-ng/rc.syslog-ng.new @@ -0,0 +1,37 @@ +#!/bin/sh +# Start/stop/restart the system logging daemons. +# +# Written for Slackware Linux by Patrick J. Volkerding . +# Modyfied for syslog-ng by Kanedaaa + +syslogng_start() { + if [ -x /usr/sbin/syslog-ng ]; then + echo -n "Starting syslog-ng daemon: " + echo " /usr/sbin/syslog-ng" + /usr/sbin/syslog-ng + fi +} + +syslogng_stop() { + killall syslog-ng 2> /dev/null +} + +syslogng_restart() { + syslogng_stop + sleep 1 + syslogng_start +} + +case "$1" in +'start') + syslogng_start + ;; +'stop') + syslogng_stop + ;; +'restart') + syslogng_restart + ;; +*) + echo "usage $0 start|stop|restart" +esac diff --git a/app/admin/syslog-ng/syslog-ng-anon-2.0.6.diff b/app/admin/syslog-ng/syslog-ng-anon-2.0.6.diff new file mode 100644 index 0000000..5b0a230 --- /dev/null +++ b/app/admin/syslog-ng/syslog-ng-anon-2.0.6.diff @@ -0,0 +1,277 @@ +diff -Naur syslog-ng-2.0.5.orig/doc/Makefile.am syslog-ng-2.0.5/doc/Makefile.am +--- syslog-ng-2.0.5.orig/doc/Makefile.am 2007-04-19 21:37:16.000000000 +0200 ++++ syslog-ng-2.0.5/doc/Makefile.am 2007-11-03 00:28:59.000000000 +0100 +@@ -6,6 +6,7 @@ + reference/syslog-ng.xml \ + reference/syslog-ng.txt \ + reference/syslog-ng.xsl \ ++ reference/README.syslog-ng-anon \ + examples/syslog-ng.conf.sample \ + examples/syslog-ng.conf.solaris + +diff -Naur syslog-ng-2.0.5.orig/doc/Makefile.in syslog-ng-2.0.5/doc/Makefile.in +--- syslog-ng-2.0.5.orig/doc/Makefile.in 2007-07-22 15:40:04.000000000 +0200 ++++ syslog-ng-2.0.5/doc/Makefile.in 2007-11-03 00:28:59.000000000 +0100 +@@ -135,6 +135,7 @@ + reference/syslog-ng.xml \ + reference/syslog-ng.txt \ + reference/syslog-ng.xsl \ ++ reference/README/syslog-ng-anon \ + examples/syslog-ng.conf.sample \ + examples/syslog-ng.conf.solaris + +diff -Naur syslog-ng-2.0.5.orig/doc/reference/README.syslog-ng-anon syslog-ng-2.0.5/doc/reference/README.syslog-ng-anon +--- syslog-ng-2.0.5.orig/doc/reference/README.syslog-ng-anon 1970-01-01 01:00:00.000000000 +0100 ++++ syslog-ng-2.0.5/doc/reference/README.syslog-ng-anon 2007-11-03 00:42:04.000000000 +0100 +@@ -0,0 +1,88 @@ ++syslog-ng-anon ++ ++ This patch adds the capability to syslog-ng that allows you to strip ++ out any given regexp or all IP addresses from log messages before ++ they are written to disk. The goal is to give the system administrator ++ the means to implement site logging policies, by allowing them easy ++ control over exactly what data they retain in their logfiles, ++ regardless of what a particular daemon might think is best. ++ ++Background: ++ ++ Data retention has become a hot legal topic for ISPs and other Online ++ Service Providers (OSPs). There are many instances where it is preferable ++ to keep less information on users than is collected by default on many ++ systems. In the United States it is not currently required to retain ++ data on users of a server, but you may be required to provide all data ++ on a user which you have retained. OSPs can protect themselves from legal ++ hassles and added work by choosing what data they wish to retain. ++ ++ From "Best Practices for Online Service Providers" ++ (http://www.eff.org/osp): ++ ++ As an intermediary, the OSP [Online Service Provider] finds itself in ++ a position to collect and store detailed information about its users ++ and their online activities that may be of great interest to third ++ parties. The USA PATRIOT Act also provides the government with ++ expanded powers to request this information. As a result, OSP owners ++ must deal with requests from law enforcement and lawyers to hand over ++ private user information and logs. Yet, compliance with these demands ++ takes away from an OSP's goal of providing users with reliable, ++ secure network services. In this paper, EFF offers some suggestions, ++ both legal and technical, for best practices that balance the needs ++ of OSPs and their users' privacy and civil liberties. ++ ++ Rather than scrubbing the information you don't want in logs, this patch ++ ensures that the information is never written to disk. Also, for those ++ daemons which log through syslog facilities, this patch provides a ++ convenient single configuration to limit what you wish to log. ++ ++ Here are some related links: ++ ++ Best Practices for Online Service Providers ++ http://www.eff.org/osp ++ http://www.eff.org/osp/20040819_OSPBestPractices.pdf ++ ++ EPIC International Data Retention Page ++ http://www.epic.org/privacy/intl/data_retention.html ++ ++ Working Paper on Usage Log Data Management (from Computer, Freedom, and ++ Privacy conference) http://cryptome.org/usage-logs.htm ++ ++ ++Installing syslog-ng-anon ++ ++ Applying the patch ++ ++ This patch has been tested against the following versions of syslog-ng: ++ . Debian package syslog-ng_2.0.5-2 ++ ++ To use this patch, obtain the source for syslog-ng ++ (apt-get source syslog-ng) and the ++ syslog-ng-anon patch (http://dev.riseup.net/patches/syslog-ng/). ++ Apply the patch the patch: ++ ++ % cd syslog-ng-2.0.5 ++ % patch -p1 < ../syslog-ng-anon.diff ++ ++ Then compile and install syslog-ng: ++ ++ % dpkg-buildpackage -rfakeroot -b ++ % dpkg -i ../syslog-ng_2.0.5-2_i386.deb ++ ++ How to use it ++ ++ This patch adds the filter "strip". For example: ++ ++ filter f_strip {strip();}; ++ ++ This will strip out all matches of the regular expression on logs to ++ which the filter is applied and replaces all matches with the fixed length ++ four dashes ("----"). ++ ++ In place of a regular expression, you can put "ips", which will replace all ++ internet addresses with 0.0.0.0. For example: ++ ++ filter f_strip {strip(ips);}; ++ ++ You can alter what the replacement strings are by using replace: +diff -Naur syslog-ng-2.0.5.orig/src/cfg-grammar.y syslog-ng-2.0.5/src/cfg-grammar.y +--- syslog-ng-2.0.5.orig/src/cfg-grammar.y 2007-05-21 19:21:07.000000000 +0200 ++++ syslog-ng-2.0.5/src/cfg-grammar.y 2007-11-03 00:28:59.000000000 +0100 +@@ -107,7 +107,7 @@ + %token KW_USE_TIME_RECVD + + /* filter items*/ +-%token KW_FACILITY KW_LEVEL KW_HOST KW_MATCH KW_NETMASK ++%token KW_FACILITY KW_LEVEL KW_HOST KW_MATCH KW_NETMASK KW_STRIP KW_REPLACE + + /* yes/no switches */ + %token KW_YES KW_NO +@@ -802,6 +802,8 @@ + | KW_PROGRAM '(' string ')' { $$ = filter_prog_new($3); free($3); } + | KW_HOST '(' string ')' { $$ = filter_host_new($3); free($3); } + | KW_MATCH '(' string ')' { $$ = filter_match_new($3); free($3); } ++ | KW_STRIP '(' string ')' { $$ = filter_strip_new($3); free($3); } ++ | KW_REPLACE '(' string string ')' { $$ = filter_replace_new($3, $4); free($3); free($4); } + | KW_FILTER '(' string ')' { $$ = filter_call_new($3, configuration); free($3); } + | KW_NETMASK '(' string ')' { $$ = filter_netmask_new($3); free($3); } + ; +@@ -907,4 +909,4 @@ + last_reader_options = NULL; + last_writer_options = NULL; + last_template = NULL; +-} +\ No newline at end of file ++} +diff -Naur syslog-ng-2.0.5.orig/src/cfg-lex.l syslog-ng-2.0.5/src/cfg-lex.l +--- syslog-ng-2.0.5.orig/src/cfg-lex.l 2007-05-21 19:21:07.000000000 +0200 ++++ syslog-ng-2.0.5/src/cfg-lex.l 2007-11-03 00:28:59.000000000 +0100 +@@ -165,6 +165,8 @@ + { "host", KW_HOST }, + { "match", KW_MATCH }, + { "netmask", KW_NETMASK }, ++ { "strip", KW_STRIP }, ++ { "replace", KW_REPLACE }, + + /* on/off switches */ + { "yes", KW_YES }, +diff -Naur syslog-ng-2.0.5.orig/src/filter.c syslog-ng-2.0.5/src/filter.c +--- syslog-ng-2.0.5.orig/src/filter.c 2007-05-21 19:21:07.000000000 +0200 ++++ syslog-ng-2.0.5/src/filter.c 2007-11-03 00:30:22.000000000 +0100 +@@ -226,6 +226,7 @@ + typedef struct _FilterRE + { + FilterExprNode super; ++ GString *replace; + regex_t regex; + } FilterRE; + +@@ -310,6 +311,9 @@ + filter_re_free(FilterExprNode *s) + { + FilterRE *self = (FilterRE *) s; ++ ++ if (self->replace != NULL) ++ g_string_free(self->replace, TRUE); + + regfree(&self->regex); + g_free(s); +@@ -494,3 +498,89 @@ + self->super.eval = filter_netmask_eval; + return &self->super; + } ++ ++FilterExprNode * ++filter_strip_new(const gchar *re) ++{ ++ if (g_ascii_strcasecmp(re, "ips") == 0) ++ return filter_replace_new(re, "0.0.0.0"); ++ return filter_replace_new(re, "----"); ++} ++ ++#define FMIN(a, b) (a) < (b) ? (a) : (b) ++#define NEW_MSG_SIZE 2048 ++ ++static gboolean ++filter_replace_eval(FilterExprNode *s, LogMessage *log) ++{ ++ FilterRE *self = (FilterRE *) s; ++ gchar *buffer = log->msg.str; ++ gint snippet_size; ++ regmatch_t pmatch; ++ gchar new_msg[NEW_MSG_SIZE]; ++ gchar *new_msg_max = new_msg + NEW_MSG_SIZE; ++ gchar *new_msg_ptr = new_msg; ++ gint replace_length = self->replace->len; ++ gint error; ++ ++ error = regexec(&self->regex, buffer, 1, &pmatch, 0); ++ if (error) ++ return TRUE; ++ while (!error) ++ { ++ /* copy string snippet which preceeds matched text */ ++ snippet_size = FMIN(pmatch.rm_so, new_msg_max - new_msg_ptr); ++ memcpy(new_msg_ptr, buffer, snippet_size); ++ new_msg_ptr += snippet_size; ++ ++ /* copy replacement */ ++ snippet_size = FMIN(replace_length, new_msg_max - new_msg_ptr); ++ memcpy(new_msg_ptr, self->replace->str, snippet_size); ++ new_msg_ptr += snippet_size; ++ ++ /* search for next match */ ++ buffer += pmatch.rm_eo; ++ error = regexec(&self->regex, buffer, 1, &pmatch, REG_NOTBOL); ++ } ++ ++ /* copy the rest of the old message */ ++ snippet_size = log->msg.len - (buffer - log->msg.str) + 1; ++ snippet_size = FMIN(snippet_size, new_msg_max - new_msg_ptr); ++ memcpy(new_msg_ptr, buffer, snippet_size); ++ new_msg[NEW_MSG_SIZE-1] = '\0'; ++ ++ g_string_erase(&(log->msg), 0, -1); ++ g_string_append(&(log->msg), new_msg); ++ ++ return TRUE; ++} ++ ++FilterExprNode * ++filter_replace_new(const gchar *re, const gchar *replacement) ++{ ++ FilterRE *self = g_new0(FilterRE, 1); ++ gint regerr; ++ ++ if (!g_ascii_strcasecmp(re, "ips")) ++ re = "(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])([\\.\\-](25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])){3}"; ++ ++ regerr = regcomp(&self->regex, re, REG_ICASE | REG_EXTENDED); ++ if (regerr) ++ { ++ gchar errorbuf[256]; ++ regerror(regerr, &self->regex, errorbuf, sizeof(errorbuf)); ++ msg_error("Error compiling regular expression:", ++ evt_tag_str("re", re), ++ evt_tag_str("error", errorbuf), ++ NULL); ++ g_free(self); ++ return NULL; ++ } ++ ++ self->replace = g_string_new(replacement); ++ self->super.eval = filter_replace_eval; ++ self->super.free_fn = filter_re_free; ++ ++ return &self->super; ++} ++ +diff -Naur syslog-ng-2.0.5.orig/src/filter.h syslog-ng-2.0.5/src/filter.h +--- syslog-ng-2.0.5.orig/src/filter.h 2007-05-21 19:21:07.000000000 +0200 ++++ syslog-ng-2.0.5/src/filter.h 2007-11-03 00:28:59.000000000 +0100 +@@ -54,6 +54,8 @@ + FilterExprNode *filter_match_new(gchar *re); + FilterExprNode *filter_call_new(gchar *rule, struct _GlobalConfig *cfg); + FilterExprNode *filter_netmask_new(gchar *cidr); ++FilterExprNode *filter_strip_new(const gchar *re); ++FilterExprNode *filter_replace_new(const gchar *re, const gchar *replacement); + + typedef struct _LogFilterRule + { diff --git a/app/admin/syslog-ng/syslog-ng.conf.new b/app/admin/syslog-ng/syslog-ng.conf.new new file mode 100644 index 0000000..706a35a --- /dev/null +++ b/app/admin/syslog-ng/syslog-ng.conf.new @@ -0,0 +1,270 @@ +# +# Configuration file for syslog-ng under Debian. +# First customized for riseup.net and then to sarava.org. +# +# see http://www.campin.net/syslog-ng/expanded-syslog-ng.conf +# for examples. +# +# levels: emerg alert crit err warning notice info debug +# + +############################################################ +## global options + +options { + chain_hostnames(0); + time_reopen(10); + time_reap(360); + sync(0); + log_fifo_size(2048); + create_dirs(yes); + owner(root); + group(wheel); + perm(0640); + dir_perm(0755); + use_dns(no); +}; + +############################################################ +## universal source + +source s_all { + internal(); + unix-stream("/dev/log"); + file("/proc/kmsg" log_prefix("kernel: ")); +}; + +############################################################ +## generic destinations + +destination df_facility_dot_info { file("/var/log/$FACILITY.info"); }; +destination df_facility_dot_notice { file("/var/log/$FACILITY.notice"); }; +destination df_facility_dot_warn { file("/var/log/$FACILITY.warn"); }; +destination df_facility_dot_err { file("/var/log/$FACILITY.err"); }; +destination df_facility_dot_crit { file("/var/log/$FACILITY.crit"); }; + +############################################################ +## generic filters + +filter f_strip { strip(ips); }; +filter f_at_least_info { level(info..emerg); }; +filter f_at_least_notice { level(notice..emerg); }; +filter f_at_least_warn { level(warn..emerg); }; +filter f_at_least_err { level(err..emerg); }; +filter f_at_least_crit { level(crit..emerg); }; + +############################################################ +## secure + +filter f_auth { facility(auth, authpriv); }; +destination df_auth { file("/var/log/secure"); }; +log { + source(s_all); + filter(f_auth); + # comment the following line if you don't want to strip IPs + filter(f_strip); + destination(df_auth); +}; + +############################################################ +## daemon log +# +#filter f_daemon { facility(daemon); }; +#destination df_daemon { file("/var/log/daemon.log"); }; +#log { +# source(s_all); +# filter(f_daemon); +# destination(df_daemon); +#}; + +############################################################ +## kern log +# +#filter f_kern { facility(kern); }; +#destination df_kern { file("/var/log/kernel"); }; +#log { +# source(s_all); +# filter(f_kern); +# destination(df_kern); +#}; + +############################################################ +## user log + +#filter f_user { facility(user); }; +#destination df_user { file("/var/log/user.log"); }; +#log { +# source(s_all); +# filter(f_user); +# destination(df_user); +#}; + +############################################################ +## sympa log + +filter f_sympa { program("^(sympa|bounced|archived|task_manager)"); }; +destination d_sympa { file("/var/log/sympa"); }; +log { + source(s_all); + filter(f_sympa); + destination(d_sympa); + flags(final); +}; + +############################################################ +## wwsympa log + +filter f_wwsympa { program("^wwsympa"); }; +destination d_wwsympa { file("/var/log/sympa"); }; +log { + source(s_all); + filter(f_wwsympa); + # comment the following line if you don't want to strip IPs + filter(f_strip); + destination(d_wwsympa); + flags(final); +}; + +############################################################ +## ldap log +# +#filter f_ldap { program("slapd"); }; +#destination d_ldap { file("/var/log/ldap"); }; +#log { +# source(s_all); +# filter(f_ldap); +# destination(d_ldap); +# flags(final); +#}; + +############################################################ +## mail log + +filter f_postfix { + program("^postfix/") or + program("courier|imap|pop|dovecot") or + program("^maildrop") or + facility(mail); +}; +destination d_postfix { file("/var/log/maillog"); }; +log { + source(s_all); + filter(f_postfix); + # comment the following line if you don't want to strip IPs + filter(f_strip); + destination(d_postfix); + flags(final); +}; + +############################################################ +## messages log + +filter f_messages { + facility(auth,authpriv,daemon,mail,user,kern,cron,news) or + level(info); +}; +destination df_messages { file("/var/log/messages"); }; +log { + source(s_all); + filter(f_messages); + # comment the following line if you don't want to strip IPs + filter(f_strip); + destination(df_messages); +}; + +############################################################ +## system log + +filter f_system { + facility(auth,authpriv,daemon,mail,user,kern,cron,news) or + level(warn,err,crit,alert,emerg); +}; +destination df_system { file("/var/log/syslog"); }; +log { + source(s_all); + filter(f_system); + # comment the following line if you don't want to strip IPs + filter(f_strip); + destination(df_system); +}; + +############################################################ +## cron log + +filter f_cron { facility(cron); }; +destination df_cron { file("/var/log/cron"); }; +log { + source(s_all); + filter(f_cron); + destination(df_cron); +}; + +############################################################ +## spooler log + +filter f_spooler { facility(uucp) and (facility(news) and level(crit)); }; +destination df_spooler { file("/var/log/spooler"); }; +log { + source(s_all); + filter(f_spooler); + # comment the following line if you don't want to strip IPs + filter(f_strip); + destination(df_spooler); +}; + +############################################################ +## debug log + +filter f_debug { level(debug); }; +destination df_debug { file("/var/log/debug"); }; +log { + source(s_all); + filter(f_debug); + # comment the following line if you don't want to strip IPs + filter(f_strip); + destination(df_debug); +}; + +############################################################ +## errors log +# +#filter f_errors { +# level(warn,err,crit,alert,emerg) +# and not facility(auth,authpriv,daemon,mail,user,kern); +#}; +#destination df_errors { file("/var/log/errors"); }; +#log { +# source(s_all); +# filter(f_errors); +# destination(df_errors); +#}; + +############################################################ +## emergencies + +filter f_emerg { level(emerg); }; +destination du_all { usertty("*"); }; +log { + source(s_all); + filter(f_emerg); + # comment the following line if you don't want to strip IPs + filter(f_strip); + destination(du_all); +}; + +############################################################ +## console messages + +#filter f_xconsole { +# facility(daemon,mail) +# or level(debug,info,notice,warn) +# or (facility(news) +# and level(crit,err,notice)); +#}; +#destination dp_xconsole { pipe("/dev/xconsole"); }; +#log { +# source(s_all); +# filter(f_xconsole); +# destination(dp_xconsole); +#}; + diff --git a/app/admin/syslog-ng/syslog-ng.mkbuild b/app/admin/syslog-ng/syslog-ng.mkbuild new file mode 100644 index 0000000..4f5b140 --- /dev/null +++ b/app/admin/syslog-ng/syslog-ng.mkbuild @@ -0,0 +1,117 @@ +# +# This mkbuild is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or any later version. +# +# This mkbuild is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place - Suite 330, Boston, MA 02111-1307, USA +# + +#-------------------- +# Personal variables +#-------------------- +# Author name +[[SLACKBUILD AUTHOR]]="Silvio Rhatto" + +# Initials author name +[[SLACKBUILD AUTHOR INITIALS]]="rha" + +#------------------------ +# Construction Variables +#------------------------ +# +# Complete URL address or URL base address ( without $SRC_NAME-$VERSION... ) +[[DOWNLOAD FOLDER URL]]="http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/syslog-ng-2.0.6.tar.gz" + +# +# Dependency list input +# Enter string: "dependency_1 [condiction_1] [versio_1]: dependency_2 [condiction_2] [versio_2]" +[[SLACK REQUIRED]]="eventlog" + +# +# Documentation files. Null ("") to auto-set commom doc-files: +[[DOCUMENTATION FILES]]="AUTHORS COPYING ChangeLog NEWS README VERSION" + +# +# ./configure options +[[OTHER CONFIGURE ARGS]]="--sysconfdir=/etc --enable-dynamic-linking" + +# +# Install script +[[REST OF DOINST.SH]]="config etc/rc.d/rc.syslog-ng.new ; config etc/syslog-ng.conf.new" + +#--------------------- +# Others changes +#--------------------- +#[[SIGNING KEY]]="" +#[[SIGNING KEY URL]]="" +#[[SIGNING KEY ID]]="" +[[CONFIG FILES]]="syslog-ng.conf.new logrotate.d/syslog-ng" +[[PATCH FILES]]="syslog-ng-anon-2.0.6.diff" +[[NUMBER OF PREFIX SLASHES TO STRIP]]="1" + +# SlackBuild model +[[SLACKBUILD MODEL]]="generic.mkSlackBuild" + +# SlackBuild PATH in Slack.Sarava tree +[[SLACKBUILD PATH]]="app/admin/syslog-ng" + +#--------------------- +# SlackBuild Sections +#--------------------- +# Default sections: +# head, set_variables, slkflags, start_structure, untar_source, +# make_package, install_package, build_package +# Warning: don't remove '#>>' and "#<<" tags. +#>> Start SlackBuild Sections: + on: head + on: slackbuildrc + on: set_variables + on: slkflags + on: error_codes + on: start_structure +off: create_build_user_and_group + on: download_source +off: svn_source +off: md5sum_download_and_check_0 +off: md5sum_download_and_check_1 +off: gpg_signature_check + on: untar_source + on: patch_source + on: configure + on: make_package + on: install_package + on: strip_binaries +off: compress_manpages +off: compress_info_files + on: copy_init_scripts + on: copy_config_files + on: install_documentation + on: slackdesc +off: move_config_files + on: postinstall_script + on: build_package + on: clean_builds +#<< End SlackBuild Sections + +#------------------ +# Sections changes +#------------------ +#>slackdesc +syslog-ng: syslog-ng +syslog-ng: +syslog-ng: syslog-ng is a syslogd replacement supporting IPv6 and capable of +syslog-ng: transferring log messages reliably using TCP and filtering the +syslog-ng: content of messages using regular expressions. It has several +syslog-ng: macros that allow users to dynamically create target directories +syslog-ng: and files or reformat messages. +syslog-ng: +syslog-ng: +syslog-ng: +syslog-ng: +#