From: Frank Brehm Date: Wed, 19 Jul 2017 19:44:25 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=d0f97280bcfdfa9c239f51db8ea42f0aaa3a97c9;p=config%2Fsarah%2Fetc.git saving uncommitted changes in /etc prior to apt run --- diff --git a/apt/sources.list b/apt/sources.list index 88838d9..ae6ae79 100644 --- a/apt/sources.list +++ b/apt/sources.list @@ -1,3 +1,7 @@ +# + +# deb cdrom:[Debian GNU/Linux stretch-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main + # deb http://ftp-stud.hs-esslingen.de/debian stretch main # main stretch repositories diff --git a/iptables/rules.v4 b/iptables/rules.v4 index 072a783..01d9d26 100644 --- a/iptables/rules.v4 +++ b/iptables/rules.v4 @@ -1,19 +1,9 @@ -# Generated by iptables-save v1.6.0 on Wed Jul 19 21:37:54 2017 +# Generated by iptables-save v1.6.0 on Wed Jul 19 21:42:25 2017 *filter :INPUT DROP [0:0] :FORWARD DROP [0:0] -:OUTPUT ACCEPT [2:472] -:fail2ban-dovecot - [0:0] -:fail2ban-postfix - [0:0] -:fail2ban-roundcube - [0:0] -:fail2ban-sshd - [0:0] -:fail2ban-sshd-ddos - [0:0] +:OUTPUT ACCEPT [66:13536] :mysql - [0:0] --A INPUT -p tcp -m multiport --dports 80,443,25,587,110,995,143,993,4190 -j fail2ban-postfix --A INPUT -p tcp -m multiport --dports 80,443,25,587,110,995,143,993,4190 -j fail2ban-dovecot --A INPUT -p tcp -m multiport --dports 80,443,25,587,110,995,143,993,4190 -j fail2ban-roundcube --A INPUT -p tcp -m multiport --dports 22 -j fail2ban-sshd-ddos --A INPUT -p tcp -m multiport --dports 22 -j fail2ban-sshd -A INPUT -s 220.192.0.0/12 -p tcp -m multiport --dports 80,443,25,587,110,995,143,993,4190 -j REJECT --reject-with icmp-port-unreachable -A INPUT -s 222.184.0.0/13 -p tcp -m multiport --dports 22 -j REJECT --reject-with icmp-port-unreachable -A INPUT -s 220.192.0.0/12 -p tcp -m multiport --dports 22 -j REJECT --reject-with icmp-port-unreachable @@ -35,11 +25,6 @@ -A INPUT -p tcp -m tcp --dport 3306 -j mysql -A INPUT -j NFLOG --nflog-prefix "INPUT Reject " --nflog-threshold 1 -A INPUT -j REJECT --reject-with icmp-port-unreachable --A fail2ban-dovecot -j RETURN --A fail2ban-postfix -j RETURN --A fail2ban-roundcube -j RETURN --A fail2ban-sshd -j RETURN --A fail2ban-sshd-ddos -j RETURN -A mysql -s 127.0.0.1/32 -j ACCEPT -A mysql -s 185.48.118.130/32 -j ACCEPT -A mysql -s 10.12.20.5/32 -j ACCEPT @@ -47,12 +32,12 @@ -A mysql -j NFLOG --nflog-prefix "MySQL Reject " --nflog-threshold 1 -A mysql -j REJECT --reject-with icmp-port-unreachable COMMIT -# Completed on Wed Jul 19 21:37:54 2017 -# Generated by iptables-save v1.6.0 on Wed Jul 19 21:37:54 2017 +# Completed on Wed Jul 19 21:42:25 2017 +# Generated by iptables-save v1.6.0 on Wed Jul 19 21:42:25 2017 *nat -:PREROUTING ACCEPT [0:0] -:INPUT ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] -:POSTROUTING ACCEPT [0:0] +:PREROUTING ACCEPT [76:3960] +:INPUT ACCEPT [23:1804] +:OUTPUT ACCEPT [19:1598] +:POSTROUTING ACCEPT [19:1598] COMMIT -# Completed on Wed Jul 19 21:37:54 2017 +# Completed on Wed Jul 19 21:42:25 2017 diff --git a/iptables/rules.v6 b/iptables/rules.v6 index 4f803a6..10c2a10 100644 --- a/iptables/rules.v6 +++ b/iptables/rules.v6 @@ -1,4 +1,4 @@ -# Generated by ip6tables-save v1.6.0 on Wed Jul 19 21:37:54 2017 +# Generated by ip6tables-save v1.6.0 on Wed Jul 19 21:42:25 2017 *filter :INPUT DROP [0:0] :FORWARD ACCEPT [0:0] @@ -25,4 +25,4 @@ -A mysql -j NFLOG --nflog-prefix "IPv6 MySQL Reject " --nflog-threshold 1 -A mysql -j REJECT --reject-with icmp6-port-unreachable COMMIT -# Completed on Wed Jul 19 21:37:54 2017 +# Completed on Wed Jul 19 21:42:25 2017 diff --git a/logrotate.d/chrony b/logrotate.d/chrony index 355118e..9a94e1c 100644 --- a/logrotate.d/chrony +++ b/logrotate.d/chrony @@ -10,6 +10,6 @@ sharedscripts create 644 postrotate - /usr/bin/chronyc -a cyclelogs > /dev/null 2>&1 || true + /usr/bin/chronyc cyclelogs > /dev/null 2>&1 || true endscript } diff --git a/motd b/motd index d76a489..758f7c0 100644 --- a/motd +++ b/motd @@ -1,5 +1,5 @@ Linux sarah 4.9.0-0.bpo.2-amd64 #1 SMP Debian 4.9.18-1~bpo8+1 (2017-04-10) x86_64 GNU/Linux -Debian GNU/Linux 8.8 (jessie) +Debian GNU/Linux 9.0 (stretch) ____ _ / ___| __ _ _ __ __ _| |__ \___ \ / _` | '__/ _` | '_ \ @@ -7,10 +7,8 @@ Debian GNU/Linux 8.8 (jessie) |____/ \__,_|_| \__,_|_| |_| -Die menschliche Dummheit ist keine historische Sache. Die menschliche -Dummheit existiert allgemein, sogar bis in alle Ewigkeit hinein. Diese -Dummheit gehört zum Menschen. Sie ist eine strukturelle Angelegenheit. - -- Laszlo Krasznahorkai +Ich gehe jetzt in den Birkenwald, +denn meine Pillen wirken bald. Today is Setting Orange, the 54th day of Confusion in the YOLD 3183 diff --git a/rsyslog.conf b/rsyslog.conf index 5885569..0f6dca3 100644 --- a/rsyslog.conf +++ b/rsyslog.conf @@ -10,18 +10,18 @@ $AbortOnUncleanConfig on #### MODULES #### ################# -$ModLoad imuxsock # provides support for local system logging -$ModLoad imklog # provides kernel logging support -#$ModLoad immark # provides --MARK-- message capability +module(load="imuxsock") # provides support for local system logging +module(load="imklog") # provides kernel logging support +#module(load="immark") # provides --MARK-- message capability module(load="immark" Interval="600") # provides UDP syslog reception -#$ModLoad imudp -#$UDPServerRun 514 +#module(load="imudp") +#input(type="imudp" port="514") # provides TCP syslog reception -#$ModLoad imtcp -#$InputTCPServerRun 514 +#module(load="imtcp") +#input(type="imtcp" port="514") ########################### @@ -50,17 +50,6 @@ $FileCreateMode 0640 $DirCreateMode 0755 $Umask 0022 -module( - load="builtin:omfile" - Template="RSYSLOG_FileFormat" - FileCreateMode="0644" - DirCreateMode="0755" - fileOwnerNum="0" - fileGroupNum="0" - dirOwnerNum="0" - dirGroupNum="0" -) - # # Where to place spool and state files # @@ -118,25 +107,3 @@ $IncludeConfig /etc/rsyslog.d/*.conf # Emergencies are sent to everybody logged in. # *.emerg :omusrmsg:* - -# -# I like to have messages displayed on the console, but only on a virtual -# console I usually leave idle. -# -#daemon,mail.*;\ -# news.=crit;news.=err;news.=notice;\ -# *.=debug;*.=info;\ -# *.=notice;*.=warn /dev/tty8 - -# The named pipe /dev/xconsole is for the `xconsole' utility. To use it, -# you must invoke `xconsole' with the `-file' option: -# -# $ xconsole -file /dev/xconsole [...] -# -# NOTE: adjust the list below, or you'll go crazy if you have a reasonably -# busy site.. -# -daemon.*;mail.*;\ - news.err;\ - *.=debug;*.=info;\ - *.=notice;*.=warn |/dev/xconsole diff --git a/vim/vimrc.local b/vim/vimrc.local index 6dea612..9f909fd 100644 --- a/vim/vimrc.local +++ b/vim/vimrc.local @@ -10,6 +10,7 @@ set smartcase " Do smart case matching set incsearch " Incremental search set autowrite " Automatically save before commands like :next and :make set hidden " Hide buffers when they are abandoned +set mouse= " Disable mouse usage (all modes) autocmd FileType sls set tabstop=2 expandtab shiftwidth=2 softtabstop=2 autocmd FileType python set tabstop=4 expandtab shiftwidth=4 softtabstop=4