summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-07-18 15:00:31 -0400
committerMicah Anderson <micah@riseup.net>2013-07-18 15:00:31 -0400
commit1c5970e6b5deed9880aa56f93cc82aa8ebd7afe7 (patch)
tree373e4fa8641a30c2c689caf8d08fec3270c7f564
parent4e9f0ec03e730a2a9cf7a3b6d01e2b5bdfa88b65 (diff)
move initscript installation to be handled by debian
-rw-r--r--debian/soledad-server.init1
-rw-r--r--debian/soledad.init1
-rw-r--r--soledad_server/setup.py4
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/soledad-server.init b/debian/soledad-server.init
new file mode 100644
index 00000000..e352c10c
--- /dev/null
+++ b/debian/soledad-server.init
@@ -0,0 +1 @@
+../soledad_server/pkg/soledad
diff --git a/debian/soledad.init b/debian/soledad.init
deleted file mode 100644
index e70f6d2b..00000000
--- a/debian/soledad.init
+++ /dev/null
@@ -1 +0,0 @@
-../pkg/soledad
diff --git a/soledad_server/setup.py b/soledad_server/setup.py
index f9cdd07f..11aa4648 100644
--- a/soledad_server/setup.py
+++ b/soledad_server/setup.py
@@ -42,7 +42,7 @@ if os.environ.get('VIRTUAL_ENV', None):
data_files = None
else:
# XXX this should go only for linux/mac
- data_files = [("/etc/init.d/", ["pkg/soledad"])]
+ # data_files = [("/etc/init.d/", ["pkg/soledad"])]
trove_classifiers = (
"Development Status :: 3 - Alpha",
@@ -75,6 +75,6 @@ setup(
packages=find_packages('src'),
package_dir={'': 'src'},
install_requires=install_requirements,
- data_files=data_files,
+ #data_files=data_files,
classifiers=trove_classifiers,
)