[csw-devel] SF.net SVN: gar:[7940] csw/mgar/pkg/dante/trunk

[skayser at users.sourceforge.net]

Revision: 7940
          http://gar.svn.sourceforge.net/gar/?rev=7940&view=rev
Author:   skayser
Date:     2010-01-10 13:21:39 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
dante: add sample socks.conf, SAMPLECONF for socks.conf & sockd.conf

Modified Paths:
--------------
    csw/mgar/pkg/dante/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/dante/trunk/files/socks.conf.CSW

Modified: csw/mgar/pkg/dante/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dante/trunk/Makefile	2010-01-10 12:59:40 UTC (rev 7939)
+++ csw/mgar/pkg/dante/trunk/Makefile	2010-01-10 13:21:39 UTC (rev 7940)
@@ -61,9 +61,10 @@
 # UPNP support requires miniupnp from http://miniupnp.free.fr/
 CONFIGURE_ARGS += --without-upnp
 
+SAMPLECONF  = $(sysconfdir)/socks.conf.CSW
+SAMPLECONF += $(sysconfdir)/sockd.conf.CSW
+INITSMF     = /etc/opt/csw/init\.d/cswdante
 
-INITSMF = /etc/opt/csw/init\.d/cswdante
-
 include gar/category.mk
 
 post-configure-modulated:
@@ -86,6 +87,9 @@
 	cp $(WORKSRC)/example/socks*.conf $(DOCDEST)/examples
 	cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST)
 	cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST)
+
+	ginstall -d $(DESTDIR)$(sysconfdir)
+	cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)
 	@$(MAKECOOKIE)
 
 
@@ -103,8 +107,8 @@
 	ginstall -m 0755 $(FILEDIR)/cswdante \
 		$(DESTDIR)/etc/opt/csw/init.d/cswdante
 
-	ginstall -d $(DESTDIR)/etc/opt/csw
-	cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)/etc/opt/csw
+	ginstall -d $(DESTDIR)$(sysconfdir)
+	cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)$(sysconfdir)
 
 	# This is where sockd.log goes, ref. $(FILEDIR)/sockd.conf.CSW
 	ginstall -d $(DESTDIR)$(localstatedir)/dante

Added: csw/mgar/pkg/dante/trunk/files/socks.conf.CSW
===================================================================
--- csw/mgar/pkg/dante/trunk/files/socks.conf.CSW	                        (rev 0)
+++ csw/mgar/pkg/dante/trunk/files/socks.conf.CSW	2010-01-10 13:21:39 UTC (rev 7940)
@@ -0,0 +1,22 @@
+##
+## A simple sample socks.conf for users with a local nameserver.
+##
+## Please see socks.conf(5) and /opt/csw/share/doc/libsocks/examples for
+## guidance on how to configure libsocks to your requirements. Please
+## also see /opt/csw/share/doc/libsocks/README.CSW as alternate configs
+## specified via $SOCKS_CONF are not supported with this build.
+##
+
+# Assuming de0 is on the lan-net, the below will make connections to it
+# (and anything else on the lan), be direct, i.e. not go via the proxy.
+#route { from: 0.0.0.0/0 to: de0 via: direct }
+
+# Clients going anywhere else go via the proxyserver listening at
+# localhost, port 1080.  Uncomment the line(s) corresponding to the
+# proxyprotocols your proxyserver supports.
+route {
+        from: 0.0.0.0/0   to: 0.0.0.0/0   via: 127.0.0.1 port = 1080
+        proxyprotocol: socks_v5         # server supports socks v5.
+        proxyprotocol: socks_v4         # server supports socks v4
+#        proxyprotocol: http_v1.0        # server supports http v1
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.