Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
puppetpublic
base
Commits
a4815584
Commit
a4815584
authored
10 years ago
by
Adam Lewenberg
Browse files
Options
Downloads
Patches
Plain Diff
add new ACL for auth.conf introduced in Puppet 3
parent
c3f2f417
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
NEWS
+2
-1
2 additions, 1 deletion
NEWS
manifests/puppetclient.pp
+1
-1
1 addition, 1 deletion
manifests/puppetclient.pp
templates/puppetclient/auth.conf.erb
+7
-0
7 additions, 0 deletions
templates/puppetclient/auth.conf.erb
with
10 additions
and
2 deletions
NEWS
+
2
−
1
View file @
a4815584
...
...
@@ -4,7 +4,8 @@ release/003.037 (unreleased)
definition. (darrenp1)
[puppetclient] Add puppetservice* servers to list of servers that can
download Puppet DB credentials.
download Puppet DB credentials. Add a new ACL to auth.conf that was
introduced in Puppet 3.
release/003.036 (2014-09-10)
...
...
This diff is collapsed.
Click to expand it.
manifests/puppetclient.pp
+
1
−
1
View file @
a4815584
...
...
@@ -113,7 +113,7 @@ class base::puppetclient {
# vulnerability that could unauthenticated Puppet nodes to manipulate
# its configuration.
file
{
'/etc/puppet/auth.conf'
:
source
=>
'puppet:///modules/
base/puppetclient/
etc/puppet/
auth.conf
'
,
content
=>
template
(
'
base/puppetclient/auth.conf
.erb'
)
,
}
# filter-syslog rules for the Puppet client.
...
...
This diff is collapsed.
Click to expand it.
fil
es/puppetclient/
etc/puppet/
auth.conf
→
templat
es/puppetclient/auth.conf
.erb
+
7
−
0
View file @
a4815584
...
...
@@ -48,6 +48,13 @@
### Authenticated ACL - those applies only when the client
### has a valid certificate and is thus authenticated
<%
if
(
puppetversion
.
gsub
(
/\./
,
''
).
to_i
>=
300
)
-%>
# allow nodes to retrieve their own node definition (new in Puppet 3)
path ~ ^/node/([^/]+)$
method find
allow $1
<%
end
-%>
# allow nodes to retrieve their own catalog (ie their configuration)
path ~ ^/catalog/([^/]+)$
method find
...
...
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