From bc8887e8b645bb46ab50ac342acfd494a9236531 Mon Sep 17 00:00:00 2001
From: James Vasile <james@hackervisions.org>
Date: Fri, 16 Dec 2011 23:42:18 -0500
Subject: [PATCH] move port to cfg

---
 cfg.sample.py |  3 +++
 plinth.py     | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cfg.sample.py b/cfg.sample.py
index 0f98be007..34ca0231d 100644
--- a/cfg.sample.py
+++ b/cfg.sample.py
@@ -12,6 +12,9 @@ users_dir = os.path.join(data_dir, "users")
 product_name = "Plinth"
 box_name = "Freedom Plug"
 
+port = 8000
+
+## Do not edit below this line ##
 html_root = None
 main_menu = Menu()
 
diff --git a/plinth.py b/plinth.py
index 7a60adcda..f630ccd28 100755
--- a/plinth.py
+++ b/plinth.py
@@ -81,14 +81,14 @@ def write_cherrypy_config():
 
 [global]
 server.socket_host = '0.0.0.0'
-server.socket_port = 8000
+server.socket_port = %(port)s
 server.thread_pool = 10
-tools.staticdir.root = "{fileroot}"
+tools.staticdir.root = "%(fileroot)s"
 tools.sessions.on = True
 tools.auth.on = True
 tools.sessions.storage_type = "file"
 tools.sessions.timeout = 90
-tools.sessions.storage_path = "{fileroot}/data/cherrypy_sessions"
+tools.sessions.storage_path = "%(fileroot)s/data/cherrypy_sessions"
 
 [/static]
 tools.staticdir.on = True
@@ -96,8 +96,8 @@ tools.staticdir.dir = "static"
 
 [/favicon.ico]
 tools.staticfile.on = True
-tools.staticfile.filename = "{fileroot}/static/theme/favicon.ico"
-""".format(fileroot=cfg.file_root))
+tools.staticfile.filename = "%(fileroot)s/static/theme/favicon.ico"
+""" % {'port':cfg.port, 'fileroot':cfg.file_root})
 
 def parse_arguments():
    parser = argparse.ArgumentParser(description='Plinht web interface for the FreedomBox.')