From: Frank Brehm Date: Tue, 27 Sep 2016 04:25:54 +0000 (+0200) Subject: daily autocommit X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=dbfa1cc249b2a7a20e085b3d5a33eb2e95f321c5;p=config%2Fsarah%2Fetc.git daily autocommit --- diff --git a/iptables/rules.v4 b/iptables/rules.v4 index 9975924..6cc2071 100644 --- a/iptables/rules.v4 +++ b/iptables/rules.v4 @@ -1,8 +1,16 @@ -# Generated by iptables-save v1.4.21 on Thu Jul 21 20:45:09 2016 +# Generated by iptables-save v1.4.21 on Mon Sep 26 10:19:33 2016 +*nat +:PREROUTING ACCEPT [112659:8532624] +:INPUT ACCEPT [81886:6621185] +:OUTPUT ACCEPT [1331185:87166714] +:POSTROUTING ACCEPT [1331185:87166714] +COMMIT +# Completed on Mon Sep 26 10:19:33 2016 +# Generated by iptables-save v1.4.21 on Mon Sep 26 10:19:33 2016 *filter :INPUT DROP [0:0] :FORWARD DROP [0:0] -:OUTPUT ACCEPT [66:12517] +:OUTPUT ACCEPT [54:12032] :fail2ban-dovecot - [0:0] :fail2ban-postfix - [0:0] :fail2ban-roundcube - [0:0] @@ -13,6 +21,8 @@ -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 220.192.0.0/12 -p tcp -m multiport --dports 22 -j REJECT --reject-with icmp-port-unreachable -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT -A INPUT -i lo -j ACCEPT -A INPUT -p icmp -m icmp --icmp-type 8 -j ACCEPT @@ -36,4 +46,4 @@ -A fail2ban-sshd -j RETURN -A fail2ban-sshd-ddos -j RETURN COMMIT -# Completed on Thu Jul 21 20:45:09 2016 +# Completed on Mon Sep 26 10:19:33 2016 diff --git a/iptables/rules.v6 b/iptables/rules.v6 index a8c07a5..f143a0e 100644 --- a/iptables/rules.v6 +++ b/iptables/rules.v6 @@ -1,8 +1,8 @@ -# Generated by ip6tables-save v1.4.21 on Thu Jul 21 20:45:09 2016 +# Generated by ip6tables-save v1.4.21 on Mon Sep 26 10:19:33 2016 *filter :INPUT DROP [0:0] :FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [9295:795073] +:OUTPUT ACCEPT [2483383:366152517] -A INPUT -m conntrack --ctstate ESTABLISHED -j ACCEPT -A INPUT -m conntrack --ctstate RELATED -j ACCEPT -A INPUT -p ipv6-icmp -j ACCEPT @@ -16,4 +16,4 @@ -A INPUT -j NFLOG --nflog-prefix "IPv6 INPUT Reject " --nflog-threshold 1 -A INPUT -j REJECT --reject-with icmp6-port-unreachable COMMIT -# Completed on Thu Jul 21 20:45:09 2016 +# Completed on Mon Sep 26 10:19:33 2016 diff --git a/php5/fpm/pool.d/www.conf b/php5/fpm/pool.d/www.conf index 82f9771..5b5f19a 100644 --- a/php5/fpm/pool.d/www.conf +++ b/php5/fpm/pool.d/www.conf @@ -231,7 +231,7 @@ pm.max_spare_servers = 3 ; anything, but it may not be a good idea to use the .php extension or it ; may conflict with a real PHP file. ; Default Value: not set -;pm.status_path = /status +pm.status_path = /status ; The ping URI to call the monitoring page of FPM. If this value is not set, no ; URI will be recognized as a ping page. This could be used to test from outside @@ -252,7 +252,7 @@ pm.max_spare_servers = 3 ; The access log file ; Default: not set -;access.log = log/$pool.access.log +access.log = /var/log/php5-fpm/$pool.access.log ; The access log format. ; The following syntax is allowed @@ -307,12 +307,12 @@ pm.max_spare_servers = 3 ; %u: remote user ; ; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" +access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" ; The log file for slow requests ; Default Value: not set ; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow +slowlog = /var/log/php5-fpm/$pool.log.slow ; The timeout for serving a single request after which a PHP backtrace will be ; dumped to the 'slowlog' file. A value of '0s' means 'off'. diff --git a/phpmyadmin/config-db.php b/phpmyadmin/config-db.php index fc05284..2a386d9 100644 --- a/phpmyadmin/config-db.php +++ b/phpmyadmin/config-db.php @@ -10,10 +10,12 @@ ## you'll probably also want to edit the configuration file mentioned ## above too. ## -$dbuser='phpmyadmin'; -$dbpass='Ash6wuphec8O'; -$basepath=''; -$dbname='phpmyadmin'; -$dbserver=''; -$dbport=''; -$dbtype='mysql'; +#$dbuser = 'phpmyadmin'; +#$dbpass = 'Ash6wuphec8O'; +$dbuser = 'root'; +$dbpass = 'b2u8w9PVNNAvXL1Cam5sz6qZ5RPpDv'; +$basepath = ''; +$dbname = 'phpmyadmin'; +$dbserver = 'localhost'; +$dbport = ''; +$dbtype = 'mysql';