diff -Nru swift-2.21.0/debian/changelog swift-2.21.0/debian/changelog
--- swift-2.21.0/debian/changelog	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/changelog	2019-05-14 15:17:31.000000000 +0000
@@ -1,3 +1,60 @@
+swift (2.21.0-0ubuntu2) eoan; urgency=medium
+
+  * Enabling systemd.
+  * d/rules: Add 'override_dh_systemd_enable' section and remove
+    'override_dh_installinit' section.
+  * d/swift-account.service: Add file.
+  * d/swift-account.swift-account-auditor.service: Add file.
+  * d/swift-account.swift-account-reaper.service: Add file.
+  * d/swift-account.swift-account-replicator.service: Add file.
+  * d/swift-container.service: Add file.
+  * d/swift-container.swift-container-auditor.service: Add file.
+  * d/swift-container.swift-container-replicator.service: Add file.
+  * d/swift-container.swift-container-sharder.service: Add file.
+  * d/swift-container.swift-container-sync.service: Add file.
+  * d/swift-container.swift-container-updater.service: Add file.
+  * d/swift-object.service: Add file.
+  * d/swift-object.swift-object-auditor.service: Add file.
+  * d/swift-object.swift-object-reconstructor.service: Add file.
+  * d/swift-object.swift-object-replicator.service: Add file.
+  * d/swift-object.swift-object-updater.service: Add file.
+  * d/swift-proxy.service: Add file.
+  * d/swift-account.init: Remove file.
+  * d/swift-account.swift-account-auditor.init: Remove file.
+  * d/swift-account.swift-account-reaper.init: Remove file.
+  * d/swift-account.swift-account-replicator.init: Remove file.
+  * d/swift-container.init: Remove file.
+  * d/swift-container.swift-container-auditor.init: Remove file.
+  * d/swift-container.swift-container-replicator.init: Remove file.
+  * d/swift-container.swift-container-sharder.init: Remove file.
+  * d/swift-container.swift-container-sync.init: Remove file.
+  * d/swift-container.swift-container-updater.init: Remove file.
+  * d/swift-object-expirer.init: Remove file.
+  * d/swift-object.init: Remove file.
+  * d/swift-object.swift-object-auditor.init: Remove file.
+  * d/swift-object.swift-object-reconstructor.init: Remove file.
+  * d/swift-object.swift-object-replicator.init: Remove file.
+  * d/swift-object.swift-object-updater.init: Remove file.
+  * d/swift-proxy.init: Remove file.
+  * d/swift-account.upstart: Remove file.
+  * d/swift-account.swift-account-auditor.upstart: Remove file.
+  * d/swift-account.swift-account-reaper.upstart: Remove file.
+  * d/swift-account.swift-account-replicator.upstart: Remove file.
+  * d/swift-container.upstart: Remove file.
+  * d/swift-container.swift-container-auditor.upstart: Remove file.
+  * d/swift-container.swift-container-replicator.upstart: Remove file.
+  * d/swift-container.swift-container-sync.upstart: Remove file.
+  * d/swift-container.swift-container-updater.upstart: Remove file.
+  * d/swift-object.upstart: Remove file.
+  * d/swift-object-expirer.upstart: Remove file.
+  * d/swift-object.swift-object-auditor.upstart: Remove file.
+  * d/swift-object.swift-object-reconstructor.upstart: Remove file.
+  * d/swift-object.swift-object-replicator.upstart: Remove file.
+  * d/swift-object.swift-object-updater.upstart: Remove file.
+  * d/swift-proxy.upstart: Remove file.
+
+ -- Tytus Kurek <tytus.kurek@canonical.com>  Tue, 14 May 2019 15:17:31 +0000
+
 swift (2.21.0-0ubuntu1) disco; urgency=medium
 
   * New upstream release for OpenStack Stein.
diff -Nru swift-2.21.0/debian/rules swift-2.21.0/debian/rules
--- swift-2.21.0/debian/rules	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/rules	2019-05-14 15:17:31.000000000 +0000
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --buildsystem=python_distutils --with python2,sphinxdoc
+	dh $@ --buildsystem=python_distutils --with python2,sphinxdoc,systemd
 
 # clean sphinx build output
 override_dh_clean:
@@ -33,19 +33,23 @@
 	install -D -m 0640 $(CURDIR)/debian/object-server.conf $(CURDIR)/debian/swift-object/etc/swift/object-server.conf
 	install -D -m 0640 $(CURDIR)/debian/object-expirer.conf $(CURDIR)/debian/swift-object-expirer/etc/swift/object-expirer.conf
 
-override_dh_installinit:
-	dh_installinit --no-start
-	dh_installinit --no-start -pswift-container --name=swift-container-replicator
-	dh_installinit --no-start -pswift-container --name=swift-container-auditor
-	dh_installinit --no-start -pswift-container --name=swift-container-updater
-	dh_installinit --no-start -pswift-container --name=swift-container-sync
-	dh_installinit --no-start -pswift-account --name=swift-account-replicator
-	dh_installinit --no-start -pswift-account --name=swift-account-auditor
-	dh_installinit --no-start -pswift-account --name=swift-account-reaper
-	dh_installinit --no-start -pswift-object --name=swift-object-replicator
-	dh_installinit --no-start -pswift-object --name=swift-object-auditor
-	dh_installinit --no-start -pswift-object --name=swift-object-updater
-	dh_installinit --no-start -pswift-object --name=swift-object-reconstructor
+override_dh_systemd_enable:
+	dh_systemd_enable -pswift-account --name=swift-account swift-account.service
+	dh_systemd_enable -pswift-account --name=swift-account-auditor swift-account.swift-account-auditor.service
+	dh_systemd_enable -pswift-account --name=swift-account-reaper swift-account.swift-account-reaper.service
+	dh_systemd_enable -pswift-account --name=swift-account-replicator swift-account.swift-account-replicator.service
+	dh_systemd_enable -pswift-container --name=swift-container swift-container.service
+	dh_systemd_enable -pswift-container --name=swift-container-auditor swift-container.swift-container-auditor.service
+	dh_systemd_enable -pswift-container --name=swift-container-replicator swift-container.swift-container-replicator.service
+	dh_systemd_enable -pswift-container --name=swift-container-sharder swift-container.swift-container-sharder.service
+	dh_systemd_enable -pswift-container --name=swift-container-sync swift-container.swift-container-sync.service
+	dh_systemd_enable -pswift-container --name=swift-container-updater swift-container.swift-container-updater.service
+	dh_systemd_enable -pswift-object --name=swift-object swift-object.service
+	dh_systemd_enable -pswift-object --name=swift-object-auditor swift-object.swift-object-auditor.service
+	dh_systemd_enable -pswift-object --name=swift-object-reconstructor swift-object.swift-object-reconstructor.service
+	dh_systemd_enable -pswift-object --name=swift-object-replicator swift-object.swift-object-replicator.service
+	dh_systemd_enable -pswift-object --name=swift-object-updater swift-object.swift-object-updater.service
+	dh_systemd_enable -pswift-proxy --name=swift-proxy swift-proxy.service
 
 override_dh_compress:
 	dh_compress -Xconf-sample
diff -Nru swift-2.21.0/debian/swift-account.init swift-2.21.0/debian/swift-account.init
--- swift-2.21.0/debian/swift-account.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-account.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-account
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift account server
-# Description:       Account server for swift.
-### END INIT INFO
-
-SERVICE_NAME="account-server"
-PRINT_NAME="Swift account server"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/account-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-account.service swift-2.21.0/debian/swift-account.service
--- swift-2.21.0/debian/swift-account.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-account.service	2019-05-14 13:36:26.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift account server
+ConditionFileNotEmpty=/etc/swift/account-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-account-server(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-account-server /etc/swift/account-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-account.swift-account-auditor.init swift-2.21.0/debian/swift-account.swift-account-auditor.init
--- swift-2.21.0/debian/swift-account.swift-account-auditor.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-account.swift-account-auditor.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-account-auditor
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift account auditor
-# Description:       Account auditor for swift.
-### END INIT INFO
-
-SERVICE_NAME="account-auditor"
-PRINT_NAME="Swift account auditor"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/account-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-account.swift-account-auditor.service swift-2.21.0/debian/swift-account.swift-account-auditor.service
--- swift-2.21.0/debian/swift-account.swift-account-auditor.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-account.swift-account-auditor.service	2019-05-14 13:34:01.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift account auditor
+ConditionFileNotEmpty=/etc/swift/account-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-account-auditor(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-account-auditor /etc/swift/account-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-account.swift-account-auditor.upstart swift-2.21.0/debian/swift-account.swift-account-auditor.upstart
--- swift-2.21.0/debian/swift-account.swift-account-auditor.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-account.swift-account-auditor.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-account-auditor - SWIFT Account Auditor
-#
-# The swift account auditor.
-
-description     "SWIFT Account Auditor"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/account-server.conf" ]; then
-    exec /usr/bin/swift-init account-auditor start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init account-auditor stop
-
diff -Nru swift-2.21.0/debian/swift-account.swift-account-reaper.init swift-2.21.0/debian/swift-account.swift-account-reaper.init
--- swift-2.21.0/debian/swift-account.swift-account-reaper.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-account.swift-account-reaper.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-account-reaper
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift account reaper 
-# Description:       Account reaper for swift.
-### END INIT INFO
-
-SERVICE_NAME="account-reaper"
-PRINT_NAME="Swift account reaper"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/account-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-account.swift-account-reaper.service swift-2.21.0/debian/swift-account.swift-account-reaper.service
--- swift-2.21.0/debian/swift-account.swift-account-reaper.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-account.swift-account-reaper.service	2019-05-14 13:35:18.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift account reaper
+ConditionFileNotEmpty=/etc/swift/account-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-account-reaper(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-account-reaper /etc/swift/account-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-account.swift-account-reaper.upstart swift-2.21.0/debian/swift-account.swift-account-reaper.upstart
--- swift-2.21.0/debian/swift-account.swift-account-reaper.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-account.swift-account-reaper.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-account-reaper - SWIFT Account Reaper
-#
-# The swift account reaper.
-
-description     "SWIFT Account Reaper"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/account-server.conf" ]; then
-    exec /usr/bin/swift-init account-reaper start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init account-reaper stop
-
diff -Nru swift-2.21.0/debian/swift-account.swift-account-replicator.init swift-2.21.0/debian/swift-account.swift-account-replicator.init
--- swift-2.21.0/debian/swift-account.swift-account-replicator.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-account.swift-account-replicator.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-account-replicator
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift account replicator
-# Description:       Account replicator for swift.
-### END INIT INFO
-
-SERVICE_NAME="account-replicator"
-PRINT_NAME="Swift account replicator"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/account-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-account.swift-account-replicator.service swift-2.21.0/debian/swift-account.swift-account-replicator.service
--- swift-2.21.0/debian/swift-account.swift-account-replicator.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-account.swift-account-replicator.service	2019-05-14 13:35:46.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift account replicator
+ConditionFileNotEmpty=/etc/swift/account-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-account-replicator(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-account-replicator /etc/swift/account-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-account.swift-account-replicator.upstart swift-2.21.0/debian/swift-account.swift-account-replicator.upstart
--- swift-2.21.0/debian/swift-account.swift-account-replicator.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-account.swift-account-replicator.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-account-replicator - SWIFT Account Replicator
-#
-# The swift account replicator.
-
-description     "SWIFT Account Replicator"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/account-server.conf" ]; then
-    exec /usr/bin/swift-init account-replicator start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init account-replicator stop
-
diff -Nru swift-2.21.0/debian/swift-account.upstart swift-2.21.0/debian/swift-account.upstart
--- swift-2.21.0/debian/swift-account.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-account.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-account-server - SWIFT Account Server
-#
-# The swift account server.
-
-description     "SWIFT Account Server"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/account-server.conf" ]; then
-    exec /usr/bin/swift-init account-server start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init account-server stop
-
diff -Nru swift-2.21.0/debian/swift-container.init swift-2.21.0/debian/swift-container.init
--- swift-2.21.0/debian/swift-container.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-container
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift container server
-# Description:       Container server for swift.
-### END INIT INFO
-
-SERVICE_NAME="container-server"
-PRINT_NAME="Swift container server"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/container-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-container.service swift-2.21.0/debian/swift-container.service
--- swift-2.21.0/debian/swift-container.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-container.service	2019-05-14 13:41:02.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift container server
+ConditionFileNotEmpty=/etc/swift/container-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-container-server(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-container-server /etc/swift/container-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-container.swift-container-auditor.init swift-2.21.0/debian/swift-container.swift-container-auditor.init
--- swift-2.21.0/debian/swift-container.swift-container-auditor.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-auditor.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-container-auditor
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift container auditor
-# Description:       Container auditor for swift.
-### END INIT INFO
-
-SERVICE_NAME="container-auditor"
-PRINT_NAME="Swift container auditor"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/container-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-container.swift-container-auditor.service swift-2.21.0/debian/swift-container.swift-container-auditor.service
--- swift-2.21.0/debian/swift-container.swift-container-auditor.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-auditor.service	2019-05-14 13:37:39.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift container auditor
+ConditionFileNotEmpty=/etc/swift/container-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-container-auditor(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-container-auditor /etc/swift/container-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-container.swift-container-auditor.upstart swift-2.21.0/debian/swift-container.swift-container-auditor.upstart
--- swift-2.21.0/debian/swift-container.swift-container-auditor.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-auditor.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-container-auditor - SWIFT Container Auditor
-#
-# The swift container auditor.
-
-description     "SWIFT Container Auditor"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/container-server.conf" ]; then
-    exec /usr/bin/swift-init container-auditor start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init container-auditor stop
-
diff -Nru swift-2.21.0/debian/swift-container.swift-container-replicator.init swift-2.21.0/debian/swift-container.swift-container-replicator.init
--- swift-2.21.0/debian/swift-container.swift-container-replicator.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-replicator.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-container-replicator
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift container replicator
-# Description:       Container replicator for swift.
-### END INIT INFO
-
-SERVICE_NAME="container-replicator"
-PRINT_NAME="Swift container replicator"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/container-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-container.swift-container-replicator.service swift-2.21.0/debian/swift-container.swift-container-replicator.service
--- swift-2.21.0/debian/swift-container.swift-container-replicator.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-replicator.service	2019-05-14 13:38:53.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift container replicator
+ConditionFileNotEmpty=/etc/swift/container-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-container-replicator(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-container-replicator /etc/swift/container-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-container.swift-container-replicator.upstart swift-2.21.0/debian/swift-container.swift-container-replicator.upstart
--- swift-2.21.0/debian/swift-container.swift-container-replicator.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-replicator.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-container-replicator - SWIFT Container Replicator
-#
-# The swift container replicator.
-
-description     "SWIFT Container Replicator"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/container-server.conf" ]; then
-    exec /usr/bin/swift-init container-replicator start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init container-replicator stop
-
diff -Nru swift-2.21.0/debian/swift-container.swift-container-sharder.init swift-2.21.0/debian/swift-container.swift-container-sharder.init
--- swift-2.21.0/debian/swift-container.swift-container-sharder.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-sharder.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-container-sharder
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift container sharder
-# Description:       Container sharder for swift.
-### END INIT INFO
-
-SERVICE_NAME="container-sharder"
-PRINT_NAME="Swift container sharder"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/container-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-container.swift-container-sharder.service swift-2.21.0/debian/swift-container.swift-container-sharder.service
--- swift-2.21.0/debian/swift-container.swift-container-sharder.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-sharder.service	2019-05-14 13:39:22.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift container sharder
+ConditionFileNotEmpty=/etc/swift/container-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-container-sharder(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-container-sharder /etc/swift/container-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-container.swift-container-sync.init swift-2.21.0/debian/swift-container.swift-container-sync.init
--- swift-2.21.0/debian/swift-container.swift-container-sync.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-sync.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-container-sync
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift container sync
-# Description:       Container sync for swift.
-### END INIT INFO
-
-SERVICE_NAME="container-sync"
-PRINT_NAME="Swift container sync"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/container-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-container.swift-container-sync.service swift-2.21.0/debian/swift-container.swift-container-sync.service
--- swift-2.21.0/debian/swift-container.swift-container-sync.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-sync.service	2019-05-14 13:39:44.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift container sync
+ConditionFileNotEmpty=/etc/swift/container-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-container-sync(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-container-sync /etc/swift/container-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-container.swift-container-sync.upstart swift-2.21.0/debian/swift-container.swift-container-sync.upstart
--- swift-2.21.0/debian/swift-container.swift-container-sync.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-sync.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-description     "SWIFT Container Sync"
-author          "James Page <james.page@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/container-server.conf" ]; then
-    exec /usr/bin/swift-init container-sync start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init container-sync stop
diff -Nru swift-2.21.0/debian/swift-container.swift-container-updater.init swift-2.21.0/debian/swift-container.swift-container-updater.init
--- swift-2.21.0/debian/swift-container.swift-container-updater.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-updater.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-container-updater
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift container updater
-# Description:       Container updater for swift.
-### END INIT INFO
-
-SERVICE_NAME="container-updater"
-PRINT_NAME="Swift container updater"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/container-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-container.swift-container-updater.service swift-2.21.0/debian/swift-container.swift-container-updater.service
--- swift-2.21.0/debian/swift-container.swift-container-updater.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-updater.service	2019-05-14 13:40:08.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift container updater
+ConditionFileNotEmpty=/etc/swift/container-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-container-updater(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-container-updater /etc/swift/container-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-container.swift-container-updater.upstart swift-2.21.0/debian/swift-container.swift-container-updater.upstart
--- swift-2.21.0/debian/swift-container.swift-container-updater.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.swift-container-updater.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-container-updater - SWIFT Container Updater
-#
-# The swift container updater.
-
-description     "SWIFT Container Updater"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/container-server.conf" ]; then
-    exec /usr/bin/swift-init container-updater start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init container-updater stop
-
diff -Nru swift-2.21.0/debian/swift-container.upstart swift-2.21.0/debian/swift-container.upstart
--- swift-2.21.0/debian/swift-container.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-container.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-container-server - SWIFT Container Server
-#
-# The swift container server.
-
-description     "SWIFT Container Server"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/container-server.conf" ]; then
-    exec /usr/bin/swift-init container-server start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init container-server stop
-
diff -Nru swift-2.21.0/debian/swift-object-expirer.init swift-2.21.0/debian/swift-object-expirer.init
--- swift-2.21.0/debian/swift-object-expirer.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object-expirer.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-object-expirer
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift object expirer
-# Description:       Object expirer for swift.
-### END INIT INFO
-
-SERVICE_NAME="object-expirer"
-PRINT_NAME="Swift object expirer"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/object-expirer.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-object-expirer.upstart swift-2.21.0/debian/swift-object-expirer.upstart
--- swift-2.21.0/debian/swift-object-expirer.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object-expirer.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-description "SWIFT Object Expirer"
-author "Will Kelly <william.kelly@rackspace.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/object-expirer.conf" ]; then
-    exec /usr/bin/swift-init object-expirer start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init object-expirer stop
diff -Nru swift-2.21.0/debian/swift-object.init swift-2.21.0/debian/swift-object.init
--- swift-2.21.0/debian/swift-object.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-object
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift object server
-# Description:       Object server for swift.
-### END INIT INFO
-
-SERVICE_NAME="object-server"
-PRINT_NAME="Swift object server"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/object-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-object.service swift-2.21.0/debian/swift-object.service
--- swift-2.21.0/debian/swift-object.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-object.service	2019-05-14 13:43:23.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift object server
+ConditionFileNotEmpty=/etc/swift/object-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-object-server(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-object-server /etc/swift/object-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-object.swift-object-auditor.init swift-2.21.0/debian/swift-object.swift-object-auditor.init
--- swift-2.21.0/debian/swift-object.swift-object-auditor.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-auditor.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-object-auditor
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift object auditor
-# Description:       Object auditor for swift.
-### END INIT INFO
-
-SERVICE_NAME="object-auditor"
-PRINT_NAME="Swift object auditor"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/object-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-object.swift-object-auditor.service swift-2.21.0/debian/swift-object.swift-object-auditor.service
--- swift-2.21.0/debian/swift-object.swift-object-auditor.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-auditor.service	2019-05-14 13:41:35.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift object auditor
+ConditionFileNotEmpty=/etc/swift/object-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-object-auditor(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-object-auditor /etc/swift/object-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-object.swift-object-auditor.upstart swift-2.21.0/debian/swift-object.swift-object-auditor.upstart
--- swift-2.21.0/debian/swift-object.swift-object-auditor.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-auditor.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-object-auditor - SWIFT Object Auditor
-#
-# The swift object auditor.
-
-description     "SWIFT Object Auditor"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/object-server.conf" ]; then
-    exec /usr/bin/swift-init object-auditor start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init object-auditor stop
-
diff -Nru swift-2.21.0/debian/swift-object.swift-object-reconstructor.init swift-2.21.0/debian/swift-object.swift-object-reconstructor.init
--- swift-2.21.0/debian/swift-object.swift-object-reconstructor.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-reconstructor.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-object-reconstructor
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift object reconstructor
-# Description:       Object reconstructor for swift.
-### END INIT INFO
-
-SERVICE_NAME="object-reconstructor"
-PRINT_NAME="Swift object reconstructor"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/object-server.conf" ] ; then
-    exit 6
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-object.swift-object-reconstructor.service swift-2.21.0/debian/swift-object.swift-object-reconstructor.service
--- swift-2.21.0/debian/swift-object.swift-object-reconstructor.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-reconstructor.service	2019-05-14 13:42:06.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift object reconstructor
+ConditionFileNotEmpty=/etc/swift/object-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-object-reconstructor(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-object-reconstructor /etc/swift/object-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-object.swift-object-reconstructor.upstart swift-2.21.0/debian/swift-object.swift-object-reconstructor.upstart
--- swift-2.21.0/debian/swift-object.swift-object-reconstructor.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-reconstructor.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-object-reconstructor - SWIFT Object Reconstuctor
-#
-# The swift object reconstructor.
-
-description     "SWIFT Object Reconstuctor"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/object-server.conf" ]; then
-    exec /usr/bin/swift-init object-reconstructor start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init object-reconstructor stop
-
diff -Nru swift-2.21.0/debian/swift-object.swift-object-replicator.init swift-2.21.0/debian/swift-object.swift-object-replicator.init
--- swift-2.21.0/debian/swift-object.swift-object-replicator.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-replicator.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-object-replicator
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift object replicator
-# Description:       Object replicator for swift.
-### END INIT INFO
-
-SERVICE_NAME="object-replicator"
-PRINT_NAME="Swift object replicator"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/object-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-object.swift-object-replicator.service swift-2.21.0/debian/swift-object.swift-object-replicator.service
--- swift-2.21.0/debian/swift-object.swift-object-replicator.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-replicator.service	2019-05-14 13:42:31.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift object replicator
+ConditionFileNotEmpty=/etc/swift/object-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-object-replicator(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-object-replicator /etc/swift/object-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-object.swift-object-replicator.upstart swift-2.21.0/debian/swift-object.swift-object-replicator.upstart
--- swift-2.21.0/debian/swift-object.swift-object-replicator.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-replicator.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-object-replicator - SWIFT Object Replicator
-#
-# The swift object replicator.
-
-description     "SWIFT Object Replicator"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/object-server.conf" ]; then
-    exec /usr/bin/swift-init object-replicator start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init object-replicator stop
-
diff -Nru swift-2.21.0/debian/swift-object.swift-object-updater.init swift-2.21.0/debian/swift-object.swift-object-updater.init
--- swift-2.21.0/debian/swift-object.swift-object-updater.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-updater.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-object-updater
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift object updater
-# Description:       Object updater for swift.
-### END INIT INFO
-
-SERVICE_NAME="object-updater"
-PRINT_NAME="Swift object updater"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/object-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-object.swift-object-updater.service swift-2.21.0/debian/swift-object.swift-object-updater.service
--- swift-2.21.0/debian/swift-object.swift-object-updater.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-updater.service	2019-05-14 13:42:55.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift object updater
+ConditionFileNotEmpty=/etc/swift/object-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-object-updater(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-object-updater /etc/swift/object-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-object.swift-object-updater.upstart swift-2.21.0/debian/swift-object.swift-object-updater.upstart
--- swift-2.21.0/debian/swift-object.swift-object-updater.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object.swift-object-updater.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-object-updater - SWIFT Object Updater
-#
-# The swift object updater.
-
-description     "SWIFT Object Updater"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/object-server.conf" ]; then
-    exec /usr/bin/swift-init object-updater start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init object-updater stop
-
diff -Nru swift-2.21.0/debian/swift-object.upstart swift-2.21.0/debian/swift-object.upstart
--- swift-2.21.0/debian/swift-object.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-object.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-object-server - SWIFT Object Server
-#
-# The swift object server.
-
-description     "SWIFT Object Server"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/object-server.conf" ]; then
-    exec /usr/bin/swift-init object-server start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init object-server stop
-
diff -Nru swift-2.21.0/debian/swift-proxy.init swift-2.21.0/debian/swift-proxy.init
--- swift-2.21.0/debian/swift-proxy.init	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-proxy.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          swift-proxy
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Swift proxy server
-# Description:       Proxy server for swift.
-### END INIT INFO
-
-SERVICE_NAME="proxy-server"
-PRINT_NAME="Swift proxy server"
-
-. /lib/lsb/init-functions
-
-if ! [ -x /usr/bin/swift-init ] ; then
-	exit 0
-fi
-
-if ! [ -f "/etc/swift/proxy-server.conf" ] ; then
-    exit 6 
-fi
-
-case "$1" in
-start)
-	log_daemon_msg "Starting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} start
-	log_end_msg $?
-;;   
-stop)
-	log_daemon_msg "Stopping Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-	/usr/bin/swift-init ${SERVICE_NAME} stop
-	log_end_msg $?
-;;
-restart|force-reload|reload)
-    log_daemon_msg "Restarting Swift ${PRINT_NAME}" "swift-init ${SERVICE_NAME}"
-    /usr/bin/swift-init ${SERVICE_NAME} reload
-;;
-status)
-    exec /usr/bin/swift-init ${SERVICE_NAME} status
-;;
-*)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-;;  
-esac
-
-exit 0
diff -Nru swift-2.21.0/debian/swift-proxy.service swift-2.21.0/debian/swift-proxy.service
--- swift-2.21.0/debian/swift-proxy.service	1970-01-01 00:00:00.000000000 +0000
+++ swift-2.21.0/debian/swift-proxy.service	2019-05-14 13:43:45.000000000 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=OpenStack Swift proxy server
+ConditionFileNotEmpty=/etc/swift/proxy-server.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+Documentation=man:swift-proxy-server(1)
+
+
+[Service]
+User=swift
+Group=swift
+WorkingDirectory=~
+CacheDirectory=swift
+RuntimeDirectory=swift lock/swift
+ExecStart=/usr/bin/swift-proxy-server /etc/swift/proxy-server.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+
diff -Nru swift-2.21.0/debian/swift-proxy.upstart swift-2.21.0/debian/swift-proxy.upstart
--- swift-2.21.0/debian/swift-proxy.upstart	2019-04-08 08:13:45.000000000 +0000
+++ swift-2.21.0/debian/swift-proxy.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-# swift-proxy - SWIFT Proxy Server
-#
-# The swift proxy server.
-
-description     "SWIFT Proxy Server"
-author          "Marc Cluet <marc.cluet@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-pre-start script
-  if [ -f "/etc/swift/proxy-server.conf" ]; then
-    exec /usr/bin/swift-init proxy-server start
-  else
-    exit 1
-  fi
-end script
-
-post-stop exec /usr/bin/swift-init proxy-server stop
-