Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Puppet Camptocamp Postfix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Projets publics
Puppet Camptocamp Postfix
Commits
0bfa1070
Commit
0bfa1070
authored
Jul 12, 2017
by
Pete Brown
Committed by
Raphaël Pinson
Sep 20, 2017
Browse files
Options
Downloads
Patches
Plain Diff
Fix email address matching for postfix::virtual augeas lens
Make sure our version of the lens gets installed
parent
03b84c43
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
files/lenses/postfix_virtual.aug
+2
-2
2 additions, 2 deletions
files/lenses/postfix_virtual.aug
files/lenses/test_postfix_virtual.aug
+13
-2
13 additions, 2 deletions
files/lenses/test_postfix_virtual.aug
manifests/augeas.pp
+1
-1
1 addition, 1 deletion
manifests/augeas.pp
with
16 additions
and
5 deletions
files/lenses/postfix_virtual.aug
+
2
−
2
View file @
0bfa1070
...
...
@@ -32,7 +32,7 @@ let space_or_eol (sep:regexp) (default:string) =
del
(
space_or_eol_re
?
.
sep
.
space_or_eol_re
?
)
default
(* View: word *)
let
word
=
store
/
[A-Za-z0-9@\*.+-]+/
let
word
=
store
/
[A-Za-z0-9@\*.+
=_
-]+/
(* View: comma *)
let
comma
=
space_or_eol
","
", "
...
...
This diff is collapsed.
Click to expand it.
files/lenses/test_postfix_virtual.aug
+
13
−
2
View file @
0bfa1070
...
...
@@ -10,7 +10,11 @@ let conf = "# a comment
virtual-alias.domain anything
postmaster@virtual-alias.domain postmaster
user1@virtual-alias.domain address1
user2@virtual-alias.domain
user-1@virtual-alias.domain address1
user_2@virtual-alias.domain
address2,
address3
user+test@virtual-alias.domain
address2,
address3
root robert.oot@domain.com
...
...
@@ -29,7 +33,14 @@ test Postfix_Virtual.lns get conf =
{
"pattern"
=
"user1@virtual-alias.domain"
{
"destination"
=
"address1"
}
}
{
"pattern"
=
"user2@virtual-alias.domain"
{
"pattern"
=
"user-1@virtual-alias.domain"
{
"destination"
=
"address1"
}
}
{
"pattern"
=
"user_2@virtual-alias.domain"
{
"destination"
=
"address2"
}
{
"destination"
=
"address3"
}
}
{
"pattern"
=
"user+test@virtual-alias.domain"
{
"destination"
=
"address2"
}
{
"destination"
=
"address3"
}
}
...
...
This diff is collapsed.
Click to expand it.
manifests/augeas.pp
+
1
−
1
View file @
0bfa1070
...
...
@@ -14,7 +14,7 @@ class postfix::augeas {
ensure
=>
present
,
lens_content
=>
file
(
"
${module_path}
/files/lenses/postfix_virtual.aug"
),
test_content
=>
file
(
"
${module_path}
/files/lenses/test_postfix_virtual.aug"
),
stock_since
=>
'1.
0
.0'
,
stock_since
=>
'1.
7
.0'
,
}
augeas::lens
{
'postfix_canonical'
:
ensure
=>
present
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment