diff --git a/MANIFEST.in b/MANIFEST.in index 191288d..c4edbe1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,3 +7,5 @@ include isso/js/embed.min.js include isso/js/embed.dev.js include isso/js/count.min.js include isso/js/count.dev.js + +include isso/defaults.ini diff --git a/isso/__init__.py b/isso/__init__.py index 2775576..ff8f6b4 100644 --- a/isso/__init__.py +++ b/isso/__init__.py @@ -223,7 +223,7 @@ def main(): serve = subparser.add_parser("run", help="run server") args = parser.parse_args() - conf = config.load(join(dist.location, "share", "isso.conf"), args.conf) + conf = config.load(join(dist.location, dist.project_name, "defaults.ini"), args.conf) if args.command == "import": conf.set("guard", "enabled", "off") diff --git a/isso/dispatch.py b/isso/dispatch.py index aa71ef0..8c57bf6 100644 --- a/isso/dispatch.py +++ b/isso/dispatch.py @@ -22,7 +22,7 @@ class Dispatcher(DispatcherMiddleware): a relative URI, e.g. /foo.example and /other.bar. """ - default = os.path.join(dist.location, "share", "isso.conf") + default = os.path.join(dist.location, dist.project_name, "defaults.ini") def __init__(self, *confs): diff --git a/isso/run.py b/isso/run.py index 2cdbb90..317aad6 100644 --- a/isso/run.py +++ b/isso/run.py @@ -9,6 +9,6 @@ from isso import dist, config application = make_app( config.load( - os.path.join(dist.location, "share", "isso.conf"), + os.path.join(dist.location, dist.project_name, "defaults.ini"), os.environ.get('ISSO_SETTINGS')), multiprocessing=True)