Skip to content

Commit f4e008e

Browse files
baurmattekohl
authored andcommitted
Add 'Managed by Puppet' template headers
Fixes GH-594 Fixes GH-601
1 parent 899bb08 commit f4e008e

File tree

13 files changed

+35
-5
lines changed

13 files changed

+35
-5
lines changed

templates/_header.erb

Lines changed: 0 additions & 2 deletions
This file was deleted.

templates/agent/systemd.puppet-run.service.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#
2+
# Managed by Puppet
3+
#
14
[Unit]
25
Description=Systemd Timer Service for Puppet Agent
36

templates/agent/systemd.puppet-run.timer.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#
2+
# Managed by Puppet
3+
#
14
[Unit]
25
Description=Systemd Timer for Puppet Agent
36

templates/auth.conf.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#
2+
# Managed by Puppet
3+
#
14
# This is the default auth.conf file, which implements the default rules
25
# used by the puppet master. (That is, the rules below will still apply
36
# even if this file is deleted.)

templates/server/autosign.conf.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
#
12
# Managed by Puppet
3+
#
24
<% scope.lookupvar("puppet::server::autosign_entries").each do |entry| -%>
35
<%= entry %>
46
<% end -%>

templates/server/environment.conf.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#
2+
# Managed by Puppet
3+
#
14
<% if @manifest -%>
25
manifest = <%= @manifest %>
36
<% end -%>

templates/server/post-receive.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<% @template_header = ''
2-
ERB.new(File.read(File.expand_path("../_header.erb",File.dirname(file))), nil, nil, "@template_header").result(binding) -%>
31
#!/usr/bin/env ruby
4-
<%= @template_header %>
2+
#
3+
# Managed by Puppet
4+
#
55

66
require 'fileutils'
77
require 'etc'

templates/server/puppetserver/conf.d/auth.conf.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#
2+
# Managed by Puppet
3+
#
14
authorization: {
25
version: 1
36
allow-header-cert-info: <%= @server_http || @allow_header_cert_info %>

templates/server/puppetserver/conf.d/metrics.conf.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#
2+
# Managed by Puppet
3+
#
14
# settings related to metrics
25
metrics: {
36
# a server id that will be used as part of the namespace for metrics produced

templates/server/puppetserver/conf.d/product.conf.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#
2+
# Managed by Puppet
3+
#
14
product: {
25
# automatic update checks and corresponding analytic data collection
36
check-for-updates: <%= @server_check_for_updates %>

0 commit comments

Comments
 (0)