Merge ~chris.macnaughton/ubuntu/+source/swift:master into ~ubuntu-server-dev/ubuntu/+source/swift:master

[Chris MacNaughton]

[James Page (james-page)]

Please can you also reference bug 1827340 in the changelog.

review: Needs Fixing

[James Page (james-page)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 5753e39..611ff90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+swift (2.25.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Update to use Systemd unit files (LP: #1827340, LP: #1800676)
+    * d/*.init.in: Import init script (systemd) generation from Debian.
+    * d/*.upstart: Removed.
+    * d/*.init: Removed
+    * d/*.generator: Import from Debian.
+    * d/*.install: Added reference to generator files
+    * d/gen-init: Import from Debian. Remove WorkingDirectory.
+
+ -- Chris MacNaughton <[e-mail]>  Thu, 11 Jun 2020 09:43:34 +0000
+
 swift (2.25.0-0ubuntu1) groovy; urgency=medium
 
   * New upstream release for OpenStack Ussuri (LP: #1877642).
diff --git a/debian/gen-init b/debian/gen-init
 new file mode 100755
index 0000000..5583fbf
--- /dev/null
+++ b/debian/gen-init
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+INIT_TEMPLATE=${1}
+
+# Get the variables defined in the init template
+. ${INIT_TEMPLATE}
+
+SYSTEM_USER=${PROJECT_NAME}
+SYSTEM_GROUP=${PROJECT_NAME}
+
+# Find out what should go in After=
+SHOULD_START=`cat ${INIT_TEMPLATE} | grep "# Should-Start:" | sed 's/# Should-Start://'`
+
+INIT_FILE=`echo ${INIT_TEMPLATE} | sed 's/.init.in/.init/'`
+SERVICE_FILE=`echo ${INIT_TEMPLATE} | sed 's/.init.in/.service/'`
+
+if [ -n "${SHOULD_START}" ] ; then
+	AFTER="After="
+	for i in ${SHOULD_START} ; do
+		AFTER="${AFTER}${i}.service "
+	done
+fi
+
+if [ -n "$SYSTEMD_DOC" ] ; then
+    SYSTEMD_DOC="Documentation=$SYSTEMD_DOC"
+fi
+
+########
+# init #
+########
+cp "$INIT_TEMPLATE" "$INIT_FILE"
+cat debian/init-script-template >>"$INIT_FILE"
+
+###########
+# systemd #
+###########
+echo "[Unit]
+Description=${DESC}
+ConditionFileNotEmpty=/etc/${PROJECT_NAME}/${CONFIG}.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+$SYSTEMD_DOC
+$AFTER
+
+[Service]
+User=${SYSTEM_USER}
+Group=${SYSTEM_GROUP}
+CacheDirectory=${PROJECT_NAME}
+RuntimeDirectory=${PROJECT_NAME} lock/${PROJECT_NAME}
+ExecStart=/usr/bin/${NAME} /etc/${PROJECT_NAME}/${CONFIG}.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+" >${SERVICE_FILE}
+
+##############################
+
+if [ "$MULTI" ] ; then
+
+SERVICE_FILE=`echo ${INIT_TEMPLATE} | sed 's/.init.in/@.service/'`
+SERVICE_NAME=${INIT_TEMPLATE%.init.in}
+SERVICE_NAME=${SERVICE_NAME##*/}
+SERVICE_NAME=${SERVICE_NAME##*.}
+
+echo "[Unit]
+Description=${DESC}
+PartOf=${SERVICE_NAME}.service
+ReloadPropagatedFrom=${SERVICE_NAME}.service
+ConditionFileNotEmpty=/etc/${PROJECT_NAME}/${CONFIG}/%i.conf
+AssertFileNotEmpty=/etc/swift/account.ring.gz
+AssertFileNotEmpty=/etc/swift/container.ring.gz
+AssertPathExistsGlob=/etc/swift/object*.ring.gz
+$SYSTEMD_DOC
+$AFTER
+
+[Service]
+User=${SYSTEM_USER}
+Group=${SYSTEM_GROUP}
+WorkingDirectory=~
+CacheDirectory=${PROJECT_NAME}
+RuntimeDirectory=${PROJECT_NAME} lock/${PROJECT_NAME}
+ExecStart=/usr/bin/${NAME} /etc/${PROJECT_NAME}/${CONFIG}/%i.conf
+Restart=on-failure
+LimitNOFILE=65535
+
+[Install]
+WantedBy=multi-user.target
+" >${SERVICE_FILE}
+
+fi
diff --git a/debian/init-script-template b/debian/init-script-template
 new file mode 100644
index 0000000..f94491b
--- /dev/null
+++ b/debian/init-script-template
@@ -0,0 +1,148 @@
+#!/bin/sh
+# The content after this line comes from Debian Swift source package
+# and has been automatically added to a .init.in script, which
+# contains only the descriptive part for the daemon. Everything
+# else is standardized as a single unique script.
+
+# Author: Thomas Goirand <[e-mail]>
+# Author: Ondřej Nový <[e-mail]>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+DAEMON=/usr/bin/${NAME}
+SYSTEM_USER=${PROJECT_NAME}
+SYSTEM_GROUP=${PROJECT_NAME}
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# If ran as root, create /var/lock/X, /var/run/X and /var/cache/X as needed
+if [ `whoami` = "root" ] ; then
+	for i in lock run cache ; do
+		mkdir -p /var/$i/${PROJECT_NAME}
+		chown ${SYSTEM_USER}:${SYSTEM_GROUP} /var/$i/${PROJECT_NAME}
+	done
+fi
+
+# This defines init_is_upstart which we use later on (+ more...)
+. /lib/lsb/init-functions
+
+RET=0
+
+# Configs
+[ -r /etc/default/openstack ] && . /etc/default/openstack
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+do_start() {
+	# Check for existence of ring files
+	if
+			[ ! -r /etc/swift/account.ring.gz ] ||
+			[ ! -r /etc/swift/container.ring.gz ] ||
+			test -z "$(find /etc/swift -maxdepth 1 -name 'object*.ring.gz' -print -quit)" ; then
+		log_end_msg 1
+		exit $?
+	fi
+
+	STARTED=
+	for CONF_FILE in /etc/swift/${CONFIG}.conf /etc/swift/${CONFIG}/*.conf ; do
+		if [ ! -e "$CONF_FILE" ] ; then
+			continue
+		fi
+
+		SUFFIX=${CONF_FILE#/etc/swift/$CONFIG}
+		SUFFIX=${SUFFIX%.conf}
+		if [ "$SUFFIX" ] ; then
+			# /etc/swift/${NAME}/*.conf
+			SUFFIX=-${SUFFIX#/}
+		fi
+		PIDFILE=/var/run/${PROJECT_NAME}/${NAME}${SUFFIX}.pid
+
+		start-stop-daemon \
+			--start \
+			--quiet \
+			--background \
+			--chuid ${SYSTEM_USER}:${SYSTEM_GROUP} \
+			--make-pidfile \
+			--pidfile ${PIDFILE} \
+			--chdir /var/lib/${PROJECT_NAME} \
+			--startas $DAEMON \
+			--test > /dev/null \
+			|| return 1
+		start-stop-daemon \
+			--start \
+			--quiet \
+			--background \
+			--chuid ${SYSTEM_USER}:${SYSTEM_GROUP} \
+			--make-pidfile \
+			--pidfile ${PIDFILE} \
+			--chdir /var/lib/${PROJECT_NAME} \
+			--startas $DAEMON \
+			-- $CONF_FILE \
+			|| return 2
+
+		STARTED=1
+	done
+
+	if [ ! "$STARTED" ] ; then
+		return 2
+	fi
+}
+
+do_stop() {
+	for PIDFILE in /var/run/${PROJECT_NAME}/${NAME}*.pid ; do
+		start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
+		RETVAL=$?
+		rm -f $PIDFILE
+		if [ "$RETVAL" != "0" ] ; then
+			return "$RETVAL"
+		fi
+	done
+}
+
+case "$1" in
+start)
+	#init_is_upstart > /dev/null 2>&1 && exit 1
+	log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case $? in
+		0|1) log_end_msg 0 ; RET=$? ;;
+		2)   log_end_msg 1 ; RET=$? ;;
+	esac
+;;
+stop)
+	#init_is_upstart > /dev/null 2>&1 && exit 0
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case $? in
+		0|1) log_end_msg 0 ; RET=$? ;;
+		2)   log_end_msg 1 ; RET=$? ;;
+	esac
+;;
+status)
+	status_of_proc "$DAEMON" "$NAME"
+	RET=$?
+;;
+restart|force-reload)
+	#init_is_upstart > /dev/null 2>&1 && exit 1
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case $? in
+		0|1)
+			do_start
+			case $? in
+				0) log_end_msg 0 ; RET=$? ;;
+				1) log_end_msg 1 ; RET=$? ;; # Old process is still running
+				*) log_end_msg 1 ; RET=$? ;; # Failed to start
+			esac
+		;;
+		*) log_end_msg 1 ; RET=$? ;; # Failed to stop
+	esac
+;;
+*)
+	echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2
+	RET=3
+;;
+esac
+
+exit $RET
diff --git a/debian/rules b/debian/rules
index 407b4ef..611dbb1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,11 +34,18 @@ endif
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area
 
+override_dh_auto_build:
+	dh_auto_build
+	set -e ; set -x ; \
+	for i in $(sort $(wildcard debian/*.init.in)) ; do \
+		debian/gen-init $$i ; \
+	done
+
 override_dh_auto_install:
 	pkgos-dh_auto_install --no-py2 --in-tmp
 
 override_dh_install:
-	dh_install --sourcedir=debian/tmp
+	dh_install --sourcedir=debian/tmp -Xdebian/swift-account-generator -Xdebian/swift-object-generator -Xdebian/swift-container-generator
 	dh_missing --fail-missing
 	install -D -m 0640 $(CURDIR)/debian/account-server.conf $(CURDIR)/debian/python3-swift/etc/swift/account-server.conf
 	install -D -m 0640 $(CURDIR)/debian/container-server.conf $(CURDIR)/debian/python3-swift/etc/swift/container-server.conf
@@ -46,18 +53,20 @@ override_dh_install:
 	install -D -m 0640 $(CURDIR)/debian/object-expirer.conf $(CURDIR)/debian/python3-swift/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
+	set -e ; set -x ; \
+	for FILE in $(sort $(patsubst debian/%,%,$(wildcard debian/*.init))) ; do \
+		PKG=`echo $$FILE | cut -d. -f1` ; \
+		NAME=`echo $$FILE | cut -d. -f2` ; \
+		dh_installinit --error-handler=true -p$$PKG --name=$$NAME ;\
+	done
+
+override_dh_installsystemd:
+	set -e ; set -x ; \
+	for FILE in $(sort $(patsubst debian/%,%,$(wildcard debian/*.service))) ; do \
+		PKG=`echo $$FILE | cut -d. -f1` ; \
+		NAME=`echo $$FILE | cut -d. -f2` ; \
+		dh_installsystemd -p$$PKG --name=$$NAME ;\
+	done
 
 override_dh_compress:
 	dh_compress -Xconf-sample
diff --git a/debian/swift-account-generator b/debian/swift-account-generator
 new file mode 100755
index 0000000..955c6e4
--- /dev/null
+++ b/debian/swift-account-generator
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# This systemd generator creates dependency symlinks that make all
+# Swift account servers be started/stopped/reloaded
+# when swift-account*.service is started/stopped/reloaded.
+
+set -eu
+
+GENDIR="$1"
+LIBDIR="/lib/systemd/system"
+CONFIG=/etc/swift/account-server
+
+if [ ! -d "$CONFIG" ] ; then
+    # Single config mode
+    exit 0
+fi
+
+for NAME in $CONFIG/* ; do
+    NAME=${NAME#$CONFIG}
+    NAME=${NAME#/}
+    NAME=${NAME%.conf}
+
+    for i in account account-auditor account-reaper account-replicator ; do
+        mkdir -p "$GENDIR/swift-$i.service.wants"
+        ln -s \
+            "$LIBDIR/swift-$i@.service" \
+            "$GENDIR/swift-$i.service.wants/swift-$i@$NAME.service"
+    done
+done
+
+exit 0
+
diff --git a/debian/swift-account.init b/debian/swift-account.init
 deleted file mode 100644
index 3eadb88..0000000
--- a/debian/swift-account.init
+++ /dev/null
@@ -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 --git a/debian/swift-account.install b/debian/swift-account.install
index 576f829..2e6419a 100644
--- a/debian/swift-account.install
+++ b/debian/swift-account.install
@@ -1,3 +1,6 @@
+#! /usr/bin/dh-exec --with=install
+debian/swift-account-generator /lib/systemd/system-generators
+
 usr/bin/swift-account-audit
 usr/bin/swift-account-auditor
 usr/bin/swift-account-info
diff --git a/debian/swift-account.swift-account-auditor.init b/debian/swift-account.swift-account-auditor.init
 deleted file mode 100644
index 2cb92b4..0000000
--- a/debian/swift-account.swift-account-auditor.init
+++ /dev/null
@@ -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 --git a/debian/swift-account.swift-account-auditor.init.in b/debian/swift-account.swift-account-auditor.init.in
 new file mode 100644
index 0000000..8289a92
--- /dev/null
+++ b/debian/swift-account.swift-account-auditor.init.in
@@ -0,0 +1,17 @@
+#! /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 server for Swift.
+### END INIT INFO
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-account-auditor"
+DESC="OpenStack Swift account auditor"
+CONFIG=account-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-account.swift-account-auditor.upstart b/debian/swift-account.swift-account-auditor.upstart
 deleted file mode 100644
index d490395..0000000
--- a/debian/swift-account.swift-account-auditor.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-account-auditor - SWIFT Account Auditor
-#
-# The swift account auditor.
-
-description     "SWIFT Account Auditor"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-account.swift-account-reaper.init b/debian/swift-account.swift-account-reaper.init
 deleted file mode 100644
index 4e39ab0..0000000
--- a/debian/swift-account.swift-account-reaper.init
+++ /dev/null
@@ -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 --git a/debian/swift-account.swift-account-reaper.init.in b/debian/swift-account.swift-account-reaper.init.in
 new file mode 100644
index 0000000..ee73f62
--- /dev/null
+++ b/debian/swift-account.swift-account-reaper.init.in
@@ -0,0 +1,17 @@
+#! /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
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-account-reaper"
+DESC="OpenStack Swift account reaper"
+CONFIG=account-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-account.swift-account-reaper.upstart b/debian/swift-account.swift-account-reaper.upstart
 deleted file mode 100644
index a86ff6f..0000000
--- a/debian/swift-account.swift-account-reaper.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-account-reaper - SWIFT Account Reaper
-#
-# The swift account reaper.
-
-description     "SWIFT Account Reaper"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-account.swift-account-replicator.init b/debian/swift-account.swift-account-replicator.init
 deleted file mode 100644
index 2effcba..0000000
--- a/debian/swift-account.swift-account-replicator.init
+++ /dev/null
@@ -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 --git a/debian/swift-account.swift-account-replicator.init.in b/debian/swift-account.swift-account-replicator.init.in
 new file mode 100644
index 0000000..d590827
--- /dev/null
+++ b/debian/swift-account.swift-account-replicator.init.in
@@ -0,0 +1,17 @@
+#! /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
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-account-replicator"
+DESC="OpenStack Swift account replicator"
+CONFIG=account-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-account.swift-account-replicator.upstart b/debian/swift-account.swift-account-replicator.upstart
 deleted file mode 100644
index 874da6e..0000000
--- a/debian/swift-account.swift-account-replicator.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-account-replicator - SWIFT Account Replicator
-#
-# The swift account replicator.
-
-description     "SWIFT Account Replicator"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-account.swift-account.init.in b/debian/swift-account.swift-account.init.in
 new file mode 100644
index 0000000..3f53057
--- /dev/null
+++ b/debian/swift-account.swift-account.init.in
@@ -0,0 +1,17 @@
+#! /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
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-account-server"
+DESC="OpenStack Swift account server"
+CONFIG=account-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-account.upstart b/debian/swift-account.upstart
 deleted file mode 100644
index f1d15f2..0000000
--- a/debian/swift-account.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-account-server - SWIFT Account Server
-#
-# The swift account server.
-
-description     "SWIFT Account Server"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-container-generator b/debian/swift-container-generator
 new file mode 100755
index 0000000..51e9515
--- /dev/null
+++ b/debian/swift-container-generator
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# This systemd generator creates dependency symlinks that make all
+# Swift account servers be started/stopped/reloaded
+# when swift-account*.service is started/stopped/reloaded.
+
+set -eu
+
+GENDIR="$1"
+LIBDIR="/lib/systemd/system"
+CONFIG=/etc/swift/account-server
+
+if [ ! -d "$CONFIG" ] ; then
+    # Single config mode
+    exit 0
+fi
+
+for NAME in $CONFIG/* ; do
+    NAME=${NAME#$CONFIG}
+    NAME=${NAME#/}
+    NAME=${NAME%.conf}
+
+    for i in container container-auditor container-replicator container-sharder container-sync container-updater ; do
+        mkdir -p "$GENDIR/swift-$i.service.wants"
+        ln -s \
+            "$LIBDIR/swift-$i@.service" \
+            "$GENDIR/swift-$i.service.wants/swift-$i@$NAME.service"
+    done
+done
+
+exit 0
+
diff --git a/debian/swift-container.init b/debian/swift-container.init
 deleted file mode 100644
index a320afc..0000000
--- a/debian/swift-container.init
+++ /dev/null
@@ -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 --git a/debian/swift-container.install b/debian/swift-container.install
index 96f5112..f70a026 100644
--- a/debian/swift-container.install
+++ b/debian/swift-container.install
@@ -1,3 +1,6 @@
+#! /usr/bin/dh-exec --with=install
+debian/swift-container-generator /lib/systemd/system-generators
+
 usr/bin/swift-container-*
 usr/bin/swift-manage-shard-ranges
 usr/bin/swift-reconciler-enqueue
diff --git a/debian/swift-container.swift-container-auditor.init b/debian/swift-container.swift-container-auditor.init
 deleted file mode 100644
index b81f3fb..0000000
--- a/debian/swift-container.swift-container-auditor.init
+++ /dev/null
@@ -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 --git a/debian/swift-container.swift-container-auditor.init.in b/debian/swift-container.swift-container-auditor.init.in
 new file mode 100644
index 0000000..ce7c48f
--- /dev/null
+++ b/debian/swift-container.swift-container-auditor.init.in
@@ -0,0 +1,17 @@
+#! /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 server for Swift.
+### END INIT INFO
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-container-auditor"
+DESC="OpenStack Swift container auditor"
+CONFIG=container-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-container.swift-container-auditor.upstart b/debian/swift-container.swift-container-auditor.upstart
 deleted file mode 100644
index 091df78..0000000
--- a/debian/swift-container.swift-container-auditor.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-container-auditor - SWIFT Container Auditor
-#
-# The swift container auditor.
-
-description     "SWIFT Container Auditor"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-container.swift-container-reconciler.init.in b/debian/swift-container.swift-container-reconciler.init.in
 new file mode 100644
index 0000000..d566089
--- /dev/null
+++ b/debian/swift-container.swift-container-reconciler.init.in
@@ -0,0 +1,16 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          swift-container-reconciler
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Swift container reconciler
+# Description:       Container reconciler for Swift.
+### END INIT INFO
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-container-reconciler"
+DESC="OpenStack Swift container reconciler"
+CONFIG=container-reconciler
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-container.swift-container-replicator.init b/debian/swift-container.swift-container-replicator.init
 deleted file mode 100644
index 5a906e5..0000000
--- a/debian/swift-container.swift-container-replicator.init
+++ /dev/null
@@ -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 --git a/debian/swift-container.swift-container-replicator.init.in b/debian/swift-container.swift-container-replicator.init.in
 new file mode 100644
index 0000000..4b989d5
--- /dev/null
+++ b/debian/swift-container.swift-container-replicator.init.in
@@ -0,0 +1,17 @@
+#! /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
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-container-replicator"
+DESC="OpenStack Swift container replicator"
+CONFIG=container-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-container.swift-container-replicator.upstart b/debian/swift-container.swift-container-replicator.upstart
 deleted file mode 100644
index 0583c94..0000000
--- a/debian/swift-container.swift-container-replicator.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-container-replicator - SWIFT Container Replicator
-#
-# The swift container replicator.
-
-description     "SWIFT Container Replicator"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-container.swift-container-sharder.init b/debian/swift-container.swift-container-sharder.init
 deleted file mode 100644
index 232258f..0000000
--- a/debian/swift-container.swift-container-sharder.init
+++ /dev/null
@@ -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 --git a/debian/swift-container.swift-container-sharder.init.in b/debian/swift-container.swift-container-sharder.init.in
 new file mode 100644
index 0000000..9ea0e04
--- /dev/null
+++ b/debian/swift-container.swift-container-sharder.init.in
@@ -0,0 +1,17 @@
+#! /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
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-container-sharder"
+DESC="OpenStack Swift container sharder"
+CONFIG=container-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-container.swift-container-sync.init b/debian/swift-container.swift-container-sync.init
 deleted file mode 100644
index 098706a..0000000
--- a/debian/swift-container.swift-container-sync.init
+++ /dev/null
@@ -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 --git a/debian/swift-container.swift-container-sync.init.in b/debian/swift-container.swift-container-sync.init.in
 new file mode 100644
index 0000000..c24e790
--- /dev/null
+++ b/debian/swift-container.swift-container-sync.init.in
@@ -0,0 +1,17 @@
+#! /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 server for Swift.
+### END INIT INFO
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-container-sync"
+DESC="OpenStack Swift container sync"
+CONFIG=container-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-container.swift-container-sync.upstart b/debian/swift-container.swift-container-sync.upstart
 deleted file mode 100644
index 6a5c320..0000000
--- a/debian/swift-container.swift-container-sync.upstart
+++ /dev/null
@@ -1,15 +0,0 @@
-description     "SWIFT Container Sync"
-author          "James Page <[e-mail]>"
-
-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 --git a/debian/swift-container.swift-container-updater.init b/debian/swift-container.swift-container-updater.init
 deleted file mode 100644
index 7082e8f..0000000
--- a/debian/swift-container.swift-container-updater.init
+++ /dev/null
@@ -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 --git a/debian/swift-container.swift-container-updater.init.in b/debian/swift-container.swift-container-updater.init.in
 new file mode 100644
index 0000000..73c5f36
--- /dev/null
+++ b/debian/swift-container.swift-container-updater.init.in
@@ -0,0 +1,17 @@
+#! /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 server for Swift.
+### END INIT INFO
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-container-updater"
+DESC="OpenStack Swift container updater"
+CONFIG=container-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-container.swift-container-updater.upstart b/debian/swift-container.swift-container-updater.upstart
 deleted file mode 100644
index f41895b..0000000
--- a/debian/swift-container.swift-container-updater.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-container-updater - SWIFT Container Updater
-#
-# The swift container updater.
-
-description     "SWIFT Container Updater"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-container.swift-container.init.in b/debian/swift-container.swift-container.init.in
 new file mode 100644
index 0000000..a12c3df
--- /dev/null
+++ b/debian/swift-container.swift-container.init.in
@@ -0,0 +1,17 @@
+#! /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
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-container-server"
+DESC="OpenStack Swift container server"
+CONFIG=container-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-container.upstart b/debian/swift-container.upstart
 deleted file mode 100644
index 8035002..0000000
--- a/debian/swift-container.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-container-server - SWIFT Container Server
-#
-# The swift container server.
-
-description     "SWIFT Container Server"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-object-expirer.init b/debian/swift-object-expirer.init
 deleted file mode 100644
index 2800190..0000000
--- a/debian/swift-object-expirer.init
+++ /dev/null
@@ -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 --git a/debian/swift-object-expirer.swift-object-expirer.init.in b/debian/swift-object-expirer.swift-object-expirer.init.in
 new file mode 100644
index 0000000..ead7164
--- /dev/null
+++ b/debian/swift-object-expirer.swift-object-expirer.init.in
@@ -0,0 +1,16 @@
+#! /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 daemon for Swift.
+### END INIT INFO
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-object-expirer"
+DESC="OpenStack Swift object expirer"
+CONFIG=object-expirer
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-object-expirer.upstart b/debian/swift-object-expirer.upstart
 deleted file mode 100644
index 6ac508a..0000000
--- a/debian/swift-object-expirer.upstart
+++ /dev/null
@@ -1,15 +0,0 @@
-description "SWIFT Object Expirer"
-author "Will Kelly <[e-mail]>"
-
-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 --git a/debian/swift-object-generator b/debian/swift-object-generator
 new file mode 100755
index 0000000..91dae09
--- /dev/null
+++ b/debian/swift-object-generator
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# This systemd generator creates dependency symlinks that make all
+# Swift account servers be started/stopped/reloaded
+# when swift-account*.service is started/stopped/reloaded.
+
+set -eu
+
+GENDIR="$1"
+LIBDIR="/lib/systemd/system"
+CONFIG=/etc/swift/account-server
+
+if [ ! -d "$CONFIG" ] ; then
+    # Single config mode
+    exit 0
+fi
+
+for NAME in $CONFIG/* ; do
+    NAME=${NAME#$CONFIG}
+    NAME=${NAME#/}
+    NAME=${NAME%.conf}
+
+    for i in object object-auditor object-reconstructor object-replicator object-updater ; do
+        mkdir -p "$GENDIR/swift-$i.service.wants"
+        ln -s \
+            "$LIBDIR/swift-$i@.service" \
+            "$GENDIR/swift-$i.service.wants/swift-$i@$NAME.service"
+    done
+done
+
+exit 0
+
diff --git a/debian/swift-object.init b/debian/swift-object.init
 deleted file mode 100644
index 13609a7..0000000
--- a/debian/swift-object.init
+++ /dev/null
@@ -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 --git a/debian/swift-object.install b/debian/swift-object.install
index 44a67e0..eff451b 100644
--- a/debian/swift-object.install
+++ b/debian/swift-object.install
@@ -1,3 +1,6 @@
+#! /usr/bin/dh-exec --with=install
+debian/swift-object-generator /lib/systemd/system-generators
+
 usr/bin/swift-object-auditor
 usr/bin/swift-object-info
 usr/bin/swift-object-reconstructor
diff --git a/debian/swift-object.swift-object-auditor.init b/debian/swift-object.swift-object-auditor.init
 deleted file mode 100644
index 0a92df5..0000000
--- a/debian/swift-object.swift-object-auditor.init
+++ /dev/null
@@ -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 --git a/debian/swift-object.swift-object-auditor.init.in b/debian/swift-object.swift-object-auditor.init.in
 new file mode 100644
index 0000000..53b0ce5
--- /dev/null
+++ b/debian/swift-object.swift-object-auditor.init.in
@@ -0,0 +1,17 @@
+#! /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 server for Swift.
+### END INIT INFO
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-object-auditor"
+DESC="OpenStack Swift object auditor"
+CONFIG=object-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-object.swift-object-auditor.upstart b/debian/swift-object.swift-object-auditor.upstart
 deleted file mode 100644
index af5b76d..0000000
--- a/debian/swift-object.swift-object-auditor.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-object-auditor - SWIFT Object Auditor
-#
-# The swift object auditor.
-
-description     "SWIFT Object Auditor"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-object.swift-object-reconstructor.init b/debian/swift-object.swift-object-reconstructor.init
 deleted file mode 100644
index 20a1b5e..0000000
--- a/debian/swift-object.swift-object-reconstructor.init
+++ /dev/null
@@ -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 --git a/debian/swift-object.swift-object-reconstructor.init.in b/debian/swift-object.swift-object-reconstructor.init.in
 new file mode 100644
index 0000000..6324e00
--- /dev/null
+++ b/debian/swift-object.swift-object-reconstructor.init.in
@@ -0,0 +1,17 @@
+#! /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 server for Swift.
+### END INIT INFO
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-object-reconstructor"
+DESC="OpenStack Swift object reconstructor"
+CONFIG=object-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-object.swift-object-reconstructor.upstart b/debian/swift-object.swift-object-reconstructor.upstart
 deleted file mode 100644
index 987f8ab..0000000
--- a/debian/swift-object.swift-object-reconstructor.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-object-reconstructor - SWIFT Object Reconstuctor
-#
-# The swift object reconstructor.
-
-description     "SWIFT Object Reconstuctor"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-object.swift-object-replicator.init b/debian/swift-object.swift-object-replicator.init
 deleted file mode 100644
index ec6fd50..0000000
--- a/debian/swift-object.swift-object-replicator.init
+++ /dev/null
@@ -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 --git a/debian/swift-object.swift-object-replicator.init.in b/debian/swift-object.swift-object-replicator.init.in
 new file mode 100644
index 0000000..22f48f9
--- /dev/null
+++ b/debian/swift-object.swift-object-replicator.init.in
@@ -0,0 +1,17 @@
+#! /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 server for Swift.
+### END INIT INFO
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-object-replicator"
+DESC="OpenStack Swift object replicator"
+CONFIG=object-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-object.swift-object-replicator.upstart b/debian/swift-object.swift-object-replicator.upstart
 deleted file mode 100644
index 6666e0d..0000000
--- a/debian/swift-object.swift-object-replicator.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-object-replicator - SWIFT Object Replicator
-#
-# The swift object replicator.
-
-description     "SWIFT Object Replicator"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-object.swift-object-updater.init b/debian/swift-object.swift-object-updater.init
 deleted file mode 100644
index 8430640..0000000
--- a/debian/swift-object.swift-object-updater.init
+++ /dev/null
@@ -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 --git a/debian/swift-object.swift-object-updater.init.in b/debian/swift-object.swift-object-updater.init.in
 new file mode 100644
index 0000000..651f3a5
--- /dev/null
+++ b/debian/swift-object.swift-object-updater.init.in
@@ -0,0 +1,17 @@
+#! /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 server for Swift.
+### END INIT INFO
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-object-updater"
+DESC="OpenStack Swift object updater"
+CONFIG=object-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-object.swift-object-updater.upstart b/debian/swift-object.swift-object-updater.upstart
 deleted file mode 100644
index 3c028bf..0000000
--- a/debian/swift-object.swift-object-updater.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-object-updater - SWIFT Object Updater
-#
-# The swift object updater.
-
-description     "SWIFT Object Updater"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-object.swift-object.init.in b/debian/swift-object.swift-object.init.in
 new file mode 100644
index 0000000..047ac51
--- /dev/null
+++ b/debian/swift-object.swift-object.init.in
@@ -0,0 +1,17 @@
+#! /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
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-object-server"
+DESC="OpenStack Swift object server"
+CONFIG=object-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-object.upstart b/debian/swift-object.upstart
 deleted file mode 100644
index 3ef4324..0000000
--- a/debian/swift-object.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-object-server - SWIFT Object Server
-#
-# The swift object server.
-
-description     "SWIFT Object Server"
-author          "Marc Cluet <[e-mail]>"
-
-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 --git a/debian/swift-proxy.init b/debian/swift-proxy.init
 deleted file mode 100644
index 7a2193a..0000000
--- a/debian/swift-proxy.init
+++ /dev/null
@@ -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 --git a/debian/swift-proxy.swift-proxy.init.in b/debian/swift-proxy.swift-proxy.init.in
 new file mode 100644
index 0000000..1ae17ac
--- /dev/null
+++ b/debian/swift-proxy.swift-proxy.init.in
@@ -0,0 +1,17 @@
+#! /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
+
+PROJECT_NAME=swift
+NAME="${PROJECT_NAME}-proxy-server"
+DESC="OpenStack Swift proxy server"
+CONFIG=proxy-server
+MULTI=1
+SYSTEMD_DOC="man:${NAME}(1)"
diff --git a/debian/swift-proxy.upstart b/debian/swift-proxy.upstart
 deleted file mode 100644
index 8947c51..0000000
--- a/debian/swift-proxy.upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-# swift-proxy - SWIFT Proxy Server
-#
-# The swift proxy server.
-
-description     "SWIFT Proxy Server"
-author          "Marc Cluet <[e-mail]>"
-
-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
-