Simone Caronni 3eafaf
diff -Naur bacula-7.0.0.old/src/dird/bacula-dir.conf.in bacula-7.0.0/src/dird/bacula-dir.conf.in
Simone Caronni 3eafaf
--- bacula-7.0.0.old/src/dird/bacula-dir.conf.in	2014-03-29 10:00:03.000000000 +0100
Simone Caronni c68f41
+++ bacula-7.0.0/src/dird/bacula-dir.conf.in	2014-03-31 09:59:31.629996491 +0200
Simone Caronni d6447b
@@ -15,7 +15,7 @@
Simone Caronni d6447b
 Director {                            # define myself
Simone Caronni d6447b
   Name = @basename@-dir
Simone Caronni d6447b
   DIRport = @dir_port@                # where we listen for UA connections
Simone Caronni d6447b
-  QueryFile = "@scriptdir@/query.sql"
Simone Caronni d6447b
+  QueryFile = "@sysconfdir@/query.sql"
Simone Caronni d6447b
   WorkingDirectory = "@working_dir@"
Simone Caronni d6447b
   PidDirectory = "@piddir@"
Simone Caronni 3eafaf
   Maximum Concurrent Jobs = 20
Simone Caronni c68f41
diff -Naur bacula-7.0.0.old/src/dird/Makefile.in bacula-7.0.0/src/dird/Makefile.in
Simone Caronni c68f41
--- bacula-7.0.0.old/src/dird/Makefile.in	2014-03-29 10:00:03.000000000 +0100
Simone Caronni c68f41
+++ bacula-7.0.0/src/dird/Makefile.in	2014-03-31 10:00:34.017663662 +0200
Simone Caronni c68f41
@@ -112,11 +112,11 @@
Simone Caronni c68f41
 	   @if test "x${dir_group}" != "x"; then \
Simone Caronni c68f41
 	      chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
Simone Caronni c68f41
 	   fi
Simone Caronni c68f41
-	@if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
Simone Caronni c68f41
+	@if  test -f ${DESTDIR}${sysconfdir}/query.sql; then \
Simone Caronni c68f41
 	   echo "  ==> Saving existing query.sql to query.sql.old"; \
Simone Caronni c68f41
-	   $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
Simone Caronni c68f41
+	   $(MV) -f ${DESTDIR}${sysconfdir}/query.sql ${DESTDIR}${sysconfdir}/query.sql.old; \
Simone Caronni c68f41
 	fi 
Simone Caronni c68f41
-	${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql
Simone Caronni c68f41
+	${INSTALL_DATA} query.sql ${DESTDIR}${sysconfdir}/query.sql
Simone Caronni c68f41
 	@if test -f static-bacula-dir; then \
Simone Caronni c68f41
 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \
Simone Caronni c68f41
 	fi
Simone Caronni c68f41
@@ -125,7 +125,7 @@
Simone Caronni c68f41
 uninstall:
Simone Caronni c68f41
 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir
Simone Caronni c68f41
 	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
Simone Caronni c68f41
-	(cd $(DESTDIR)$(scriptdir); $(RMF) query.sql)
Simone Caronni c68f41
+	(cd $(DESTDIR)$(sysconfdir); $(RMF) query.sql)
Simone Caronni c68f41
 
Simone Caronni c68f41
 
Simone Caronni c68f41