rearrange config installation

etc/config.json

@@ -1,18 +0,0 @@
-{
-    "zuul_server": {
-        "git_url": "/home/josh/var/lib/zuul/git/",
-        "gearman_host": "localhost",
-        "gearman_port": 4730
-    },
-    "debug_log": "/home/josh/var/log/turbo-hipster/debug.log",
-    "jobs_working_dir": "/home/josh/var/lib/turbo-hipster/jobs",
-    "git_working_dir": "/home/josh/var/lib/turbo-hipster/git",
-    "pip_download_cache": "/home/josh/var/cache/pip",
-    "plugins": ["gate_real_db_upgrade"],
-    "publish_logs":
-    {
-        "type": "local",
-        "path": "/home/josh/var/www/results/",
-        "prepend_url": "http://localhost/results/"
-    }
-}

etc/turbo-hipster/config.json

@@ -0,0 +1,18 @@
+{
+    "zuul_server": {
+        "git_url": "/var/lib/zuul/git/",
+        "gearman_host": "localhost",
+        "gearman_port": 4730
+    },
+    "debug_log": "/var/log/turbo-hipster/debug.log",
+    "jobs_working_dir": "/var/lib/turbo-hipster/jobs",
+    "git_working_dir": "/var/lib/turbo-hipster/git",
+    "pip_download_cache": "/var/cache/pip",
+    "plugins": ["gate_real_db_upgrade"],
+    "publish_logs":
+    {
+        "type": "local",
+        "path": "/var/www/results/",
+        "prepend_url": "http://localhost/results/"
+    }
+}

setup.cfg

@@ -14,6 +14,10 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 2.6
 
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
+
 [files]
 packages =
     turbo_hipster

setup.py

@@ -17,6 +17,4 @@
 
 import setuptools
 
-setuptools.setup(
+setuptools.setup(setup_requires=['d2to1', 'pbr'], d2to1=True)
-    setup_requires=['d2to1', 'pbr'],
-    d2to1=True)

turbo_hipster/worker_server.py

@@ -114,7 +114,7 @@ def main():
                         help='Run in the background.')
     parser.add_argument('-p', '--pidfile',
                         default='/var/run/turbo-hipster/'
-                                'sql-migrate-gearman-worker.pid',
+                                'turbo-hipster-worker-server.pid',
                         help='PID file to lock during daemonization.')
     args = parser.parse_args()