Skip to content

Commit

Permalink
Merge branch 'master' into feature/hiera_configurable
Browse files Browse the repository at this point in the history
  • Loading branch information
@benibr
benibr authored and Benedikt Braunger committed Dec 24, 2019
2 parents f4e29b3 + 5d63121 commit 32297bf
Show file tree
Hide file tree
Showing 33 changed files with 185 additions and 147 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,6 @@ This module is built upon and tested against the versions of Puppet listed in th

OS Limitations hardly depends on the availability of the bareos packages in the bareos [repository](http://download.bareos.org/bareos/release/) and the available release. Currently it has been tested on Ubuntu 14.04 and 16.04.

## Module Migration
## Module Migration

This puppet module was originally hosted at https://github.com/Project0/puppet-bareos and has been migrated to Vox Pupuli.
8 changes: 4 additions & 4 deletions manifests/client/client.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,11 +453,11 @@

file { "${::bareos::client::config_dir}/${_resource_dir}/bareos-fd.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::client::service_name],
notify => Service[$bareos::client::service_name],
require => $_require_res_messages,
tag => ['bareos', 'bareos_client'],
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/client/director.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,11 @@

file { "${::bareos::client::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::client::service_name],
notify => Service[$bareos::client::service_name],
tag => ['bareos', 'bareos_client'],
}
}
8 changes: 4 additions & 4 deletions manifests/client/messages.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@

file { "${::bareos::client::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::client::service_name],
notify => Service[$bareos::client::service_name],
tag => ['bareos', 'bareos_client'],
}
}
6 changes: 3 additions & 3 deletions manifests/console/console.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@

file { "${::bareos::console::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
tag => ['bareos', 'bareos_console'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/console/director.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@

file { "${::bareos::console::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
tag => ['bareos', 'bareos_console'],
}
Expand Down
70 changes: 54 additions & 16 deletions manifests/director.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,59 @@
}
}

$catalogs.each |String $resource, Hash $attributes| {
Resource[::bareos::director::catalog] {
$resource: * => $attributes;
$catalogs.each |String $resource, Hash $attributes| {
Resource[::bareos::director::catalog] {
$resource: * => $attributes;
}
}
$clients.each |String $resource, Hash $attributes| {
Resource[::bareos::director::client] {
$resource: * => $attributes;
}
}
$consoles.each |String $resource, Hash $attributes| {
Resource[::bareos::director::console] {
$resource: * => $attributes;
}
}
$filesets.each |String $resource, Hash $attributes| {
Resource[::bareos::director::fileset] {
$resource: * => $attributes;
}
}
$jobs.each |String $resource, Hash $attributes| {
Resource[::bareos::director::job] {
$resource: * => $attributes;
}
}
$jobdefs.each |String $resource, Hash $attributes| {
Resource[::bareos::director::jobdefs] {
$resource: * => $attributes;
}
}
$messages.each |String $resource, Hash $attributes| {
Resource[::bareos::director::messages] {
$resource: * => $attributes;
}
}
$pools.each |String $resource, Hash $attributes| {
Resource[::bareos::director::pool] {
$resource: * => $attributes;
}
}
$profiles.each |String $resource, Hash $attributes| {
Resource[::bareos::director::profile] {
$resource: * => $attributes;
}
}
$schedules.each |String $resource, Hash $attributes| {
Resource[::bareos::director::schedules] {
$resource: * => $attributes;
}
}
$storages.each |String $resource, Hash $attributes| {
Resource[::bareos::director::storage] {
$resource: * => $attributes;
}
}
}
create_resources(::bareos::director::client, $clients)
create_resources(::bareos::director::consoles, $consoles)
create_resources(::bareos::director::counters, $counters)
create_resources(::bareos::director::directors, $directors)
create_resources(::bareos::director::filesets, $filesets)
create_resources(::bareos::director::jobs, $jobs)
create_resources(::bareos::director::jobdefs, $jobdefs)
create_resources(::bareos::director::messages, $messages)
create_resources(::bareos::director::pools, $pools)
create_resources(::bareos::director::profiles, $profiles)
create_resources(::bareos::director::schedules, $schedules)
create_resources(::bareos::director::storages, $storages)
}
10 changes: 5 additions & 5 deletions manifests/director/catalog.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,16 +180,16 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => [
Service[$::bareos::director::service_name],
Service[$bareos::director::service_name],
],
tag => ['bareos', 'bareos_director'],
}
if $::bareos::manage_database {
if $bareos::manage_database {
File["${::bareos::director::config_dir}/${_resource_dir}/${name}.conf"] ~> Exec['bareos director init catalog']
}
}
8 changes: 4 additions & 4 deletions manifests/director/client.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
require => $_require_resource,
tag => ['bareos', 'bareos_director'],
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/director/console.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
require => $_require_resource,
tag => ['bareos', 'bareos_director'],
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/director/counter.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
require => $_require_resource,
tag => ['bareos', 'bareos_director'],
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/director/director.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,11 +469,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/bareos-dir.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
require => $_require_resource,
tag => ['bareos', 'bareos_director'],
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/director/fileset.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
tag => ['bareos', 'bareos_director'],
}
}
8 changes: 4 additions & 4 deletions manifests/director/job.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,11 +817,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
require => $_require_resource,
tag => ['bareos', 'bareos_director'],
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/director/jobdefs.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -808,11 +808,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
require => $_require_resource,
tag => ['bareos', 'bareos_director'],
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/director/messages.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
tag => ['bareos', 'bareos_director'],
}
}
8 changes: 4 additions & 4 deletions manifests/director/pool.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
require => $_require_resource,
tag => ['bareos', 'bareos_director'],
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/director/profile.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
tag => ['bareos', 'bareos_director'],
}
}
8 changes: 4 additions & 4 deletions manifests/director/schedule.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
tag => ['bareos', 'bareos_director'],
}
}
8 changes: 4 additions & 4 deletions manifests/director/storage.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,11 +333,11 @@

file { "${::bareos::director::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
notify => Service[$::bareos::director::service_name],
notify => Service[$bareos::director::service_name],
require => $_require_resource,
tag => ['bareos', 'bareos_director'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/monitor/client.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@

file { "${::bareos::monitor::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
tag => ['bareos', 'bareos_monitor'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/monitor/director.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@

file { "${::bareos::monitor::config_dir}/${_resource_dir}/${name}.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
group => $::bareos::file_group,
mode => $bareos::file_mode,
owner => $bareos::file_owner,
group => $bareos::file_group,
content => template('bareos/resource.erb'),
tag => ['bareos', 'bareos_monitor'],
}
Expand Down
Loading

0 comments on commit 32297bf

Please sign in to comment.