summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rwxr-xr-xtraktor_arch.sh8
-rwxr-xr-xtraktor_torrc-update17
-rwxr-xr-xtraktor_tunnel2
-rwxr-xr-xtraktor_untunnel3
6 files changed, 38 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7a9cfc798c7a..e43310ced115 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,6 +14,10 @@ pkgbase = traktor
optdepends = tor-browser-en-ir
source = traktor_arch.sh
source = traktor_tunnel
+ source = traktor_untunnel
+ source = traktor_torrc-update
+ md5sums = SKIP
+ md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d0abcb8e5c45..f8ab2f494110 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,9 +11,9 @@ depends=('tor' 'obfsproxy' 'polipo' 'dnscrypt-proxy' )
optdepends=('tor-browser-en-ir')
install="traktor.install"
-md5sums=('SKIP' 'SKIP')
+md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
changelog=
-source=("traktor_arch.sh" "traktor_tunnel")
+source=("traktor_arch.sh" "traktor_tunnel" "traktor_untunnel" "traktor_torrc-update")
noextract=()
package() {
@@ -21,5 +21,7 @@ cd "$srcdir"
install -Dm 755 traktor_tunnel ${pkgdir}/usr/bin/traktor_tunnel
install -Dm 755 traktor_arch.sh ${pkgdir}/usr/bin/traktor_configure
+ install -Dm 755 traktor_untunnel ${pkgdir}/usr/bin/traktor_untunnel
+ install -Dm 755 traktor_torrc-update ${pkgdir}/usr/bin/traktor_torrc-update
}
diff --git a/traktor_arch.sh b/traktor_arch.sh
index 1418961dbb5e..8beffab36e37 100755
--- a/traktor_arch.sh
+++ b/traktor_arch.sh
@@ -10,6 +10,14 @@ sudo wget https://AmirrezaFiroozi.github.io/traktor/torrcV3 -O /etc/tor/torrc >
#sudo sed -i '27s/PUx/ix/' /etc/apparmor.d/abstractions/tor
#sudo apparmor_parser -r -v /etc/apparmor.d/system_tor
+#configuring dnscrypt-proxy
+sudo wget https://AmirrezaFiroozi.github.io/traktor/dnscrypt-proxy.service -O /usr/lib/systemd/system/dnscrypt-proxy.service > /dev/null
+sudo systemctl daemon-reload
+echo "nameserver 127.0.0.1"|sudo tee /etc/resolv.conf >/dev/null
+sudo chattr +i /etc/resolv.conf
+sudo systemctl enable dnscrypt-proxy.service
+sudo systemctl start dnscrypt-proxy
+
# Make tor log directory
sudo systemctl start tor 1>/dev/null 2>&1
sudo systemctl stop tor 1>/dev/null 2>&1
diff --git a/traktor_torrc-update b/traktor_torrc-update
new file mode 100755
index 000000000000..4b15e13999d1
--- /dev/null
+++ b/traktor_torrc-update
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Write Bridge
+sudo wget https://AmirrezaFiroozi.github.io/traktor/torrcV3 -O /etc/tor/torrc > /dev/null
+
+
+# Wait for tor to establish connection
+echo "Tor is trying to establish a connection. This may take long for some minutes. Please wait" | sudo tee /var/log/tor/log
+bootstraped='n'
+sudo systemctl restart tor
+while [ $bootstraped == 'n' ]; do
+ if sudo cat /var/log/tor/log | grep "Bootstrapped 100%: Done"; then
+ bootstraped='y'
+ else
+ sleep 1
+ fi
+done
diff --git a/traktor_tunnel b/traktor_tunnel
index e739cec393d6..1ff309708a8e 100755
--- a/traktor_tunnel
+++ b/traktor_tunnel
@@ -1,3 +1,5 @@
+#!/bin/bash
+
echo "Do you want to use tor on whole network? [y/N]"
echo "If press No you have to manually set proxy to SOCKS5 127.0.0.1:9050 or HTTP 127.0.0.1:8123"
diff --git a/traktor_untunnel b/traktor_untunnel
new file mode 100755
index 000000000000..ec1f8293c27d
--- /dev/null
+++ b/traktor_untunnel
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+gsettings set org.gnome.system.proxy mode 'none'