summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2014-12-16 14:47:21 -0200
committerKali Kaneko <kali@leap.se>2014-12-16 13:28:29 -0400
commit608f385e693d03403fccf1934c1932129e9ae4e1 (patch)
tree1b8a4340c29c2cf647f4870c2c6507151a38ee6e /server
parent61bf66223be996a47e446512f493cc4e934156c7 (diff)
Fix server initscript location (#6557).
Diffstat (limited to 'server')
-rw-r--r--server/changes/bug_6557_fix-server-initscript-location1
-rw-r--r--server/pkg/soledad-server (renamed from server/pkg/soledad)0
-rw-r--r--server/setup.py2
3 files changed, 2 insertions, 1 deletions
diff --git a/server/changes/bug_6557_fix-server-initscript-location b/server/changes/bug_6557_fix-server-initscript-location
new file mode 100644
index 00000000..6032b302
--- /dev/null
+++ b/server/changes/bug_6557_fix-server-initscript-location
@@ -0,0 +1 @@
+ o Fix server initscript location (#6557).
diff --git a/server/pkg/soledad b/server/pkg/soledad-server
index ccb3e9b0..ccb3e9b0 100644
--- a/server/pkg/soledad
+++ b/server/pkg/soledad-server
diff --git a/server/setup.py b/server/setup.py
index 573622ce..124ddd32 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -35,7 +35,7 @@ if isset('VIRTUAL_ENV') or isset('LEAP_SKIP_INIT'):
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-server"])]
trove_classifiers = (