summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle K <kylek389@gmail.com>2015-03-04 18:52:26 +0000
committerKyle K <kylek389@gmail.com>2015-03-04 18:52:26 +0000
commit21916648bd41a953fc6b0d08f5a99970b9dffe0f (patch)
treeab508f2243e6384341320f2f9e7ce1943a6b4541
parent5ef3f68f3acd1cb921b57ae25becf88914fff4e0 (diff)
downloadconfigs-21916648bd41a953fc6b0d08f5a99970b9dffe0f.tar.gz
configs-21916648bd41a953fc6b0d08f5a99970b9dffe0f.tar.bz2
configs-21916648bd41a953fc6b0d08f5a99970b9dffe0f.zip
150304 syncup
-rw-r--r--iptables-ion/iptables.rules6
-rwxr-xr-xmyconfig.sh7
2 files changed, 6 insertions, 7 deletions
diff --git a/iptables-ion/iptables.rules b/iptables-ion/iptables.rules
index 3e4f46c..471edf8 100644
--- a/iptables-ion/iptables.rules
+++ b/iptables-ion/iptables.rules
@@ -38,11 +38,5 @@
-A UDP -p udp -m recent --update --seconds 60 --name UDP-PORTSCAN --mask 255.255.255.255 --rsource -m comment --comment "when matched, this rsource has prev rcvd unreachable port" -j REJECT --reject-with icmp-port-unreachable
-A UDP -s 172.16.1.0/24 -p udp -j ACCEPT
-A UDP -p udp -m udp --dport 12101:12110 -j ACCEPT
--A sshguard -s 27.100.9.205/32 -j DROP
--A sshguard -s 125.141.56.67/32 -j DROP
--A sshguard -s 46.254.19.233/32 -j DROP
--A sshguard -s 222.190.127.15/32 -j DROP
--A sshguard -s 198.144.180.79/32 -j DROP
--A sshguard -s 61.19.121.131/32 -j DROP
COMMIT
# Completed on Fri Oct 4 14:26:06 2013
diff --git a/myconfig.sh b/myconfig.sh
index e0ebd69..7f3a5dc 100755
--- a/myconfig.sh
+++ b/myconfig.sh
@@ -9,7 +9,12 @@
# git completion and custom PS1
source /usr/share/git/completion/git-prompt.sh
GIT_PS1_SHOWDIRTYSTATE=1
-PS1='\[\e[1;37m\][\[\e[m\]\[\e[1;32m\]\u\[\e[m\]@\[\e[1;37m\]\h\[\e[m\] \[\e[1;36m\]\w\[\e[m\]\[\e[1;33m\]$(__git_ps1 " (%s)")\[\e[m\]\[\e[1;37m\]]\[\e[m\]\[\e[1;32m\]\$\[\e[m\] \[\e[1;37m\]'
+
+if [[ $(id -u) -eq 0 ]]; then
+ PS1='\[\e[1;37m\][\[\e[m\]\[\e[1;31m\]\u\[\e[m\]@\[\e[1;37m\]\h\[\e[m\] \[\e[1;36m\]\w\[\e[m\]\[\e[1;37m\]]\[\e[m\]\[\e[1;32m\]\$\[\e[m\] \[\e[1;37m\]'
+else
+ PS1='\[\e[1;37m\][\[\e[m\]\[\e[1;32m\]\u\[\e[m\]@\[\e[1;37m\]\h\[\e[m\] \[\e[1;36m\]\w\[\e[m\]\[\e[1;33m\]$(__git_ps1 " (%s)")\[\e[m\]\[\e[1;37m\]]\[\e[m\]\[\e[1;32m\]\$\[\e[m\] \[\e[1;37m\]'
+fi
# aliases
alias bb='history -c && history -w && reset'