From 711e6f16fb3d5c9c5748998d539a1973f961306d Mon Sep 17 00:00:00 2001 From: Frank Ueberschar Date: Thu, 5 Sep 2019 15:05:01 +0200 Subject: [PATCH] packaging: added user resource folder for director daemon --- core/cmake/BareosInstallConfigFiles.cmake | 1 + core/debian/bareos-director.install.in | 1 + core/platforms/packaging/bareos.spec | 1 + 3 files changed, 3 insertions(+) diff --git a/core/cmake/BareosInstallConfigFiles.cmake b/core/cmake/BareosInstallConfigFiles.cmake index 56fdcc906db..25c44cdf643 100644 --- a/core/cmake/BareosInstallConfigFiles.cmake +++ b/core/cmake/BareosInstallConfigFiles.cmake @@ -62,6 +62,7 @@ endforeach() if (${CONFIGBASEDIRECTORY} STREQUAL "bareos-dir.d") file(MAKE_DIRECTORY "${DESTCONFDIR}/../bareos-dir-export/client/") file(MAKE_DIRECTORY "${DESTCONFDIR}/counter") + file(MAKE_DIRECTORY "${DESTCONFDIR}/user") endif() # add ndmp resource directory for bareos-sd diff --git a/core/debian/bareos-director.install.in b/core/debian/bareos-director.install.in index 862db3fd2f8..8192ab16fcd 100644 --- a/core/debian/bareos-director.install.in +++ b/core/debian/bareos-director.install.in @@ -25,6 +25,7 @@ @configtemplatedir@/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf @configtemplatedir@/bareos-dir.d/schedule/WeeklyCycle.conf @configtemplatedir@/bareos-dir.d/storage/File.conf +@configtemplatedir@/bareos-dir.d/user @configtemplatedir@/tray-monitor.d/director/Director-local*.conf /usr/sbin/bareos-dir /usr/share/man/man8/bareos-dir.8* diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec index ed76ef88d9d..5ac815b2db1 100644 --- a/core/platforms/packaging/bareos.spec +++ b/core/platforms/packaging/bareos.spec @@ -1175,6 +1175,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d %attr(0750, %{daemon_user}, %{daemon_group}) %dir %{_sysconfdir}/%{name}/bareos-dir.d/profile %attr(0750, %{daemon_user}, %{daemon_group}) %dir %{_sysconfdir}/%{name}/bareos-dir.d/schedule %attr(0750, %{daemon_user}, %{daemon_group}) %dir %{_sysconfdir}/%{name}/bareos-dir.d/storage +%attr(0750, %{daemon_user}, %{daemon_group}) %dir %{_sysconfdir}/%{name}/bareos-dir.d/user # tray monitor configurate is installed by the target daemons %if 0%{?build_qt_monitor} %attr(0755, %{daemon_user}, %{daemon_group}) %dir %{_sysconfdir}/%{name}/tray-monitor.d