From 52303128b3568c91bb4eeb2d9ed36b80729e1b04 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 11 Sep 2016 10:16:19 +0200
Subject: [PATCH] Fix systemd installation

---
 bacula/autoconf/configure.in                  |   1 +
 bacula/platforms/systemd/Makefile.in          | 114 +++++++++---------
 .../platforms/systemd/bacula-dir.service.in   |   2 +-
 bacula/platforms/systemd/bacula-fd.service.in |   2 +-
 bacula/platforms/systemd/bacula-sd.service.in |   2 +-
 5 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 44e8a867de..7eed901272 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -3227,6 +3227,7 @@ AC_ARG_WITH(systemd,
 
 	   PFILES="${PFILES} \
 		   platforms/systemd/Makefile \
+		   platforms/systemd/bacula.conf \
 		   platforms/systemd/bacula-dir.service \
 		   platforms/systemd/bacula-fd.service \
 		   platforms/systemd/bacula-sd.service"
diff --git a/bacula/platforms/systemd/Makefile.in b/bacula/platforms/systemd/Makefile.in
index 2c3ddba159..4d2dfe0801 100644
--- a/bacula/platforms/systemd/Makefile.in
+++ b/bacula/platforms/systemd/Makefile.in
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # This file is used as the template to create the
@@ -21,55 +21,55 @@ nothing:
 install: install-dir install-conf install-autostart
 
 install-dir:
-	mkdir -p $(DESTDIR)/$(SYSTEMD_UNITDIR) $(DESTDIR)/$(SYSTEMD_TMPFILES)
+        mkdir -p $(DESTDIR)/$(SYSTEMD_UNITDIR) $(DESTDIR)/$(SYSTEMD_TMPFILES)
 
 install-conf:
-	@$(INSTALL_PROGRAM) -m 644 bacula.conf $(DESTDIR)/$(SYSTEMD_TMPFILES)/bacula.conf
+        @$(INSTALL_PROGRAM) -m 644 bacula.conf $(DESTDIR)/$(SYSTEMD_TMPFILES)/bacula.conf
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 
 install-service:
-	@$(INSTALL_PROGRAM) -m 644 bacula-fd.service $(DESTDIR)/$(SYSTEMD_UNITDIR)
-	@$(INSTALL_PROGRAM) -m 644 bacula-dir.service $(DESTDIR)/$(SYSTEMD_UNITDIR)
-	@$(INSTALL_PROGRAM) -m 644 bacula-sd.service $(DESTDIR)/$(SYSTEMD_UNITDIR)
+        @$(INSTALL_PROGRAM) -m 644 bacula-fd.service $(DESTDIR)/$(SYSTEMD_UNITDIR)
+        @$(INSTALL_PROGRAM) -m 644 bacula-dir.service $(DESTDIR)/$(SYSTEMD_UNITDIR)
+        @$(INSTALL_PROGRAM) -m 644 bacula-sd.service $(DESTDIR)/$(SYSTEMD_UNITDIR)
 
 install-autostart-fd:
-	@if test x$(DESTDIR) = x -a  -f $(SYSTEMD_UNITDIR)/bacula-fd.service; then \
-	   /bin/systemctl stop bacula-fd.service; \
-	   /bin/systemctl disable bacula-fd.service; \
-	fi
-	@$(INSTALL_PROGRAM) -m 644 bacula-fd.service $(DESTDIR)/$(SYSTEMD_UNITDIR)/bacula-fd.service
-	# set symlinks for script at startup and shutdown
-	@if test x$(DESTDIR) = x ; then \
-	   /bin/systemctl enable bacula-fd.service; \
-	   /bin/systemctl start bacula-fd.service; \
-	fi
+        @if test x$(DESTDIR) = x -a  -f $(SYSTEMD_UNITDIR)/bacula-fd.service; then \
+           /bin/systemctl stop bacula-fd.service; \
+           /bin/systemctl disable bacula-fd.service; \
+        fi
+        @$(INSTALL_PROGRAM) -m 644 bacula-fd.service $(DESTDIR)/$(SYSTEMD_UNITDIR)/bacula-fd.service
+        # set symlinks for script at startup and shutdown
+        @if test x$(DESTDIR) = x ; then \
+           /bin/systemctl enable bacula-fd.service; \
+           /bin/systemctl start bacula-fd.service; \
+        fi
 
 
 install-autostart-sd:
-	@if test x$(DESTDIR) = x -a  -f $(SYSTEMD_UNITDIR)/bacula-sd.service; then \
-	   /bin/systemctl stop bacula-sd.service; \
-	   /bin/systemctl disable bacula-sd.service; \
-	fi
-	@$(INSTALL_PROGRAM) -m 644 bacula-sd.service $(DESTDIR)/$(SYSTEMD_UNITDIR)/bacula-sd.service
-	# set symlinks for script at startup and shutdown
-	@if test x$(DESTDIR) = x ; then \
-	   /bin/systemctl enable bacula-sd.service; \
-	   /bin/systemctl start bacula-sd.service; \
-	fi
+        @if test x$(DESTDIR) = x -a  -f $(SYSTEMD_UNITDIR)/bacula-sd.service; then \
+           /bin/systemctl stop bacula-sd.service; \
+           /bin/systemctl disable bacula-sd.service; \
+        fi
+        @$(INSTALL_PROGRAM) -m 644 bacula-sd.service $(DESTDIR)/$(SYSTEMD_UNITDIR)/bacula-sd.service
+        # set symlinks for script at startup and shutdown
+        @if test x$(DESTDIR) = x ; then \
+           /bin/systemctl enable bacula-sd.service; \
+           /bin/systemctl start bacula-sd.service; \
+        fi
 
 
 install-autostart-dir:
-	@if test x$(DESTDIR) = x -a  -f $(SYSTEMD_UNITDIR)/bacula-dir.service; then \
-	   /bin/systemctl stop bacula-dir.service; \
-	   /bin/systemctl disable bacula-dir.service; \
-	fi
-	@$(INSTALL_PROGRAM) -m 644 bacula-dir.service $(DESTDIR)/$(SYSTEMD_UNITDIR)/bacula-dir.service
-	# set symlinks for script at startup and shutdown
-	@if test x$(DESTDIR) = x ; then \
-	   /bin/systemctl enable bacula-dir.service; \
-	   /bin/systemctl start bacula-dir.service; \
-	fi
+        @if test x$(DESTDIR) = x -a  -f $(SYSTEMD_UNITDIR)/bacula-dir.service; then \
+           /bin/systemctl stop bacula-dir.service; \
+           /bin/systemctl disable bacula-dir.service; \
+        fi
+        @$(INSTALL_PROGRAM) -m 644 bacula-dir.service $(DESTDIR)/$(SYSTEMD_UNITDIR)/bacula-dir.service
+        # set symlinks for script at startup and shutdown
+        @if test x$(DESTDIR) = x ; then \
+           /bin/systemctl enable bacula-dir.service; \
+           /bin/systemctl start bacula-dir.service; \
+        fi
 
 
 uninstall: uninstall-autostart uninstall-conf
@@ -77,37 +77,37 @@ uninstall: uninstall-autostart uninstall-conf
 uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir
 
 uninstall-autostart-fd:
-	@if test x$(DESTDIR) = x -a  -f $(SYSTEMD_UNITDIR)/bacula-fd.service; then \
-	   /bin/systemctl stop bacula-fd.service; \
-	   /bin/systemctl disable bacula-fd.service; \
-	fi
-	@rm -f	$(DESTDIR)$(SYSTEMD_UNITDIR)/bacula-fd.service
+        @if test x$(DESTDIR) = x -a  -f $(SYSTEMD_UNITDIR)/bacula-fd.service; then \
+           /bin/systemctl stop bacula-fd.service; \
+           /bin/systemctl disable bacula-fd.service; \
+        fi
+        @rm -f  $(DESTDIR)$(SYSTEMD_UNITDIR)/bacula-fd.service
 
 
 uninstall-autostart-sd:
-	@if test x$(DESTDIR) = x -a  -f $(SYSTEMD_UNITDIR)/bacula-sd.service; then \
-	   /bin/systemctl stop bacula-fd.service; \
-	   /bin/systemctl disable bacula-fd.service; \
-	fi
-	@rm -f	$(DESTDIR)$(SYSTEMD_UNITDIR)/bacula-sd.service
+        @if test x$(DESTDIR) = x -a  -f $(SYSTEMD_UNITDIR)/bacula-sd.service; then \
+           /bin/systemctl stop bacula-fd.service; \
+           /bin/systemctl disable bacula-fd.service; \
+        fi
+        @rm -f  $(DESTDIR)$(SYSTEMD_UNITDIR)/bacula-sd.service
 
 uninstall-autostart-dir:
-	@if test x$(DESTDIR) = x -a  -f $(SYSTEMD)/bacula-dir.service; then \
-	   /bin/systemctl stop bacula-dir.service; \
-	   /bin/systemctl disable bacula-dir.service; \
-	fi
-	@rm -f	$(DESTDIR)$(SYSTEMD_UNITDIR)/bacula-dir.service
+        @if test x$(DESTDIR) = x -a  -f $(SYSTEMD)/bacula-dir.service; then \
+           /bin/systemctl stop bacula-dir.service; \
+           /bin/systemctl disable bacula-dir.service; \
+        fi
+        @rm -f  $(DESTDIR)$(SYSTEMD_UNITDIR)/bacula-dir.service
 
 uninstall-conf:
-	@rm -f	$(DESTDIR)/$(SYSTEMD_TMPFILES)/bacula.conf
+        @rm -f  $(DESTDIR)/$(SYSTEMD_TMPFILES)/bacula.conf
 
 clean:
-	@rm -f 1 2 3
+        @rm -f 1 2 3
 
 distclean: clean
-	@rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
-	@rm -f bacula.conf bacula-sd.service bacula-fd.service bacula-dir.service
+        @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
+        @rm -f bacula.conf bacula-sd.service bacula-fd.service bacula-dir.service
 
 devclean: clean
-	@rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
-	@rm -f bacula.conf bacula-sd.service bacula-fd.service bacula-dir.service
+        @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
+        @rm -f bacula.conf bacula-sd.service bacula-fd.service bacula-dir.service
diff --git a/bacula/platforms/systemd/bacula-dir.service.in b/bacula/platforms/systemd/bacula-dir.service.in
index 28995ad63e..c2dbc0ba76 100644
--- a/bacula/platforms/systemd/bacula-dir.service.in
+++ b/bacula/platforms/systemd/bacula-dir.service.in
@@ -1,6 +1,6 @@
 # Systemd Bacula service file
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # /lib/systemd/system/bacula-dir.service
diff --git a/bacula/platforms/systemd/bacula-fd.service.in b/bacula/platforms/systemd/bacula-fd.service.in
index 456ea1d4ce..589905870f 100644
--- a/bacula/platforms/systemd/bacula-fd.service.in
+++ b/bacula/platforms/systemd/bacula-fd.service.in
@@ -1,6 +1,6 @@
 # Systemd Bacula service file
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # /lib/systemd/system/bacula-fd.service
diff --git a/bacula/platforms/systemd/bacula-sd.service.in b/bacula/platforms/systemd/bacula-sd.service.in
index 9663f749ac..e94e974e3f 100644
--- a/bacula/platforms/systemd/bacula-sd.service.in
+++ b/bacula/platforms/systemd/bacula-sd.service.in
@@ -1,6 +1,6 @@
 # Systemd Bacula service file
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2016 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # /lib/systemd/system/bacula-sd.service
-- 
2.39.5