Blame SOURCES/bacula-9.0.0-queryfile.patch

0ac29e
diff -Naur bacula-9.0.0.old/src/dird/bacula-dir.conf.in bacula-9.0.0/src/dird/bacula-dir.conf.in
0ac29e
--- bacula-9.0.0.old/src/dird/bacula-dir.conf.in	2017-07-10 08:52:38.930834509 +0200
0ac29e
+++ bacula-9.0.0/src/dird/bacula-dir.conf.in	2017-07-10 08:53:11.189444548 +0200
0ac29e
@@ -18,7 +18,7 @@
0ac29e
 Director {                            # define myself
0ac29e
   Name = @basename@-dir
0ac29e
   DIRport = @dir_port@                # where we listen for UA connections
0ac29e
-  QueryFile = "@scriptdir@/query.sql"
0ac29e
+  QueryFile = "@sysconfdir@/query.sql"
0ac29e
   WorkingDirectory = "@working_dir@"
0ac29e
   PidDirectory = "@piddir@"
0ac29e
   Maximum Concurrent Jobs = 20
0ac29e
diff -Naur bacula-9.0.0.old/src/dird/Makefile.in bacula-9.0.0/src/dird/Makefile.in
0ac29e
--- bacula-9.0.0.old/src/dird/Makefile.in	2017-07-10 08:52:38.930834509 +0200
0ac29e
+++ bacula-9.0.0/src/dird/Makefile.in	2017-07-10 08:54:24.363828341 +0200
0ac29e
@@ -124,11 +124,11 @@
0ac29e
 	   @if test "x${dir_group}" != "x" -a "x${DESTDIR}" = "x" ; then \
0ac29e
 	      chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
0ac29e
 	   fi
0ac29e
-	@if test -f ${DESTDIR}${scriptdir}/query.sql; then \
0ac29e
+	@if test -f ${DESTDIR}${sysconfdir}/query.sql; then \
0ac29e
 	   echo "  ==> Saving existing query.sql to query.sql.old"; \
0ac29e
-	   $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
0ac29e
+	   $(MV) -f ${DESTDIR}${sysconfdir}/query.sql ${DESTDIR}${sysconfdir}/query.sql.old; \
0ac29e
 	fi
0ac29e
-	${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql
0ac29e
+	${INSTALL_DATA} query.sql ${DESTDIR}${sysconfdir}/query.sql
0ac29e
 	@if test -f static-bacula-dir; then \
0ac29e
 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \
0ac29e
 	fi
0ac29e
@@ -137,7 +137,7 @@
0ac29e
 uninstall:
0ac29e
 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir bdirjson)
0ac29e
 	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
0ac29e
-	(cd $(DESTDIR)$(scriptdir); $(RMF) query.sql)
0ac29e
+	(cd $(DESTDIR)$(sysconfdir); $(RMF) query.sql)
0ac29e
 
0ac29e
 
0ac29e