Merge branch 'master' of cgit:/srv/git/rcfiles (e7846586) · Commits · nimrod / rcfiles

.bashrc

+19 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ alias apt-daily="sudo /bin/sh -c 'apt-get update && apt-get dist-upgrade --downl
		alias docker-build='docker build -t "$(basename $PWD)" ./'
		alias cdtemp='cd $(mktemp -d)'
		alias 0-day-cleanup='ssh xbmc "sudo -u debian-transmission find /srv/library/Comics -name .part -path 0-Day\ Week\ of* -delete"'
		alias httpbin='tox -c $HOME/.tox.ini.httpbin --'

		deduce-aws-region () {
		export AWS_DEFAULT_REGION="$(curl --silent \
		@@ -105,4 +106,22 @@ docker-dev () {
		--workdir "$PWD" "$repo:dev" /bin/sh -l
		}

		sync-comics () {
		this_month="$( date '+xbmc:/srv/library/Comics/0-Day\ Week\ of\ %Y.%m.*' )"
		last_month="$( date --date '1 month ago' '+xbmc:/srv/library/Comics/0-Day\ Week\ of\ %Y.%m.*' )"
		rsync --recursive --compress --progress --exclude "*.part" "$last_month" "$this_month" "$HOME/Downloads/Comics/"
		}

		update-requirements () {
		cd $(git rev-parse --show-toplevel)
		for file in $(git ls-files requirements.txt)
		do
		pur --requirement $file
		git add $file
		done
		git commit -m"- Updated requirements."
		git push
		cd - > /dev/null
		}

		. $HOME/Documents/Shore/bundle_certs/bundle_certs

.gitconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,10 +19,11 @@
		staash = stash --all
		stat = status --short --branch
		tag-version = !git tag -f "v$(cat VERSION)"
		trigger = !git commit --allow-empty --no-edit --amend && git push --force-with-lease
		[color]
		grep = true
		[core]
		excludesfile = /home/nimrod/.gitignore_global
		excludesfile = ~/.gitignore_global
		[diff]
		tool = meld
		[difftool]

.ssh/config.d/10_global

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,5 +3,6 @@ ControlMaster auto
		ControlPath ~/.ssh/%r@%h:%p.sock
		ControlPersist 3m
		ServerAliveInterval 30
		IdentitiesOnly yes
		#StrictHostKeyChecking yes
		#UserKnownHostsFile=/dev/null

.ssh/config.d/20_fdna

+39 −8

Original line number	Diff line number	Diff line
		@@ -15,22 +15,37 @@ HostName bitbucket.org
		User git
		IdentityFile ~/.ssh/fdna_rsa

		Host monster
		HostName monster
		Host monster.fdna.local
		HostName 10.0.0.209
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

		Host backup
		HostName backup
		Host backup.fdna.local
		HostName 10.0.0.210
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

		Host dl-fdna*
		Host xen01.fdna.local
		HostName 10.0.0.110
		User root
		IdentityFile ~/.ssh/fdna_rsa

		Host adm1.fdna.local
		HostName 10.0.0.111
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

		Host 10.0.0.20?
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

		Host storage
		HostName storage
		Host storage.fdna.local
		HostName 10.0.0.220
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

		Host data-management.fdna.local
		HostName 10.0.0.109
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

		@@ -63,7 +78,6 @@ Host nag01.fdna.com
		HostName nag01.cloudapp.net
		User fdna_srv
		IdentityFile ~/.ssh/fdna_rsa
		ProxyCommand ssh ns1 nc %h %p

		Host dev2_ops
		HostName 52.213.235.92
		@@ -89,3 +103,20 @@ Host ci_ops
		HostName 52.208.181.7
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

		Host *.dev-f2g.com
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

		Host *.face2gene.com
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

		Host *.fdna.com
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

		Host gitolite_ops
		HostName 52.211.215.151
		User nimrod
		IdentityFile ~/.ssh/fdna_rsa

.ssh/config.d/20_shore

+16 −16

Original line number	Diff line number	Diff line
		# shore.co.il infrastructure

		Host ns1 www.shore.co.il
		Host ns1.shore.co.il www.shore.co.il
		HostName ns1.shore.co.il
		LocalForward 9091 xbmc.trusted:9091
		LocalForward 9091 xbmc.shore.co.il:9091
		DynamicForward 8080
		User nimrod
		IdentityFile ~/.ssh/shore_ecdsa
		IdentityFile ~/.ssh/shore_rsa

		Host xbmc
		HostName xbmc.trusted
		Host xbmc.shore.co.il
		HostName xbmc.shore.co.il
		User nimrod
		ForwardX11 yes
		IdentityFile ~/.ssh/shore_ecdsa
		IdentityFile ~/.ssh/shore_rsa
		ProxyCommand ssh ns1 nc %h %p
		ProxyCommand ssh ns1.shore.co.il nc %h %p

		Host ns2
		Host ns2.shore.co.il
		HostName ns2.shore.co.il
		User admin
		DynamicForward 9999
		IdentityFile ~/.ssh/shore_ecdsa
		IdentityFile ~/.ssh/shore_rsa

		Host cgit
		HostName cgit.trusted
		ProxyCommand ssh ns1 nc %h %p
		Host cgit.shore.co.il
		HostName cgit.shore.co.il
		ProxyCommand ssh ns1.shore.co.il nc %h %p
		User nimrod
		IdentityFile ~/.ssh/shore_ecdsa
		IdentityFile ~/.ssh/shore_rsa

		Host ns3
		Host ns3.shore.co.il
		HostName ns3.shore.co.il
		User root
		IdentityFile ~/.ssh/shore_ecdsa
		IdentityFile ~/.ssh/shore_rsa
		DynamicForward 8081

		Host host01
		HostName host01.trusted
		Host host01.shore.co.il
		HostName host01.shore.co.il
		User nimrod
		ProxyCommand ssh ns1 nc %h %p
		ProxyCommand ssh ns1.shore.co.il nc %h %p
		IdentityFile ~/.ssh/shore_ecdsa
		IdentityFile ~/.ssh/shore_rsa

		Host wdr4300
		HostName wdr4300.trusted
		Host wdr4300.shore.co.il
		HostName wdr4300.shore.co.il
		User root
		ProxyCommand ssh ns1 nc %h %p
		ProxyCommand ssh ns1.shore.co.il nc %h %p
		IdentityFile ~/.ssh/shore_ecdsa
		IdentityFile ~/.ssh/shore_rssa
		LocalForward 8082 localhost:80