Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove camptocamp/augeas dependency #373

Merged
merged 2 commits into from
Nov 21, 2023
Merged

Remove camptocamp/augeas dependency #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
194e18d
Fix lens filename in postfix::canonical
ekohl Nov 20, 2023
84a211b
Remove camptocamp/augeas dependency
ekohl Nov 20, 2023
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
1 change: 0 additions & 1 deletion REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

#### Private Classes

* `postfix::augeas`: Provides augeas lenses for postfix files
* `postfix::files`: Manages the Postfix related files
* `postfix::ldap`: Provides the Postfix LDAP support
* `postfix::mailman`: Configure Postfix to work with mailman
Expand Down
0 files/lenses/postfix_canonical.aug → lib/augeas/lenses/postfix_canonical.aug
View file
Open in desktop
File renamed without changes.
0 files/lenses/test_postfix_canonical.aug → lib/augeas/lenses/test_postfix_canonical.aug
View file
Open in desktop
File renamed without changes.
16 changes: 0 additions & 16 deletions manifests/augeas.pp
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions manifests/canonical.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
String[1] $lookup_table_suffix = 'db',
) {
include postfix
include postfix::augeas

$_file = pick($file, "${postfix::confdir}/canonical")

Expand All @@ -66,7 +65,7 @@

augeas { "Postfix canonical - ${name}":
incl => $_file,
lens => 'Postfix_Canonical.lns',
lens => 'postfix_canonical.lns',
changes => $changes,
require => Package['postfix'],
notify => Exec["generate ${_file}.${lookup_table_suffix}"],
Expand Down
4 changes: 0 additions & 4 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
"name": "puppetlabs/stdlib",
"version_requirement": ">= 4.13.0 < 10.0.0"
},
{
"name": "camptocamp/augeas",
"version_requirement": ">= 1.0.0 < 2.0.0"
},
{
"name": "puppet/alternatives",
"version_requirement": ">= 2.0.0 < 6.0.0"
Expand Down
24 changes: 24 additions & 0 deletions spec/acceptance/canonical_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# frozen_string_literal: true

require 'spec_helper_acceptance'

describe 'postfix::canonical' do
it_behaves_like 'an idempotent resource' do
let(:manifest) do
<<~PUPPET
include postfix
postfix::hash { '/etc/postfix/recipient_canonical':
ensure => present,
}
postfix::config { 'canonical_alias_maps':
value => 'hash:/etc/postfix/recipient_canonical',
}
postfix::canonical { '[email protected]':
file => '/etc/postfix/recipient_canonical',
ensure => present,
destination => 'root',
}
PUPPET
end
end
end
Loading