From: Ward Vandewege <wvandewege@veritasgenetics.com>
Date: Mon, 15 Oct 2018 20:36:07 +0000 (-0400)
Subject: Make sure that the arvados-docker-cleaner systemd service file is installed in
X-Git-Tag: 1.3.0~82
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e45c5654ed1122792b177b9aa86b71c0e840f9f3

Make sure that the arvados-docker-cleaner systemd service file is installed in
the correct directory.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>
---

diff --git a/services/dockercleaner/arvados-docker-cleaner.service b/services/dockercleaner/arvados-docker-cleaner.service
index b48b46bb9a..0221707cf4 100644
--- a/services/dockercleaner/arvados-docker-cleaner.service
+++ b/services/dockercleaner/arvados-docker-cleaner.service
@@ -6,7 +6,7 @@
 Description=Arvados Docker Image Cleaner
 Documentation=https://doc.arvados.org/
 After=network.target
-AssertPathExists=/etc/arvados/docker-cleaner/docker-cleaner.json
+#AssertPathExists=/etc/arvados/docker-cleaner/docker-cleaner.json
 
 # systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
 StartLimitInterval=0
diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index 9d8505e7e6..74053ec1ae 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -34,7 +34,8 @@ setup(name="arvados-docker-cleaner",
           'console_scripts': ['arvados-docker-cleaner=arvados_docker.cleaner:main'],
       },
       data_files=[
-          ('share/doc/arvados-docker-cleaner', ['agpl-3.0.txt', 'arvados-docker-cleaner.service']),
+          ('share/doc/arvados-docker-cleaner', ['agpl-3.0.txt']),
+          ('/lib/systemd/system/', ['arvados-docker-cleaner.service']),
       ],
       install_requires=[
           'docker-py==1.7.2',