From d1010614fea8d05a267a9fa188be0b54dc851447 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 20 Jun 2013 12:20:44 +0200
Subject: [pam] Add missing content packages [redsocks] fix path of redsocks
 binary, exclude proxy IP from redirection

---
 remote/modules/redsocks/data/etc/systemd/system/redsocks.service | 2 +-
 remote/modules/redsocks/data/opt/openslx/bin/setup_proxy         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'remote/modules/redsocks/data')

diff --git a/remote/modules/redsocks/data/etc/systemd/system/redsocks.service b/remote/modules/redsocks/data/etc/systemd/system/redsocks.service
index 6f207586..4b30d09e 100644
--- a/remote/modules/redsocks/data/etc/systemd/system/redsocks.service
+++ b/remote/modules/redsocks/data/etc/systemd/system/redsocks.service
@@ -4,6 +4,6 @@ Description=Transparent redirector of any TCP connection to proxy using your fir
 [Service]
 Type=forking
 PIDFile=/run/redsocks.pid
-ExecStart=/bin/redsocks -c /etc/redsocks.conf -p /run/redsocks.pid
+ExecStart=/sbin/redsocks -c /etc/redsocks.conf -p /run/redsocks.pid
 ExecStopPost=/bin/rm /run/redsocks.pid
 Restart=on-abort
diff --git a/remote/modules/redsocks/data/opt/openslx/bin/setup_proxy b/remote/modules/redsocks/data/opt/openslx/bin/setup_proxy
index 8fa5721c..5dc22a14 100755
--- a/remote/modules/redsocks/data/opt/openslx/bin/setup_proxy
+++ b/remote/modules/redsocks/data/opt/openslx/bin/setup_proxy
@@ -20,6 +20,7 @@ sed -i "s/%%PROXY_IP%%/$SLX_PROXY_IP/g;s/%%PROXY_PORT%%/$SLX_PROXY_PORT/g;s/%%PR
 systemctl start redsocks
 
 iptables -t nat -N REDSOCKS
+iptables -t nat -A REDSOCKS -d "$SLX_PROXY_IP" -j RETURN
 iptables -t nat -A REDSOCKS -d 0.0.0.0/8 -j RETURN
 iptables -t nat -A REDSOCKS -d 10.0.0.0/8 -j RETURN
 iptables -t nat -A REDSOCKS -d 127.0.0.0/8 -j RETURN
-- 
cgit v1.2.3-55-g7522