From: Frank Brehm Date: Thu, 18 Jan 2018 16:57:27 +0000 (+0100) Subject: committing changes in /etc after emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=0993bca7b1d0a602d2b1f0bd0b52c9faeb05d977;p=config%2Fbruni%2Fetc.git committing changes in /etc after emerge run Package changes: --- diff --git a/.etckeeper b/.etckeeper index 13342948..e4976d3c 100755 --- a/.etckeeper +++ b/.etckeeper @@ -910,6 +910,7 @@ maybe chmod 0644 'config-archive/etc/signon-ui/webkit-options.d/www.facebook.com maybe chmod 0644 'config-archive/etc/signon-ui/webkit-options.d/www.facebook.com.conf.dist' maybe chmod 0644 'config-archive/etc/smartd.conf' maybe chmod 0644 'config-archive/etc/smartd.conf.1' +maybe chmod 0644 'config-archive/etc/smartd.conf.2' maybe chmod 0644 'config-archive/etc/smartd.conf.dist' maybe chmod 0755 'config-archive/etc/ssh' maybe chmod 0644 'config-archive/etc/ssh/ssh_config' diff --git a/config-archive/etc/smartd.conf b/config-archive/etc/smartd.conf index 806328c6..1a6e8155 100644 --- a/config-archive/etc/smartd.conf +++ b/config-archive/etc/smartd.conf @@ -2,7 +2,7 @@ # Home page is: http://smartmontools.sourceforge.net -# $Id: smartd.conf 3651 2012-10-18 15:11:36Z samm2 $ +# $Id: smartd.conf 4047 2015-03-22 16:16:24Z chrfranke $ # smartd will re-read the configuration file if it receives a HUP # signal @@ -33,7 +33,7 @@ # and min/max temperatures. #DEVICESCAN -I 194 -I 231 -I 9 -W 5 -# First (primary) ATA/IDE hard disk. Monitor all attributes, enable +# First ATA/SATA or SCSI/SAS disk. Monitor all attributes, enable # automatic online data collection, automatic Attribute autosave, and # start a short self-test every day between 2-3am, and a long self test # Saturdays between 3-4am. @@ -41,17 +41,17 @@ /dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) /dev/sdb -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) /dev/sdc -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) -#/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) +#/dev/sda -a -o on -S on -s (S/../.././02|L/../../6/03) # Monitor SMART status, ATA Error Log, Self-test log, and track # changes in all attributes except for attribute 194 -#/dev/hdb -H -l error -l selftest -t -I 194 +#/dev/sdb -H -l error -l selftest -t -I 194 # Monitor all attributes except normalized Temperature (usually 194), # but track Temperature changes >= 4 Celsius, report Temperatures # >= 45 Celsius and changes in Raw value of Reallocated_Sector_Ct (5). # Send mail on SMART failures or when Temperature is >= 55 Celsius. -#/dev/hdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com +#/dev/sdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com # An ATA disk may appear as a SCSI device to the OS. If a SCSI to # ATA Translation (SAT) layer is between the OS and the device then @@ -61,7 +61,7 @@ # A very silent check. Only report SMART health status if it fails # But send an email in this case -#/dev/hdc -H -C 0 -U 0 -m admin@example.com +#/dev/sdc -H -C 0 -U 0 -m admin@example.com # First two SCSI disks. This will monitor everything that smartd can # monitor. Start extended self-tests Wednesdays between 6-7pm and @@ -145,5 +145,5 @@ # All but -d, -m and -M Directives are only implemented for ATA devices # # If the test string DEVICESCAN is the first uncommented text -# then smartd will scan for devices /dev/hd[a-l] and /dev/sd[a-z] +# then smartd will scan for devices. # DEVICESCAN may be followed by any desired Directives. diff --git a/config-archive/etc/smartd.conf.1 b/config-archive/etc/smartd.conf.1 index 80214991..806328c6 100644 --- a/config-archive/etc/smartd.conf.1 +++ b/config-archive/etc/smartd.conf.1 @@ -2,7 +2,7 @@ # Home page is: http://smartmontools.sourceforge.net -# $Id: smartd.conf 3128 2010-07-27 13:08:31Z chrfranke $ +# $Id: smartd.conf 3651 2012-10-18 15:11:36Z samm2 $ # smartd will re-read the configuration file if it receives a HUP # signal @@ -40,6 +40,7 @@ #/dev/hda -a -o on -S on -s (S/../.././02|L/../../6/03) /dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) /dev/sdb -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) +/dev/sdc -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) #/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) # Monitor SMART status, ATA Error Log, Self-test log, and track @@ -86,10 +87,11 @@ #/dev/twa0 -d 3ware,1 -a -s L/../../2/03 # Monitor 2 SATA (not SAS) disks connected to a 3ware 9000 controller which -# uses the 3w-sas driver (Linux, FreeBSD). Start long self-tests Tuesdays +# uses the 3w-sas driver (Linux). Start long self-tests Tuesdays # between 1-2 and 3-4 am. +# On FreeBSD /dev/tws0 should be used instead #/dev/twl0 -d 3ware,0 -a -s L/../../2/01 -#/dev/twa0 -d 3ware,1 -a -s L/../../2/03 +#/dev/twl0 -d 3ware,1 -a -s L/../../2/03 # Same as above for Windows. Option '-d 3ware,N' is not necessary, # disk (port) number is specified in device name. diff --git a/config-archive/etc/smartd.conf.2 b/config-archive/etc/smartd.conf.2 new file mode 100644 index 00000000..80214991 --- /dev/null +++ b/config-archive/etc/smartd.conf.2 @@ -0,0 +1,147 @@ +# Sample configuration file for smartd. See man smartd.conf. + +# Home page is: http://smartmontools.sourceforge.net + +# $Id: smartd.conf 3128 2010-07-27 13:08:31Z chrfranke $ + +# smartd will re-read the configuration file if it receives a HUP +# signal + +# The file gives a list of devices to monitor using smartd, with one +# device per line. Text after a hash (#) is ignored, and you may use +# spaces and tabs for white space. You may use '\' to continue lines. + +# You can usually identify which hard disks are on your system by +# looking in /proc/ide and in /proc/scsi. + +# The word DEVICESCAN will cause any remaining lines in this +# configuration file to be ignored: it tells smartd to scan for all +# ATA and SCSI devices. DEVICESCAN may be followed by any of the +# Directives listed below, which will be applied to all devices that +# are found. Most users should comment out DEVICESCAN and explicitly +# list the devices that they wish to monitor. +#DEVICESCAN + +# Alternative setting to ignore temperature and power-on hours reports +# in syslog. +#DEVICESCAN -I 194 -I 231 -I 9 + +# Alternative setting to report more useful raw temperature in syslog. +#DEVICESCAN -R 194 -R 231 -I 9 + +# Alternative setting to report raw temperature changes >= 5 Celsius +# and min/max temperatures. +#DEVICESCAN -I 194 -I 231 -I 9 -W 5 + +# First (primary) ATA/IDE hard disk. Monitor all attributes, enable +# automatic online data collection, automatic Attribute autosave, and +# start a short self-test every day between 2-3am, and a long self test +# Saturdays between 3-4am. +#/dev/hda -a -o on -S on -s (S/../.././02|L/../../6/03) +/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) +/dev/sdb -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) +#/dev/sda -a -m frank@brehm-online.com -M daily -M test -s (S/../.././01|L/../../6/03) + +# Monitor SMART status, ATA Error Log, Self-test log, and track +# changes in all attributes except for attribute 194 +#/dev/hdb -H -l error -l selftest -t -I 194 + +# Monitor all attributes except normalized Temperature (usually 194), +# but track Temperature changes >= 4 Celsius, report Temperatures +# >= 45 Celsius and changes in Raw value of Reallocated_Sector_Ct (5). +# Send mail on SMART failures or when Temperature is >= 55 Celsius. +#/dev/hdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com + +# An ATA disk may appear as a SCSI device to the OS. If a SCSI to +# ATA Translation (SAT) layer is between the OS and the device then +# this can be flagged with the '-d sat' option. This situation may +# become common with SATA disks in SAS and FC environments. +# /dev/sda -a -d sat + +# A very silent check. Only report SMART health status if it fails +# But send an email in this case +#/dev/hdc -H -C 0 -U 0 -m admin@example.com + +# First two SCSI disks. This will monitor everything that smartd can +# monitor. Start extended self-tests Wednesdays between 6-7pm and +# Sundays between 1-2 am +#/dev/sda -d scsi -s L/../../3/18 +#/dev/sdb -d scsi -s L/../../7/01 + +# Monitor 4 ATA disks connected to a 3ware 6/7/8000 controller which uses +# the 3w-xxxx driver. Start long self-tests Sundays between 1-2, 2-3, 3-4, +# and 4-5 am. +# NOTE: starting with the Linux 2.6 kernel series, the /dev/sdX interface +# is DEPRECATED. Use the /dev/tweN character device interface instead. +# For example /dev/twe0, /dev/twe1, and so on. +#/dev/sdc -d 3ware,0 -a -s L/../../7/01 +#/dev/sdc -d 3ware,1 -a -s L/../../7/02 +#/dev/sdc -d 3ware,2 -a -s L/../../7/03 +#/dev/sdc -d 3ware,3 -a -s L/../../7/04 + +# Monitor 2 ATA disks connected to a 3ware 9000 controller which +# uses the 3w-9xxx driver (Linux, FreeBSD). Start long self-tests Tuesdays +# between 1-2 and 3-4 am. +#/dev/twa0 -d 3ware,0 -a -s L/../../2/01 +#/dev/twa0 -d 3ware,1 -a -s L/../../2/03 + +# Monitor 2 SATA (not SAS) disks connected to a 3ware 9000 controller which +# uses the 3w-sas driver (Linux, FreeBSD). Start long self-tests Tuesdays +# between 1-2 and 3-4 am. +#/dev/twl0 -d 3ware,0 -a -s L/../../2/01 +#/dev/twa0 -d 3ware,1 -a -s L/../../2/03 + +# Same as above for Windows. Option '-d 3ware,N' is not necessary, +# disk (port) number is specified in device name. +# NOTE: On Windows, DEVICESCAN works also for 3ware controllers. +#/dev/hdc,0 -a -s L/../../2/01 +#/dev/hdc,1 -a -s L/../../2/03 + +# Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long +# self-tests Sundays between 1-2, 2-3, and 3-4 am. +#/dev/sdd -d hpt,1/1 -a -s L/../../7/01 +#/dev/sdd -d hpt,1/2 -a -s L/../../7/02 +#/dev/sdd -d hpt,1/3 -a -s L/../../7/03 + +# Monitor 2 ATA disks connected to the same PMPort which connected to the +# HighPoint RocketRAID. Start long self-tests Tuesdays between 1-2 and 3-4 am +#/dev/sdd -d hpt,1/4/1 -a -s L/../../2/01 +#/dev/sdd -d hpt,1/4/2 -a -s L/../../2/03 + +# HERE IS A LIST OF DIRECTIVES FOR THIS CONFIGURATION FILE. +# PLEASE SEE THE smartd.conf MAN PAGE FOR DETAILS +# +# -d TYPE Set the device type: ata, scsi, marvell, removable, 3ware,N, hpt,L/M/N +# -T TYPE set the tolerance to one of: normal, permissive +# -o VAL Enable/disable automatic offline tests (on/off) +# -S VAL Enable/disable attribute autosave (on/off) +# -n MODE No check. MODE is one of: never, sleep, standby, idle +# -H Monitor SMART Health Status, report if failed +# -l TYPE Monitor SMART log. Type is one of: error, selftest +# -f Monitor for failure of any 'Usage' Attributes +# -m ADD Send warning email to ADD for -H, -l error, -l selftest, and -f +# -M TYPE Modify email warning behavior (see man page) +# -s REGE Start self-test when type/date matches regular expression (see man page) +# -p Report changes in 'Prefailure' Normalized Attributes +# -u Report changes in 'Usage' Normalized Attributes +# -t Equivalent to -p and -u Directives +# -r ID Also report Raw values of Attribute ID with -p, -u or -t +# -R ID Track changes in Attribute ID Raw value with -p, -u or -t +# -i ID Ignore Attribute ID for -f Directive +# -I ID Ignore Attribute ID for -p, -u or -t Directive +# -C ID Report if Current Pending Sector count non-zero +# -U ID Report if Offline Uncorrectable count non-zero +# -W D,I,C Monitor Temperature D)ifference, I)nformal limit, C)ritical limit +# -v N,ST Modifies labeling of Attribute N (see man page) +# -a Default: equivalent to -H -f -t -l error -l selftest -C 197 -U 198 +# -F TYPE Use firmware bug workaround. Type is one of: none, samsung +# -P TYPE Drive-specific presets: use, ignore, show, showall +# # Comment: text after a hash sign is ignored +# \ Line continuation character +# Attribute ID is a decimal integer 1 <= ID <= 255 +# except for -C and -U, where ID = 0 turns them off. +# All but -d, -m and -M Directives are only implemented for ATA devices +# +# If the test string DEVICESCAN is the first uncommented text +# then smartd will scan for devices /dev/hd[a-l] and /dev/sd[a-z] +# DEVICESCAN may be followed by any desired Directives. diff --git a/config-archive/etc/smartd.conf.dist b/config-archive/etc/smartd.conf.dist index 40fa10ec..d4a0d10a 100644 --- a/config-archive/etc/smartd.conf.dist +++ b/config-archive/etc/smartd.conf.dist @@ -1,8 +1,8 @@ # Sample configuration file for smartd. See man smartd.conf. -# Home page is: http://smartmontools.sourceforge.net +# Home page is: http://www.smartmontools.org -# $Id: smartd.conf 4047 2015-03-22 16:16:24Z chrfranke $ +# $Id: smartd.conf 4120 2015-08-27 16:12:21Z samm2 $ # smartd will re-read the configuration file if it receives a HUP # signal diff --git a/smartd.conf b/smartd.conf index 1a6e8155..c3bccd3d 100644 --- a/smartd.conf +++ b/smartd.conf @@ -1,8 +1,8 @@ # Sample configuration file for smartd. See man smartd.conf. -# Home page is: http://smartmontools.sourceforge.net +# Home page is: http://www.smartmontools.org -# $Id: smartd.conf 4047 2015-03-22 16:16:24Z chrfranke $ +# $Id: smartd.conf 4120 2015-08-27 16:12:21Z samm2 $ # smartd will re-read the configuration file if it receives a HUP # signal