Allow running from working directory

.gitignore

@@ -1,12 +1,11 @@
-current-*.tar.gz
 *.pyc
 *.py.bak
 *.swp
 *.tiny.css
-data/*.log
+data/var/log/plinth/*.log
-data/cherrypy_sessions
+data/var/lib/plinth/*.sqlite3
-data/sessions
+data/var/lib/plinth/sessions/*
-data/store.sqlite3
+data/var/run/*.pid
 doc/*.tex
 doc/*.pdf
 doc/*.html
@@ -24,10 +23,8 @@ TODO
 \#*
 .#*
 *~
-data/plinth.sqlite3
 predepend
 build/
-*.pid
 .emacs.desktop*
 *.egg-info/
 dist/

plinth.config

@@ -5,10 +5,10 @@ box_name = FreedomBox
 [Path]
 # directory locations
 file_root = %(root)s
-data_dir = %(file_root)s/data
+data_dir = %(file_root)s/data/var/lib/plinth
-log_dir = %(data_dir)s
+log_dir = %(file_root)s/data/var/log/plinth
-pid_dir = %(data_dir)s
+pid_dir = %(file_root)s/data/var/run
-server_dir = plinth/
+server_dir = /
 actions_dir = %(file_root)s/actions
 doc_dir = %(file_root)s/doc
 

plinth/__main__.py

@@ -194,7 +194,7 @@ def configure_django():
         ROOT_URLCONF='plinth.urls',
         SESSION_ENGINE='django.contrib.sessions.backends.file',
         SESSION_FILE_PATH=sessions_directory,
-        STATIC_URL=cfg.server_dir + '/static/',
+        STATIC_URL='/'.join([cfg.server_dir, 'static/']).replace('//', '/'),
         TEMPLATE_CONTEXT_PROCESSORS=context_processors,
         TEMPLATE_DIRS=template_directories)
 

plinth/cfg.py

@@ -39,7 +39,7 @@ def read():
 
     parser = SafeConfigParser(
         defaults={
-            'root': directory,
+            'root': os.path.realpath(directory),
         })
     parser.read(config_file)