Merge pull request #35 from Project0/develop

Some fixes
voxpupuli · May 4, 2019 · 1eba8f5 · 1eba8f5
2 parents 2f31f5d + 19c6eb2
commit 1eba8f5
Show file tree

Hide file tree

Showing 66 changed files with 98 additions and 12 deletions.
diff --git a/manifests/client.pp b/manifests/client.pp
@@ -19,14 +19,15 @@
   if $manage_package {
     package { $package_name:
       ensure => $package_ensure,
-      tag    => 'bareos',
+      tag    => ['bareos', 'bareos_client'],
     }
   }
 
   if $manage_service {
     service { $service_name:
       ensure => $service_ensure,
       enable => $service_enable,
+      tag    => ['bareos', 'bareos_client'],
     }
   }
 
@@ -48,5 +49,6 @@
     group   => $::bareos::file_group,
     require => Package[$package_name],
     notify  => Service[$service_name],
+    tag     => ['bareos', 'bareos_client'],
   }
 }
diff --git a/manifests/client/client.pp b/manifests/client/client.pp
@@ -459,5 +459,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::client::service_name],
     require => $_require_res_messages,
+    tag     => ['bareos', 'bareos_client'],
   }
 }
diff --git a/manifests/client/director.pp b/manifests/client/director.pp
@@ -231,5 +231,6 @@
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::client::service_name],
+    tag     => ['bareos', 'bareos_client'],
   }
 }
diff --git a/manifests/client/messages.pp b/manifests/client/messages.pp
@@ -186,5 +186,6 @@
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::client::service_name],
+    tag     => ['bareos', 'bareos_client'],
   }
 }
diff --git a/manifests/console.pp b/manifests/console.pp
@@ -14,7 +14,8 @@
   if $manage_package {
     package { $package_name:
       ensure => $package_ensure,
-      tag    => 'bareos',
+      tag    => ['bareos', 'bareos_console'],
+
     }
   }
 
@@ -34,5 +35,6 @@
     owner   => $::bareos::file_owner,
     group   => $::bareos::file_group,
     require => Package[$package_name],
+    tag     => ['bareos', 'bareos_console'],
   }
 }
diff --git a/manifests/console/console.pp b/manifests/console/console.pp
@@ -200,5 +200,6 @@
     owner   => $::bareos::file_owner,
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
+    tag     => ['bareos', 'bareos_console'],
   }
 }
diff --git a/manifests/console/director.pp b/manifests/console/director.pp
@@ -185,5 +185,6 @@
     owner   => $::bareos::file_owner,
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
+    tag     => ['bareos', 'bareos_console'],
   }
 }
diff --git a/manifests/director.pp b/manifests/director.pp
@@ -20,14 +20,15 @@
   if $manage_package {
     package { $package_name:
       ensure => $package_ensure,
-      tag    => 'bareos',
+      tag    => ['bareos', 'bareos_director'],
     }
   }
 
   if $manage_service {
     service { $service_name:
       ensure => $service_ensure,
       enable => $service_enable,
+      tag    => ['bareos', 'bareos_director'],
     }
   }
 
@@ -59,13 +60,15 @@
     group   => $::bareos::file_group,
     require => Package[$package_name],
     notify  => Service[$service_name],
+    tag     => ['bareos', 'bareos_director'],
   }
 
   if $manage_database {
-    File <| |> -> exec { 'bareos director init catalog':
+    File <| tag == 'bareos_director' |> -> exec { 'bareos director init catalog':
       command     => '/usr/lib/bareos/scripts/create_bareos_database && /usr/lib/bareos/scripts/make_bareos_tables && /usr/lib/bareos/scripts/grant_bareos_privileges',
       notify      => Service[$::bareos::director::service_name],
       refreshonly => true,
+      tag         => ['bareos', 'bareos_director'],
     }
   }
 }
diff --git a/manifests/director/catalog.pp b/manifests/director/catalog.pp
@@ -186,7 +186,8 @@
     content => template('bareos/resource.erb'),
     notify  => [
       Service[$::bareos::director::service_name],
-    ]
+    ],
+    tag     => ['bareos', 'bareos_director'],
   }
   if $::bareos::manage_database {
     File["${::bareos::director::config_dir}/${_resource_dir}/${name}.conf"] ~> Exec['bareos director init catalog']

diff --git a/manifests/director/client.pp b/manifests/director/client.pp
@@ -384,5 +384,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
     require => $_require_resource,
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/console.pp b/manifests/director/console.pp
@@ -276,5 +276,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
     require => $_require_resource,
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/counter.pp b/manifests/director/counter.pp
@@ -85,5 +85,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
     require => $_require_resource,
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/director.pp b/manifests/director/director.pp
@@ -475,5 +475,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
     require => $_require_resource,
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/fileset.pp b/manifests/director/fileset.pp
@@ -76,5 +76,6 @@
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/job.pp b/manifests/director/job.pp
@@ -823,5 +823,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
     require => $_require_resource,
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/jobdefs.pp b/manifests/director/jobdefs.pp
@@ -814,5 +814,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
     require => $_require_resource,
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/messages.pp b/manifests/director/messages.pp
@@ -187,5 +187,6 @@
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/pool.pp b/manifests/director/pool.pp
@@ -329,5 +329,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
     require => $_require_resource,
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/profile.pp b/manifests/director/profile.pp
@@ -130,5 +130,6 @@
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/schedule.pp b/manifests/director/schedule.pp
@@ -61,5 +61,6 @@
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/director/storage.pp b/manifests/director/storage.pp
@@ -339,5 +339,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::director::service_name],
     require => $_require_resource,
+    tag     => ['bareos', 'bareos_director'],
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -42,7 +42,7 @@
   if $manage_package {
     package { $package_name:
       ensure => $package_ensure,
-      tag    => 'bareos',
+      tag    => ['bareos', 'bareos_core'],
     }
   }
 
@@ -51,6 +51,7 @@
       ensure     => present,
       forcelocal => true,
       system     => true,
+      tag        => ['bareos', 'bareos_core'],
     }
     -> user { $file_owner:
       ensure     => present,
@@ -60,6 +61,7 @@
       shell      => '/bin/false',
       groups     => ['disk', 'tape', $file_group],
       system     => true,
+      tag        => ['bareos', 'bareos_core'],
     }
   }
 
@@ -71,5 +73,6 @@
     mode    => $::bareos::file_dir_mode,
     owner   => $::bareos::file_owner,
     group   => $::bareos::file_group,
+    tag     => ['bareos', 'bareos_core'],
   }
 }
diff --git a/manifests/monitor.pp b/manifests/monitor.pp
@@ -14,7 +14,7 @@
   if $manage_package {
     package { $package_name:
       ensure => $package_ensure,
-      tag    => 'bareos',
+      tag    => ['bareos', 'bareos_monitor'],
     }
   }
 
@@ -36,5 +36,7 @@
     owner   => $::bareos::file_owner,
     group   => $::bareos::file_group,
     require => Package[$package_name],
+    tag     => ['bareos', 'bareos_monitor'],
+
   }
 }
diff --git a/manifests/monitor/client.pp b/manifests/monitor/client.pp
@@ -74,5 +74,6 @@
     owner   => $::bareos::file_owner,
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
+    tag     => ['bareos', 'bareos_monitor'],
   }
 }
diff --git a/manifests/monitor/director.pp b/manifests/monitor/director.pp
@@ -65,5 +65,6 @@
     owner   => $::bareos::file_owner,
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
+    tag     => ['bareos', 'bareos_monitor'],
   }
 }
diff --git a/manifests/monitor/monitor.pp b/manifests/monitor/monitor.pp
@@ -94,5 +94,6 @@
     owner   => $::bareos::file_owner,
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
+    tag     => ['bareos', 'bareos_monitor'],
   }
 }
diff --git a/manifests/monitor/storage.pp b/manifests/monitor/storage.pp
@@ -92,5 +92,6 @@
     owner   => $::bareos::file_owner,
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
+    tag     => ['bareos', 'bareos_monitor'],
   }
 }
diff --git a/manifests/repository.pp b/manifests/repository.pp
@@ -5,7 +5,8 @@
 # This class will be automatically included when a resource is defined.
 # It is not intended to be used directly by external resources like node definitions or other modules.
 class bareos::repository(
-  $release = 'latest'
+  $release = 'latest',
+  $gpg_key_fingerprint = undef,
 ) {
 
   $url = "http://download.bareos.org/bareos/release/${release}/"
@@ -20,6 +21,16 @@
     $osmajrelease = $::operatingsystemmajrelease
   }
 
+  if $gpg_key_fingerprint {
+    $_gpg_key_fingerprint = $gpg_key_fingerprint
+  } elsif $release == 'latest' or versioncmp($release, '18.2') >= 0 {
+    # >= bareos-18.2
+    $_gpg_key_fingerprint = 'A0CF E15F 71F7 9857 4AB3 63DD 1182 83D9 A786 2CEE'
+  } else {
+    # >= bareos-15.2
+    $_gpg_key_fingerprint = '0143 857D 9CE8 C2D1 82FE 2631 F93C 028C 093B FBA2'
+  }
+
   case $os {
       /(?i:redhat|centos|fedora)/: {
         case $os {
@@ -60,7 +71,7 @@
         release  => '/',
         repos    => '',
         key      => {
-          id     => '0143857D9CE8C2D182FE2631F93C028C093BFBA2',
+          id     => regsubst($_gpg_key_fingerprint, ' ', '', 'G'),
           source => "${location}/Release.key",
         },
       }

diff --git a/manifests/storage.pp b/manifests/storage.pp
@@ -19,14 +19,15 @@
   if $manage_package {
     package { $package_name:
       ensure => $package_ensure,
-      tag    => 'bareos',
+      tag    => ['bareos', 'bareos_storage'],
     }
   }
 
   if $manage_service {
     service { $service_name:
       ensure => $service_ensure,
       enable => $service_enable,
+      tag    => ['bareos', 'bareos_storage'],
     }
   }
 
@@ -51,5 +52,6 @@
     group   => $::bareos::file_group,
     require => Package[$package_name],
     notify  => Service[$service_name],
+    tag     => ['bareos', 'bareos_storage'],
   }
 }
diff --git a/manifests/storage/autochanger.pp b/manifests/storage/autochanger.pp
@@ -75,5 +75,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::storage::service_name],
     require => $_require_resource,
+    tag     => ['bareos', 'bareos_storage'],
   }
 }
diff --git a/manifests/storage/device.pp b/manifests/storage/device.pp
@@ -581,5 +581,6 @@
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::storage::service_name],
+    tag     => ['bareos', 'bareos_storage'],
   }
 }
diff --git a/manifests/storage/director.pp b/manifests/storage/director.pp
@@ -186,5 +186,6 @@
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::storage::service_name],
+    tag     => ['bareos', 'bareos_storage'],
   }
 }
diff --git a/manifests/storage/messages.pp b/manifests/storage/messages.pp
@@ -186,5 +186,6 @@
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::storage::service_name],
+    tag     => ['bareos', 'bareos_storage'],
   }
 }
diff --git a/manifests/storage/ndmp.pp b/manifests/storage/ndmp.pp
@@ -77,5 +77,6 @@
     group   => $::bareos::file_group,
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::storage::service_name],
+    tag     => ['bareos', 'bareos_storage'],
   }
 }
diff --git a/manifests/storage/storage.pp b/manifests/storage/storage.pp
@@ -509,5 +509,6 @@
     content => template('bareos/resource.erb'),
     notify  => Service[$::bareos::storage::service_name],
     require => $_require_resource,
+    tag     => ['bareos', 'bareos_storage'],
   }
 }