Skip to content

Commit

Permalink
cruft
Browse files Browse the repository at this point in the history
  • Loading branch information
@antipasta
antipasta committed Jul 8, 2020
1 parent e7c0413 commit 129cb96
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 52 deletions.
15 changes: 4 additions & 11 deletions bashrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ if [[ -n $TMUX ]]; then
fi
}

function vpndocker() {
if [[ `stat -c '%a' /dev/net/tun` == '660' ]]; then
docker "$@"
else
echo 'lxc config device add penguin tun unix-char path=/dev/net/tun' | xclip -selection c
echo 'no access to /dev/net/tun'
fi
}

ec2-info() {
IP=169.254.169.254
Expand All @@ -40,7 +32,7 @@ ec2-info() {
}
export EDITOR=vim
export GOPATH=$HOME/code/go
export PATH=$HOME/bin:$HOME/local/bin:$HOME/bin/fzf/bin/:$HOME/gobin/go/bin/:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$HOME/Library/Python/2.7/bin:$HOME/bin/vim/vim-8.0.1481/bin/bin/:$HOME/dotfiles/bin/:$HOME/Applications/:$PATH
export PATH=$HOME/bin:$HOME/local/bin:$HOME/bin/fzf/bin/:$HOME/gobin/go/bin/:$HOME/go/bin/:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$HOME/Library/Python/2.7/bin:$HOME/bin/vim/vim-8.0.1481/bin/bin/:$HOME/dotfiles/bin/:$HOME/Applications/:$PATH
[ -f $HOME/perl5/lib/perl5/Devel/Local.pm ] && source `which devel-local.sh`
function github() {
git clone [email protected]:SocialFlowDev/$1.git
Expand Down Expand Up @@ -83,6 +75,7 @@ fi
export GOPATH=$HOME/code/go
export PATH=$PATH:$GOPATH/bin:$HOME/.local/bin
export PERLBREW_ROOT=$HOME/perlbrew

function refresh_gpga() {
if [ -f "${HOME}/.gpg-agent-info" ]; then
. "${HOME}/.gpg-agent-info"
Expand Down Expand Up @@ -157,10 +150,10 @@ rmqq() {
}
function vpnotp() {
echo -n 'Enter keepass pw: ';
printf "\033]52;c;$(echo $(KeePassXC-2.5.4-x86_64.AppImage cli show /mnt/chromeos/GoogleDrive/MyDrive/keepass/keepass2.kdbx $1 -q -t -a Password | tr -d '\n') | base64)\a"
printf "\033]52;c;$(echo $(KeePassXC.AppImage cli show /mnt/chromeos/GoogleDrive/MyDrive/keepass/keepass2.kdbx $1 -q -t -a Password | tr -d '\n') | base64)\a"
}

function vpnconnect() {
echo -n 'Enter keepass pw: ';
KeePassXC-2.5.4-x86_64.AppImage cli show /mnt/chromeos/GoogleDrive/MyDrive/keepass/keepass2.kdbx $1 -q -t -a UserName -a Password | sed -z "s|[\n\r]||2g" > ~/vpn/new-$1.tblk/Contents/Resources/creds.txt && docker start $1vpn && rm ~/vpn/new-$1.tblk/Contents/Resources/creds.txt && echo "connected to $1"
KeePassXC.AppImage cli show /mnt/chromeos/GoogleDrive/MyDrive/keepass/keepass2.kdbx $1 -q -t -a UserName -a Password | sed -z "s|[\n\r]||2g" > $HOME/vpn/$1.tblk/Contents/Resources/creds.txt && docker start $1 && sleep 1 && rm $HOME/vpn/$1.tblk/Contents/Resources/creds.txt && echo "connected to $1"
}
2 changes: 1 addition & 1 deletion bin/pcat.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
my $a = $ARGV[0];
my ($host,$port) = split(/:/,$a);
warn $host;
my $vpn = ($host =~ /mars.sfsrv.net/) ? 'marsvpn' : 'saturnvpn';
my $vpn = ($host =~ /mars.sfsrv.net/) ? 'mars' : 'saturn';
`socat TCP-LISTEN:$port,reuseaddr,fork 'EXEC:docker exec -i $vpn "nc $host $port"'`;
2 changes: 1 addition & 1 deletion etc/gpg-agent.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
enable-ssh-support
pinentry-program /usr/bin/pinentry-qt
pinentry-program /usr/bin/pinentry-curses
default-cache-ttl 86400
max-cache-ttl 86400
49 changes: 10 additions & 39 deletions ssh-config
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,24 @@
Host *.priv.sf
User appuser
ConnectTimeout 30
#ProxyCommand ssh -p2222 -o VisualHostKey=no root@localhost nc -q0 %h %p 2>/dev/null
#ProxyCommand docker exec -i prodvpn nc -q0 %h %p 2>/dev/null
StrictHostKeyChecking false
KbdInteractiveAuthentication false

Host *.mars.sfsrv.net
User appuser
ConnectTimeout 30
#ProxyCommand docker exec -i marsvpn nc -q0 %h %p 2>/dev/null
ProxyCommand ~/dotfiles/script/vpnnc.sh marsvpn %h %p
ProxyCommand docker exec -i mars nc -q0 %h %p 2>/dev/null
#ProxyCommand ~/dotfiles/script/vpnnc.sh mars %h %p
StrictHostKeyChecking false
KbdInteractiveAuthentication false

Host 20.0.*.*
User appuser
ConnectTimeout 30
ProxyCommand ~/dotfiles/script/vpnnc.sh marsvpn %h %p
ProxyCommand docker exec -i mars nc -q0 %h %p 2>/dev/null
#ProxyCommand ~/dotfiles/script/vpnnc.sh mars %h %p
StrictHostKeyChecking false
KbdInteractiveAuthentication false

Host 10.125.*.*
User appuser
ConnectTimeout 30
ProxyCommand ~/dotfiles/script/vpnnc.sh saturnvpn %h %p
ProxyCommand docker exec -i saturn nc -q0 %h %p 2>/dev/null
#ProxyCommand ~/dotfiles/script/vpnnc.sh saturn %h %p
StrictHostKeyChecking false
KbdInteractiveAuthentication false

Expand All @@ -33,38 +27,22 @@ Host 10.125.*.*
Host *.saturn.sfsrv.net
User appuser
ConnectTimeout 30
#ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null
ProxyCommand ~/dotfiles/script/vpnnc.sh saturnvpn %h %p
ProxyCommand docker exec -i saturn nc -q0 %h %p 2>/dev/null
#ProxyCommand ~/dotfiles/script/vpnnc.sh saturn %h %p
StrictHostKeyChecking false
KbdInteractiveAuthentication false

Host 54.164.21.74
User appuser
ConnectTimeout 30
#ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null
ProxyCommand ~/dotfiles/script/vpnnc.sh saturnvpn %h %p
ProxyCommand docker exec -i saturn nc -q0 %h %p 2>/dev/null
#ProxyCommand ~/dotfiles/script/vpnnc.sh saturn %h %p
StrictHostKeyChecking false
KbdInteractiveAuthentication false




Host *.sflow.us
User appuser
StrictHostKeyChecking false
# IdentityFile ~/.ssh/2016_prod_home.key
#
#Host *.sfsrv.net
# User appuser
# StrictHostKeyChecking false
#
#Host dev-home.priv.sf
# User root
# #LocalForward *:8000 dev-home.priv.sf:8030
# LogLevel Quiet
#

#
Host joe2.home.saturn.sfsrv.net
#IdentityFile ~/.ssh/2016_saturn_home.key
ConnectTimeout 30
Expand All @@ -73,10 +51,3 @@ Host joe2.home.saturn.sfsrv.net
#LocalForward *:5432 pg-site.dev.saturn.sfsrv.net:5432
#LocalForward *:7006 redis-2.dev.saturn.sfsrv.net:7006


#Host *.saturn.sflow.us
# IdentityFile ~/.ssh/2016_saturn_home.key
# ConnectTimeout 30
# ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null
# StrictHostKeyChecking false
# KbdInteractiveAuthentication false
2 changes: 2 additions & 0 deletions vimrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ au FileType go nmap <leader>b <Plug>(go-build)
au FileType go nmap <Leader>l :%s/\s*q.Q(.*$\n//g<CR>
map <C-n> :lne<CR>
map <C-m> :lp<CR>
"au FileType go map <C-n> :cnext<CR>
"au FileType go map <C-p> :cprevious<CR>
"let g:go_auto_type_info = 1
"set updatetime=100
let g:go_highlight_types = 1
Expand Down

0 comments on commit 129cb96

Please sign in to comment.