Merge pull request #6 from jkroepke/comments

lvicainne · web-flow · commit 937b090a7e7b · 2017-06-07T23:01:26.000+02:00
Removed full path comments on configfile
diff --git a/templates/etc/KeyTable.erb b/templates/etc/KeyTable.erb
@@ -1,5 +1,4 @@
 # THIS FILE IS MANAGED BY PUPPET
-# <%= file %>
 
 <% @keys.each do |mykey| -%>
 <%= mykey['selector'] %>._domainkey.<%= mykey['domain'] %> <%= mykey['domain'] %>:<%= mykey['selector'] %>:<%= @configdir %>/keys/<%= mykey['domain'] %>/<%= mykey['selector'] %>
diff --git a/templates/etc/SigningTable.erb b/templates/etc/SigningTable.erb
@@ -1,5 +1,4 @@
 # THIS FILE IS MANAGED BY PUPPET
-# <%= file %>
 
 <% @keys.each do |mykey| -%>
 <% mykey['signingdomains'].each do |signingdomain| -%>
diff --git a/templates/etc/TrustedHosts.erb b/templates/etc/TrustedHosts.erb
@@ -1,5 +1,4 @@
 # THIS FILE IS MANAGED BY PUPPET
-# <%= file %>
 
 # To use this file, uncomment the #ExternalIgnoreList and/or the #InternalHosts
 # option in /etc/opendkim.conf then restart OpenDKIM. Additional hosts
diff --git a/templates/etc/opendkim.conf.erb b/templates/etc/opendkim.conf.erb
@@ -1,5 +1,4 @@
 # THIS FILE IS MANAGED BY PUPPET
-# <%= file %>
 
 # Specifies the path to the process ID file.
 PidFile <%= @pidfile %>
diff --git a/templates/sysconfig/opendkim.erb b/templates/sysconfig/opendkim.erb
@@ -1,5 +1,4 @@
 # THIS FILE IS MANAGED BY PUPPET
-# <%= file %>
 
 #ALL IS MANAGED BY init.d script and <%= @configfile %>
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`# THIS FILE IS MANAGED BY PUPPET`
`2`		`-# <%= file %>`
`3`	`2`
`4`	`3`	`<% @keys.each do \|mykey\| -%>`
`5`	`4`	`<%= mykey['selector'] %>._domainkey.<%= mykey['domain'] %> <%= mykey['domain'] %>:<%= mykey['selector'] %>:<%= @configdir %>/keys/<%= mykey['domain'] %>/<%= mykey['selector'] %>`