From 7d95094cf5d41db50caf18c2db271462a4a027bb Mon Sep 17 00:00:00 2001
From: Blake DeMarcy <ofunknowndescent@gmail.com>
Date: Wed, 5 Apr 2017 17:18:12 -0500
Subject: [PATCH] 8080 > 7099

---
 clients/emacs/bbj.el      | 2 +-
 clients/network_client.py | 6 +++---
 clients/urwid/main.py     | 2 +-
 server.py                 | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/clients/emacs/bbj.el b/clients/emacs/bbj.el
index 2485421..07d05c9 100644
--- a/clients/emacs/bbj.el
+++ b/clients/emacs/bbj.el
@@ -4,7 +4,7 @@
 (require 'cl)
 
 (defvar bbj-host "127.0.0.1")
-(defvar bbj-port 8080)
+(defvar bbj-port 7099)
 (defvar bbj-width 80)
 
 (defvar bbj-user "anonymous"
diff --git a/clients/network_client.py b/clients/network_client.py
index f62c1da..5221b6e 100644
--- a/clients/network_client.py
+++ b/clients/network_client.py
@@ -15,8 +15,8 @@ class BBJ:
     You can call them like `threads, usermap = bbj.thread_index()`
 
     __init__ can take a host string and a port value (which can be
-    either int or str). It defaults to "127.0.0.1" and 8080, expanding
-    out to http://127.0.0.1:8080/.
+    either int or str). It defaults to "127.0.0.1" and 7099, expanding
+    out to http://127.0.0.1:7099/.
 
     Standard library exceptions are used, but several new attributes are
     attached to them before raising: .code, .description, and .body.
@@ -40,7 +40,7 @@ class BBJ:
 
     See the offical API error documentation for more details.
     """
-    def __init__(self, host="127.0.0.1", port=8080):
+    def __init__(self, host="127.0.0.1", port=7099):
         self.base = "http://{}:{}/api/%s".format(host, port)
         self.user_name = self.user_auth = None
         self.send_auth = True
diff --git a/clients/urwid/main.py b/clients/urwid/main.py
index 07d36c6..5c03a5a 100644
--- a/clients/urwid/main.py
+++ b/clients/urwid/main.py
@@ -5,7 +5,7 @@ from random import choice
 from network import BBJ
 import urwid
 
-network = BBJ(host="127.0.0.1", port=8080)
+network = BBJ(host="127.0.0.1", port=7099)
 
 obnoxious_logo = """
        OwO    8 888888888o    8 888888888o               8 8888         1337
diff --git a/server.py b/server.py
index 0aceee1..7e652f8 100644
--- a/server.py
+++ b/server.py
@@ -343,6 +343,7 @@ class API(object):
 def api_http_error(status, message, traceback, version):
     return json.dumps(schema.error(2, "HTTP error {}: {}".format(status, message)))
 
+cherrypy.config.update({'server.socket_port': 7099})
 
 CONFIG = {
     "/": {