Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
---
fixtures:
repositories:
augeas_core:
repo: https://github.com/puppetlabs/puppetlabs-augeas_core.git
puppet_version: '>= 6.0.0'
augeas_core: https://github.com/puppetlabs/puppetlabs-augeas_core.git
concat: https://github.com/puppetlabs/puppetlabs-concat.git
postgresql: https://github.com/puppetlabs/puppetlabs-postgresql.git
puppet: https://github.com/puppetlabs-operations/puppet-puppet.git
stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
systemd: https://github.com/voxpupuli/puppet-systemd.git
symlinks:
bacula: "#{source_dir}"
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ concurrency:
group: ${{ github.ref_name }}
cancel-in-progress: true

permissions:
contents: read

jobs:
puppet:
name: Puppet
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ name: "Pull Request Labeler"
on:
pull_request_target: {}

permissions:
contents: read
pull-requests: write

jobs:
labeler:
permissions:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/prepare_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)'
required: false

permissions:
contents: write
pull-requests: write

jobs:
release_prep:
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
tags:
- '*'

permissions:
contents: write

jobs:
release:
name: Release
Expand Down
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '9.5.0'
modulesync_config_version: '10.0.0'
10 changes: 3 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 9.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'voxpupuli-test', '~> 11.0', :require => false
gem 'puppet_metadata', '~> 5.0', :require => false
end

Expand All @@ -20,13 +18,11 @@ group :system_tests do
end

group :release do
gem 'voxpupuli-release', '~> 3.0', :require => false
gem 'voxpupuli-release', '~> 4.0', :require => false
end

gem 'rake', :require => false
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]

puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"]
gem 'puppet', puppetversion, :require => false, :groups => [:test]
gem 'openvox', ENV.fetch('OPENVOX_GEM_VERSION', [">= 7", "< 9"]), :require => false, :groups => [:test]

# vim: syntax=ruby
24 changes: 12 additions & 12 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2245,18 +2245,18 @@ Alias of

```puppet
Struct[{
runs_when => Optional[Enum[
'Before',
'After',
'Always',
'AfterVSS',
'Never',
]],
fail_job_on_error => Optional[Bacula::Yesno],
runs_on_success => Optional[Bacula::Yesno],
runs_on_failure => Optional[Bacula::Yesno],
runs_on_client => Optional[Bacula::Yesno],
command => String,
runs_when => Optional[Enum[
'Before',
'After',
'Always',
'AfterVSS',
'Never',
]],
fail_job_on_error => Optional[Bacula::Yesno],
runs_on_success => Optional[Bacula::Yesno],
runs_on_failure => Optional[Bacula::Yesno],
runs_on_client => Optional[Bacula::Yesno],
command => String,
}]
```

Expand Down
2 changes: 1 addition & 1 deletion types/jobtype.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/^Admin/,
/^Verify/,
/^Copy/,
/^Migrate/]
/^Migrate/]
24 changes: 12 additions & 12 deletions types/runscript.pp
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# A Bacula Runscript specification
type Bacula::Runscript = Struct[{
runs_when => Optional[Enum[
'Before',
'After',
'Always',
'AfterVSS',
'Never',
]],
fail_job_on_error => Optional[Bacula::Yesno],
runs_on_success => Optional[Bacula::Yesno],
runs_on_failure => Optional[Bacula::Yesno],
runs_on_client => Optional[Bacula::Yesno],
command => String,
runs_when => Optional[Enum[
'Before',
'After',
'Always',
'AfterVSS',
'Never',
]],
fail_job_on_error => Optional[Bacula::Yesno],
runs_on_success => Optional[Bacula::Yesno],
runs_on_failure => Optional[Bacula::Yesno],
runs_on_client => Optional[Bacula::Yesno],
command => String,
}]
Loading