From e58ecb27ab84595cf9d5b2719432eb08be80746e Mon Sep 17 00:00:00 2001
From: Joshua Hesketh <josh@nitrotech.org>
Date: Fri, 6 Sep 2013 12:39:46 +1000
Subject: [PATCH] rearrange config installation

---
 etc/config.json                                | 18 ------------------
 .../turbo-hipster}                             |  0
 etc/turbo-hipster/config.json                  | 18 ++++++++++++++++++
 setup.cfg                                      |  4 ++++
 setup.py                                       |  4 +---
 turbo_hipster/worker_server.py                 |  2 +-
 6 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 100644 etc/config.json
 rename etc/{turbo-hipster.init => init.d/turbo-hipster} (100%)
 mode change 100644 => 100755
 create mode 100644 etc/turbo-hipster/config.json

diff --git a/etc/config.json b/etc/config.json
deleted file mode 100644
index 4471d7e..0000000
--- a/etc/config.json
+++ /dev/null
@@ -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/"
-    }
-}
\ No newline at end of file
diff --git a/etc/turbo-hipster.init b/etc/init.d/turbo-hipster
old mode 100644
new mode 100755
similarity index 100%
rename from etc/turbo-hipster.init
rename to etc/init.d/turbo-hipster
diff --git a/etc/turbo-hipster/config.json b/etc/turbo-hipster/config.json
new file mode 100644
index 0000000..2a783f0
--- /dev/null
+++ b/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/"
+    }
+}
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 47189bf..6ab31b0 100644
--- a/setup.cfg
+++ b/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
diff --git a/setup.py b/setup.py
index f72fb68..53e4fc4 100755
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,4 @@
 
 import setuptools
 
-setuptools.setup(
-    setup_requires=['d2to1', 'pbr'],
-    d2to1=True)
+setuptools.setup(setup_requires=['d2to1', 'pbr'], d2to1=True)
diff --git a/turbo_hipster/worker_server.py b/turbo_hipster/worker_server.py
index 6a492fd..5469773 100755
--- a/turbo_hipster/worker_server.py
+++ b/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()