Fixing tor logging problem

4 files changed, 35 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index cae1c382b4fb..d0abcb8e5c45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,15 @@ depends=('tor' 'obfsproxy' 'polipo' 'dnscrypt-proxy' )
 optdepends=('tor-browser-en-ir')
 
 install="traktor.install"
-md5sums=('SKIP')
+md5sums=('SKIP' 'SKIP')
 changelog=
-source=("traktor_arch.sh")
+source=("traktor_arch.sh" "traktor_tunnel")
 noextract=()
 
 package() {
 cd "$srcdir"
-
+    
+    install -Dm 755 traktor_tunnel ${pkgdir}/usr/bin/traktor_tunnel
     install -Dm 755 traktor_arch.sh ${pkgdir}/usr/bin/traktor_configure
 }
 
diff --git a/traktor.install b/traktor.install
index 069a77ac0d0a..fdc35fd3384d 100644
--- a/traktor.install
+++ b/traktor.install
@@ -1,7 +1,16 @@
 post_install() {
-	traktor_configure
+        clear
+        echo
+        echo -e "If you tend to use tor on whole network you may run: traktor_tunnel"
+        echo -e "\n If you need to reconfigure traktor you may run: traktor_configure\n I will do it for you now"
+        sleep 10s
+	traktor_configure 
 }
 post_upgrade() {
+        clear
+        echo -e "If you tend to use tor on whole network you may run: traktor_tunnel"
+        echo -e "\n If you need to reconfigure traktor you may run: traktor_configure\n I will do it for you now"
+        sleep 10s
 	traktor_configure
 }
 
diff --git a/traktor_arch.sh b/traktor_arch.sh
index 442308dba742..1418961dbb5e 100755
--- a/traktor_arch.sh
+++ b/traktor_arch.sh
@@ -3,10 +3,6 @@ clear
 
 echo -e "Traktor v1.3\nTor will be automatically installed and configured…\n\n"
 
-# Make tor log directory 
-sudo mkdir /var/log/tor/
-sudo chown tor:tor /var/log/tor/
-sudo chmod g+w /var/log/tor/
 # Write Bridge
 sudo wget https://AmirrezaFiroozi.github.io/traktor/torrcV3 -O /etc/tor/torrc > /dev/null
 
@@ -14,6 +10,13 @@ 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
 
+# Make tor log directory 
+sudo systemctl start tor 1>/dev/null 2>&1
+sudo systemctl stop tor 1>/dev/null 2>&1
+
+sudo mkdir /var/log/tor/
+sudo chown tor:tor /var/log/tor/
+sudo chmod g+w /var/log/tor/
 # Write Polipo config
 echo 'logSyslog = true
 logFile = /var/log/polipo/polipo.log
@@ -23,20 +26,7 @@ socksParentProxy = "localhost:9050"
 socksProxyType = socks5' | sudo tee /etc/polipo/config > /dev/null
 sudo systemctl restart polipo
 
-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"
 
-read -n 1 SELECT
-if [ "$SELECT" = "Y" -o "$SELECT" = "y" ]
-then
-	# Set IP and Port on HTTP and SOCKS
-	gsettings set org.gnome.system.proxy mode 'manual'
-	gsettings set org.gnome.system.proxy.http host 127.0.0.1
-	gsettings set org.gnome.system.proxy.http port 8123
-	gsettings set org.gnome.system.proxy.socks host 127.0.0.1
-	gsettings set org.gnome.system.proxy.socks port 9050
-	gsettings set org.gnome.system.proxy ignore-hosts "['localhost', '127.0.0.0/8', '::1', '192.168.0.0/16', '10.0.0.0/8', '172.16.0.0/12']"
-fi
 # Install Finish
 echo "Install Finished successfully…"
 sudo systemctl start tor 1>/dev/null 2>&1
diff --git a/traktor_tunnel b/traktor_tunnel
new file mode 100755
index 000000000000..e739cec393d6
--- /dev/null
+++ b/traktor_tunnel
@@ -0,0 +1,14 @@
+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"
+
+read -n 1 SELECT
+if [ "$SELECT" = "Y" -o "$SELECT" = "y" ]
+then
+	# Set IP and Port on HTTP and SOCKS
+	gsettings set org.gnome.system.proxy mode 'manual'
+	gsettings set org.gnome.system.proxy.http host 127.0.0.1
+	gsettings set org.gnome.system.proxy.http port 8123
+	gsettings set org.gnome.system.proxy.socks host 127.0.0.1
+	gsettings set org.gnome.system.proxy.socks port 9050
+	gsettings set org.gnome.system.proxy ignore-hosts "['localhost', '127.0.0.0/8', '::1', '192.168.0.0/16', '10.0.0.0/8', '172.16.0.0/12']"
+fi