From c4b2984c55a66b589522870449e39271c6f28e09 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 3 Sep 2012 23:28:02 -0400
Subject: [PATCH] Remove the -p option.
---
irker | 10 +++-------
irker.xml | 10 ++++------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/irker b/irker
index 47f4ed2..3f848ee 100755
--- a/irker
+++ b/irker
@@ -339,23 +339,19 @@ class IrkerUDPHandler(SocketServer.BaseRequestHandler):
irker.handle(data)
if __name__ == '__main__':
- srvhost = HOST
- srvport = PORT
debuglvl = 0
- (options, arguments) = getopt.getopt(sys.argv[1:], "d:p:V")
+ (options, arguments) = getopt.getopt(sys.argv[1:], "d:V")
for (opt, val) in options:
if opt == '-d': # Enable debug/progress messages
debuglvl = int(val)
if debuglvl > 1:
logging.basicConfig(level=logging.DEBUG)
- elif opt == '-p': # Set the listening port
- srvport = int(val)
elif opt == '-V': # Emit version and exit
sys.stdout.write("irker version %s\n" % version)
sys.exit(0)
irker = Irker(debuglevel=debuglvl)
- tcpserver = SocketServer.TCPServer((srvhost, srvport), IrkerTCPHandler)
- udpserver = SocketServer.UDPServer((srvhost, srvport), IrkerUDPHandler)
+ tcpserver = SocketServer.TCPServer((HOST, PORT), IrkerTCPHandler)
+ udpserver = SocketServer.UDPServer((HOST, PORT), IrkerUDPHandler)
threading.Thread(target=tcpserver.serve_forever).start()
threading.Thread(target=udpserver.serve_forever).start()
diff --git a/irker.xml b/irker.xml
index 1128805..a174c8c 100644
--- a/irker.xml
+++ b/irker.xml
@@ -18,7 +18,6 @@
<cmdsynopsis>
<command>irker</command>
- <arg>-p <replaceable>number</replaceable></arg>
<arg>-d <replaceable>debuglevel</replaceable></arg>
<arg>-V</arg>
</cmdsynopsis>
@@ -62,11 +61,6 @@ port of each server.</para>
<variablelist>
<varlistentry>
-<term>-p</term>
-<listitem><para>Takes a following value which sets the port on which the
-daemon will listen.</para></listitem>
-</varlistentry>
-<varlistentry>
<term>-d</term>
<listitem><para>Takes a following value, seting the debugging level from
it. This option will generally only be of interest to developers;
@@ -94,6 +88,10 @@ project-hosting sites where the <application>irker</application>
socket can be visible from commit-hook code but not exposed to the
outside world. Priming your firewall with blocklists of IP addresses
known to spew spam is always a good idea.</para>
+
+<para>The absence of any option to set the service port is deliberate.
+If you think you need to do that, you have a problem better solved at
+your firewall.</para>
</refsect1>
<refsect1 id='authors'><title>AUTHOR</title>
--
2.26.2