From: Frank Brehm Date: Wed, 19 Jul 2017 16:04:35 +0000 (+0200) Subject: State befor upgrade to Stretch X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=1cfc7f9c92b22c4dc0c4ac0995de164da07e964e;p=config%2Fsarah%2Fetc.git State befor upgrade to Stretch --- diff --git a/.etckeeper b/.etckeeper index 1587160..113e062 100755 --- a/.etckeeper +++ b/.etckeeper @@ -28,7 +28,6 @@ mkdir -p './initramfs-tools/scripts/nfs-premount' mkdir -p './initramfs-tools/scripts/nfs-top' mkdir -p './initramfs-tools/scripts/panic' mkdir -p './insserv/overrides' -mkdir -p './logwatch/conf/services' mkdir -p './logwatch/scripts/services' mkdir -p './network/if-post-down.d' mkdir -p './network/if-pre-up.d' @@ -737,11 +736,15 @@ maybe chmod 0755 'logwatch/conf/logfiles' maybe chmod 0644 'logwatch/conf/logfiles/cron.conf' maybe chmod 0644 'logwatch/conf/logfiles/daemon.conf' maybe chmod 0644 'logwatch/conf/logfiles/fail2ban.conf' +maybe chmod 0644 'logwatch/conf/logfiles/iptables.conf' maybe chmod 0644 'logwatch/conf/logfiles/maillog.conf' +maybe chmod 0644 'logwatch/conf/logfiles/named.conf' maybe chmod 0644 'logwatch/conf/logfiles/secure.conf' maybe chmod 0644 'logwatch/conf/logfiles/syslog.conf' maybe chmod 0644 'logwatch/conf/logwatch.conf' maybe chmod 0755 'logwatch/conf/services' +maybe chmod 0644 'logwatch/conf/services/iptables.conf' +maybe chmod 0644 'logwatch/conf/services/named.conf' maybe chmod 0755 'logwatch/scripts' maybe chmod 0755 'logwatch/scripts/services' maybe chmod 0755 'lvm' diff --git a/logwatch/conf/logfiles/iptables.conf b/logwatch/conf/logfiles/iptables.conf new file mode 100644 index 0000000..3826d98 --- /dev/null +++ b/logwatch/conf/logfiles/iptables.conf @@ -0,0 +1,24 @@ +########################################################################## +# $Id$ +########################################################################## + +######################################################## +# This was written and is maintained by: +# Kirk Bauer +# +# Please send all comments, suggestions, bug reports, +# etc, to kirk@kaybee.org. +######################################################## + +# What actual file? Defaults to LogPath if not absolute path.... +LogFile = ulog/syslogemu.log + +# If the archives are searched, here is one or more line +# (optionally containing wildcards) that tell where they are... +Archive = ulog/syslogemu.log.* +Archive = ulog/syslogemu.log-* + +# Keep only the lines in the proper date range... +*ApplyStdDate + +# vi: shiftwidth=3 tabstop=3 et diff --git a/logwatch/conf/logfiles/named.conf b/logwatch/conf/logfiles/named.conf new file mode 100644 index 0000000..90bbd17 --- /dev/null +++ b/logwatch/conf/logfiles/named.conf @@ -0,0 +1,24 @@ +########################################################################## +# $Id$ +########################################################################## + +######################################################## +# This was written and is maintained by: +# Frank Brehm +######################################################## + +# What actual file? Defaults to LogPath if not absolute path.... +LogFile = bind/named.log +LogFile = bind/security.log + +# If the archives are searched, here is one or more line +# (optionally containing wildcards) that tell where they are... +Archive = bind/named.log.* +Archive = bind/named.log-* +Archive = bind/.old/named.log.* +Archive = bind/.old/named.log-* + +# Keep only the lines in the proper date range... +*ApplyBindDate + +# vi: filetype=conf shiftwidth=3 tabstop=3 et diff --git a/logwatch/conf/services/iptables.conf b/logwatch/conf/services/iptables.conf new file mode 100644 index 0000000..854e310 --- /dev/null +++ b/logwatch/conf/services/iptables.conf @@ -0,0 +1,41 @@ +########################################################################### +# $Id$ +########################################################################### + +# You can put comments anywhere you want to. They are effective for the +# rest of the line. + +# this is in the format of = . Whitespace at the beginning +# and end of the lines is removed. Whitespace before and after the = sign +# is removed. Everything is case *insensitive*. + +# Yes = True = On = 1 +# No = False = Off = 0 + +Title = "iptables firewall" + +# Which logfile group... +#LogFile = messages +LogFile = iptables + +# Set this to yes to lookup IPs in kernel firewall report +$iptables_ip_lookup = Yes + +# Set this to enable a filter on iptables/ipchains displays +# This will block out hosts who have less than the specified +# number of hits between all ports. Defaults to 0. +$iptables_host_min_count = 0 + +# If both of the following settings are enabled, two output lists +# will be produced. If none is set, the old style output is prduced. +# Set this to generate old style output (sorted by source hosts) +#$iptables_list_by_host = 0 +# Set this to generate new style output (sorted by targeted service) +$iptables_list_by_service = 1 + +######################################################## +# Please send all comments, suggestions, bug reports, +# etc, to logwatch-devel@lists.sourceforge.net +######################################################## + +# vi: shiftwidth=3 tabstop=3 et diff --git a/logwatch/conf/services/named.conf b/logwatch/conf/services/named.conf new file mode 100644 index 0000000..5e7b27b --- /dev/null +++ b/logwatch/conf/services/named.conf @@ -0,0 +1,37 @@ +########################################################################### +# $Id$ +########################################################################### + +# You can put comments anywhere you want to. They are effective for the +# rest of the line. + +# this is in the format of = . Whitespace at the beginning +# and end of the lines is removed. Whitespace before and after the = sign +# is removed. Everything is case *insensitive*. + +# Yes = True = On = 1 +# No = False = Off = 0 + +Title = "Named" + +# Which logfile group... +#LogFile = messages +LogFile = named + +# Whether or not to lookup the IPs into hostnames... +# Setting this to Yes will significantly increase runtime +$named_ip_lookup = No + +# Only give lines pertaining to the named service... +#*OnlyService = named +*RemoveHeaders + +######################################################## +# This was written and is maintained by: +# Kirk Bauer +# +# Please send all comments, suggestions, bug reports, +# etc, to kirk@kaybee.org. +######################################################## + +# vi: filetype=conf shiftwidth=3 tabstop=3 et diff --git a/profile.d/fbrehm.sh b/profile.d/fbrehm.sh index b0275e9..64aa26d 100644 --- a/profile.d/fbrehm.sh +++ b/profile.d/fbrehm.sh @@ -13,7 +13,7 @@ HISTCONTROL=ignoredups:ignorespace shopt -s histappend # coloring grep: -export GREP_OPTIONS='--color=auto' +alias grep='grep --color=auto' export GREP_COLOR='1;32' # hold these special chars when piping to less diff --git a/vim/vimrc.local b/vim/vimrc.local index 3df6028..6dea612 100644 --- a/vim/vimrc.local +++ b/vim/vimrc.local @@ -37,6 +37,7 @@ if has("autocmd") filetype plugin indent off endif " has("autocmd") +let g:skip_defaults_vim = 1 filetype plugin off