From 728dc98bb92496c66fc172008949ed70b1f979ca Mon Sep 17 00:00:00 2001 From: Vahagn Khachatryan Date: Thu, 1 Aug 2019 13:20:52 +0100 Subject: [PATCH 1/6] .gitconfig --- config/.gitconfig | 12 +++++++++++ local/bb_local_dev/.gitconfig.local | 31 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 local/bb_local_dev/.gitconfig.local diff --git a/config/.gitconfig b/config/.gitconfig index ebf136e..374fb81 100644 --- a/config/.gitconfig +++ b/config/.gitconfig @@ -23,5 +23,17 @@ path = ~/.gitconfig.local [core] excludesfile = ~/.gitignore.global + autocrlf = false [credentail] helper = cache + + +[url "https://vishap@github.com/"] + insteadOf = github: + +[url "https://gitlab.com/"] + insteadOf = gitlab: + +[url "http://192.168.0.4:8080/"] + insteadOf = mylab: + diff --git a/local/bb_local_dev/.gitconfig.local b/local/bb_local_dev/.gitconfig.local new file mode 100644 index 0000000..730c818 --- /dev/null +++ b/local/bb_local_dev/.gitconfig.local @@ -0,0 +1,31 @@ +[user] + name = Vahagn Khachatryan + email = vkhachatrya5@bloomberg.net + +[url "bbgithub:"] + insteadOf = https://bbgithub.dev.bloomberg.com + +[http "https://github.com"] + proxy = http://proxy.bloomberg.com:81 + sslCAinfo = /usr/local/share/ca-certificates/bloomberg-root-ca.crt + +[url "https://github.com/"] + insteadOf = github.com: +[url "https://github.com/"] + insteadOf = git@github.com: +[url "https://github.com/"] + insteadOf = ssh://git@github.com/ + +[http "https://gitlab.com"] + proxy = http://proxy.bloomberg.com:81 + sslCAinfo = /usr/local/share/ca-certificates/bloomberg-root-ca.crt + +[url "https://gitlab.com/"] + insteadOf = gitlab.com: +[url "https://gitlab.com/"] + insteadOf = git@gitlab.com: +[url "https://gitlab.com/"] + insteadOf = ssh://git@gitlab.com/ + +[http "http://192.168.0.4:8080"] + proxy = socks5://127.0.0.1:1080 From 5102aa9680423f86b6f47c251143cba517270ff4 Mon Sep 17 00:00:00 2001 From: Vahagn Khachatryan Date: Thu, 1 Aug 2019 13:45:35 +0100 Subject: [PATCH 2/6] last from satik. --- local/home/.gitconfig.local | 3 +++ vim/vimrc | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 local/home/.gitconfig.local diff --git a/local/home/.gitconfig.local b/local/home/.gitconfig.local new file mode 100644 index 0000000..dbf6237 --- /dev/null +++ b/local/home/.gitconfig.local @@ -0,0 +1,3 @@ +[user] + email = vahagn.khachatryan@gmail.com + name = Vahagn Khachatryan diff --git a/vim/vimrc b/vim/vimrc index e9b2904..597f235 100755 --- a/vim/vimrc +++ b/vim/vimrc @@ -132,13 +132,13 @@ endif " " Configure color theme, fonts and other graphics. " -if has('gui_running') +if &t_Co > 16 " set color scheme colorscheme darkblue "set guioptions-=m "set guioptions-=T - set lines=50 - set columns=85 + "set lines=50 + "set columns=85 " Set the font. if has("win32") || has("win64") @@ -148,8 +148,6 @@ if has('gui_running') "set guifont=Bitstream\ Vera\ Sans\ Mono\ 12 set guifont=Monospace\ 12 endif -else - colorscheme vahagn_black_terminal endif " Switch syntax highlighting on, when the terminal has colors From c3082e10a8c1dc477ec479ee5a5f127418ac4ede Mon Sep 17 00:00:00 2001 From: Vahagn Khachatryan Date: Thu, 1 Aug 2019 13:48:24 +0100 Subject: [PATCH 3/6] tun2socks --- ssh_socks5.service | 22 ++++++++++++++++++++++ tun2socks.service | 20 ++++++++++++++++++++ tun2socks_pre.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 ssh_socks5.service create mode 100644 tun2socks.service create mode 100644 tun2socks_pre.sh diff --git a/ssh_socks5.service b/ssh_socks5.service new file mode 100644 index 0000000..dffdbf5 --- /dev/null +++ b/ssh_socks5.service @@ -0,0 +1,22 @@ +# Automatically generated by systemd-sysv-generator + +[Unit] +#SourcePath=/etc/init.d/rpcbind +Description=SSH SOCKS5 to yerevak.vostan.org +#DefaultDependencies=no +Before=shutdown.target +After=network-online.target local-fs.target +Wants=network-online.target +Conflicts=shutdown.target + +[Service] +Type=simple +User=vahagn +Group=vahagn +Restart=always +RestartSec=2s +WorkingDirectory=/tmp +ExecStart=/usr/bin/ssh -N -D 0.0.0.0:1080 -i /home/vahagn/.ssh/id_rsa vahagn@yerevak.vostan.org + +[Install] +WantedBy=multi-user.target diff --git a/tun2socks.service b/tun2socks.service new file mode 100644 index 0000000..d5d4ef0 --- /dev/null +++ b/tun2socks.service @@ -0,0 +1,20 @@ +# Automatically generated by systemd-sysv-generator + +[Unit] +Description=tun0 to SOCKS5 tunel +Before=shutdown.target +After=network-online.target local-fs.target +Wants=network-online.target ssh_socks5.service +Conflicts=shutdown.target + +[Service] +Type=simple +Restart=always +GuessMainPID=no +RemainAfterExit=yes +WorkingDirectory=/tmp +ExecStartPre=/usr/local/sbin/tun2socks_pre.sh +ExecStart=/sbin/ip netns exec soghancq /usr/local/sbin/tun2socks --tundev tun0 --netif-ipaddr 10.0.0.2 --netif-netmask 255.255.255.0 --socks-server-addr 127.0.0.1:1080 --udpgw-remote-server-addr 127.0.0.1:7300 + +[Install] +WantedBy=multi-user.target diff --git a/tun2socks_pre.sh b/tun2socks_pre.sh new file mode 100644 index 0000000..51b9195 --- /dev/null +++ b/tun2socks_pre.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +NETNS=soghancq +IP=/sbin/ip +NS="$IP netns exec $NETNS" + +# +# Set ip forwarding. +# Do it from /ete/sysctl.conf +#sysctl -w net.ipv4.ip_forward=1 + +# +# Create network namesapce. +# +$IP netns add $NETNS + +# +# Peer to peer to default namespace. +# +$IP link add veth0 type veth peer name veth1 +$IP addr add 10.1.1.1/30 dev veth0 +$IP link set veth0 up + +$IP link set veth1 netns $NETNS +$NS $IP addr add 10.1.1.2/30 dev veth1 +$NS $IP link set veth1 up +$NS $IP route add 127.0.0.0/24 via 10.1.1.1 metric 5 +$NS $IP route add 192.168.0.0/24 via 10.1.1.1 metric 5 +#$NS $IP route add 8.8.8.8 via 10.1.1.1 metric 5 + +# +# Configure tun0 which goes through socks5. +# +$NS $IP tuntap add dev tun0 mode tun user root +$IP link set tun0 netns $NETNS +$NS $IP addr add 10.0.0.1/24 dev tun0 +$NS $IP link set dev tun0 up +$NS $IP route add default via 10.0.0.2 metric 6 +#$NS /usr/local/sbin/tun2socks \ +# --tundev tun0 \ +# --netif-ipaddr 10.0.0.2 \ +# --netif-netmask 255.255.255.0 \ +# --socks-server-addr 127.0.0.1:1080 \ +# --udpgw-remote-server-addr 127.0.0.1:7300 & + From 5a8cb9946f9c4ef0e94517218596179f89d57efa Mon Sep 17 00:00:00 2001 From: Vahagn Khachatryan Date: Sun, 16 Feb 2020 21:38:24 +0000 Subject: [PATCH 4/6] Docker scripts. --- bin/docker-gitlab.sh | 12 ++++++++++++ bin/docker-nextcloud.sh | 7 +++++++ 2 files changed, 19 insertions(+) create mode 100755 bin/docker-gitlab.sh create mode 100755 bin/docker-nextcloud.sh diff --git a/bin/docker-gitlab.sh b/bin/docker-gitlab.sh new file mode 100755 index 0000000..e69721a --- /dev/null +++ b/bin/docker-gitlab.sh @@ -0,0 +1,12 @@ +sudo docker run --detach \ + --name gitlab \ + --hostname gitlab \ + --env GITLAB_OMNIBUS_CONFIG="external_url 'http://gitlab.vostan.org/'; gitlab_rails['lfs_enabled'] = true; gitlab_rails['gitlab_signin_enabled'] = false;" \ + --publish 8443:443 \ + --publish 8080:80 \ + --publish 8022:22 \ + --restart always \ + --volume /srv/gitlab/config:/etc/gitlab \ + --volume /srv/gitlab/logs:/var/log/gitlab \ + --volume /srv/gitlab/data:/var/opt/gitlab \ + gitlab/gitlab-ce:latest diff --git a/bin/docker-nextcloud.sh b/bin/docker-nextcloud.sh new file mode 100755 index 0000000..b1b1bdb --- /dev/null +++ b/bin/docker-nextcloud.sh @@ -0,0 +1,7 @@ +sudo docker run \ + --name nextcloud \ + -d \ + --publish 8090:80 \ + --restart always \ + --volume /srv/nextcloud:/var/www/html \ + nextcloud From b279bf36f76cd58739de1f9afc78b5d9cd5b56c7 Mon Sep 17 00:00:00 2001 From: Vahagn Khachatryan Date: Sun, 16 Feb 2020 21:39:07 +0000 Subject: [PATCH 5/6] Add /home/vahagn/.local/bin to path. --- config/.bashrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/.bashrc b/config/.bashrc index e444b75..b0bd7fd 100755 --- a/config/.bashrc +++ b/config/.bashrc @@ -213,6 +213,10 @@ if [ -e $MYSCRIPTS/bin ]; then export PATH=$MYSCRIPTS/bin:$PATH fi +if [ -e $HOME/.local/bin ]; then + export PATH=$HOME/.local/bin:$PATH +fi + # # VIM # From 010e1a64f17653007b22c50e9d665c5cd16d73e9 Mon Sep 17 00:00:00 2001 From: Vahagn Khachatryan Date: Sun, 16 Feb 2020 21:39:58 +0000 Subject: [PATCH 6/6] Gerbera docker script. --- bin/docker-gerbera.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 bin/docker-gerbera.sh diff --git a/bin/docker-gerbera.sh b/bin/docker-gerbera.sh new file mode 100755 index 0000000..504dac1 --- /dev/null +++ b/bin/docker-gerbera.sh @@ -0,0 +1,13 @@ +docker run \ + -d \ + --net=host \ + --name gerbera \ + --hostname gerbera \ + --restart always \ + --volume /srv/gerbera/config:/root/.config \ + --volume /srv/gerbera/music:/mnt/music \ + --volume /srv/gerbera/video:/mnt/video \ + --volume /mnt/hdd2/public/movies:/mnt/hdd_video \ + --volume /mnt/hdd/public/music:/mnt/hdd_music \ + gerbera/gerbera +