Skip to content

Commit

Permalink
Split storage package into two
Browse files Browse the repository at this point in the history
- Split off the tape specific stuff into a bareos-storage-tape package.

This limits the number of packages that we depend on and only when
the user really want to backup to tape with his storage daemon he can
install this.
  • Loading branch information
Marco van Wieringen committed Feb 17, 2015
1 parent 16074f8 commit d5e4174
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 13 deletions.
4 changes: 4 additions & 0 deletions debian/bareos-storage-tape.install
@@ -0,0 +1,4 @@
/etc/bareos/mtx-changer.conf
/usr/lib/bareos/scripts/mtx-changer
/usr/share/man/man8/btape.8.gz
/usr/sbin/btape
4 changes: 0 additions & 4 deletions debian/bareos-storage.install
@@ -1,13 +1,9 @@
/etc/bareos/bareos-sd.conf
/etc/bareos/mtx-changer.conf
/etc/init.d/bareos-sd
/usr/sbin/bscrypto
/usr/lib/bareos/plugins/python-sd.so
/usr/lib/bareos/plugins/scsicrypto-sd.so
/usr/lib/bareos/scripts/disk-changer
/usr/lib/bareos/scripts/mtx-changer
/usr/sbin/bareos-sd
/usr/share/man/man8/bscrypto.8.gz
/usr/share/man/man8/bareos-sd.8.gz
/usr/share/man/man8/btape.8.gz
/usr/sbin/btape
24 changes: 21 additions & 3 deletions debian/control
Expand Up @@ -239,9 +239,7 @@ Description: Backup Archiving Recovery Open Sourced - file daemon
Package: bareos-storage
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser
Depends: bareos-common (= ${binary:Version}), lsb-base (>= 3.2-13), lsof, mtx, python, ${shlibs:Depends}, ${misc:Depends}
Recommends: mt-st
Suggests: dds2tar, scsitools, sg3-utils
Depends: bareos-common (= ${binary:Version}), lsb-base (>= 3.2-13), lsof, python, ${shlibs:Depends}, ${misc:Depends}
Conflicts: bacula-sd
Replaces: bacula-sd
Description: Backup Archiving Recovery Open Sourced - storage daemon
Expand All @@ -256,6 +254,26 @@ Description: Backup Archiving Recovery Open Sourced - storage daemon
a tape drive, but alternatively other storage media, such as files.


Package: bareos-storage-tape
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser
Depends: bareos-common (= ${binary:Version}), bareos-storage (= ${binary:Version}), lsb-base (>= 3.2-13), mtx, ${shlibs:Depends}, ${misc:Depends}
Recommends: mt-st
Suggests: dds2tar, scsitools, sg3-utils
Description: Backup Archiving Recovery Open Sourced - storage daemon tape support
Bareos is a set of programs to manage backup, recovery and verification of
data across a network of computers of different kinds.
.
The storage daemon performs the storage and recovery of the file
attributes and data to the physical media; in other words, it is
responsible for reading and writing the backups.
.
It runs on the machine which has access to the backup device(s) - usually
a tape drive, but alternatively other storage media, such as files.
.
This adds the tape specific support files for the storage daemon.


Package: bareos-tools
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
Expand Down
28 changes: 22 additions & 6 deletions platforms/packaging/bareos.spec
Expand Up @@ -230,9 +230,16 @@ Provides: %{name}-dir
Summary: Provide bareos storage daemon
Group: Productivity/Archiving/Backup
Requires: %{name}-common = %{version}
Requires: mtx
Provides: %{name}-sd

%package storage-tape
Summary: Provide bareos storage daemon tape support
Group: Productivity/Archiving/Backup
Requires: mtx
%if !0%{?suse_version}
Requires: mt-st
%endif

%package filedaemon
Summary: Provide bareos file daemon service
Group: Productivity/Archiving/Backup
Expand Down Expand Up @@ -348,6 +355,12 @@ This package contains the Director Service (Bareos main service daemon)
This package contains the Storage Daemon
(Bareos service to read and write data from/to media)

%description storage-tape
%{dscr}

This package contains the Storage Daemon tape support
(Bareos service to read and write data from/to tape media)

%description filedaemon
%{dscr}

Expand Down Expand Up @@ -607,7 +620,6 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
# a rpmlint rule is add to filter the warning
#%config(noreplace) %{script_dir}/query.sql


%files storage
# sd package (bareos-sd, bls, btape, bcopy, bextract)
%defattr(-, root, root)
Expand All @@ -625,18 +637,22 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
%{_sbindir}/bscrypto
%{plugin_dir}/*-sd.so
%{script_dir}/disk-changer
%{script_dir}/mtx-changer
%config(noreplace) %{_sysconfdir}/bareos/mtx-changer.conf
%{_sbindir}/bareos-sd
%{_mandir}/man8/bscrypto.8.gz
%{_mandir}/man8/bareos-sd.8.gz
%{_mandir}/man8/btape.8.gz
%{_sbindir}/btape
%if 0%{?systemd_support}
%{_unitdir}/bareos-sd.service
%endif
%attr(0775, %{storage_daemon_user}, %{daemon_group}) %dir /var/lib/bareos/storage

%files storage-tape
# tape specific files
%defattr(-, root, root)
%{script_dir}/mtx-changer
%config(noreplace) %{_sysconfdir}/bareos/mtx-changer.conf
%{_mandir}/man8/btape.8.gz
%{_sbindir}/btape

%files filedaemon
# fd package (bareos-fd, plugins)
%defattr(-, root, root)
Expand Down

0 comments on commit d5e4174

Please sign in to comment.