diff --git a/script/risotto_server.py b/script/risotto-server similarity index 100% rename from script/risotto_server.py rename to script/risotto-server diff --git a/setup.py b/setup.py index baf710e..cc1b06d 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,6 @@ setup( name='risotto', version='0.1', packages=['risotto' ], - scripts=['script/risotto_server.py'], + scripts=['script/risotto-server'], package_dir={"": "src"}, ) diff --git a/src/risotto/config.py b/src/risotto/config.py index a8bfa42..1fcd5c5 100644 --- a/src/risotto/config.py +++ b/src/risotto/config.py @@ -5,8 +5,6 @@ CONFIGURATION_DIR = 'configurations' PROVIDER_FACTORY_CONFIG_DIR = environ.get('PROVIDER_FACTORY_CONFIG_DIR', 'factory') TMP_DIR = 'tmp' DEFAULT_USER = environ.get('DEFAULT_USER', 'Anonymous') -#DEFAULT_DSN = environ.get('DEFAULT_DSN', 'postgres:///risotto?host=/var/run/postgresql/&user=risotto') -#DEFAULT_TIRAMISU_DSN = environ.get('DEFAULT_TIRAMISU_DSN', 'postgres:///tiramisu?host=/var/run/postgresql/&user=tiramisu') RISOTTO_DB_NAME = environ.get('RISOTTO_DB_NAME', 'risotto') RISOTTO_DB_PASSWORD = environ.get('RISOTTO_DB_PASSWORD', 'risotto') RISOTTO_DB_USER = environ.get('RISOTTO_DB_USER', 'risotto')