tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated all templates to use instance variables

Browse source
This commit is contained in:
Ossi Salmi 2013-05-05 00:07:55 +03:00
parent a0c854d3c0
commit dc51af1ca2
113 changed files with 527 additions and 522 deletions
Download patch file Download diff file Expand all files Collapse all files

14
puppet/templates/mongrel-httpd.conf.erb
View file

@ -22,8 +22,8 @@ Listen 8140
<VirtualHost _default_:8140>
# Use default log path for puppet
ErrorLog /srv/www/log/https/<%= homename %>/error_log
CustomLog /srv/www/log/https/<%= homename %>/access_log combined
ErrorLog /srv/www/log/https/<%= @homename %>/error_log
CustomLog /srv/www/log/https/<%= @homename %>/access_log combined
LogLevel warn
# SSL settings
@ -32,11 +32,11 @@ Listen 8140
SSLCipherSuite DHE-RSA-AES256-SHA
# Certificates and keys
SSLCertificateFile <%= puppet_ssldir %>/certs/<%= homename %>.pem
SSLCertificateKeyFile <%= puppet_ssldir %>/private_keys/<%= homename %>.pem
SSLCertificateChainFile <%= puppet_ssldir %>/certs/ca.pem
SSLCACertificateFile <%= puppet_ssldir %>/certs/ca.pem
SSLCARevocationFile <%= puppet_ssldir %>/ca/ca_crl.pem
SSLCertificateFile <%= @puppet_ssldir %>/certs/<%= @homename %>.pem
SSLCertificateKeyFile <%= @puppet_ssldir %>/private_keys/<%= @homename %>.pem
SSLCertificateChainFile <%= @puppet_ssldir %>/certs/ca.pem
SSLCACertificateFile <%= @puppet_ssldir %>/certs/ca.pem
SSLCARevocationFile <%= @puppet_ssldir %>/ca/ca_crl.pem
# Client authentication
SSLVerifyClient optional

14
puppet/templates/passenger-httpd.conf.erb
View file

@ -15,8 +15,8 @@ Listen 8140
<VirtualHost _default_:8140>
# Use default log path for puppet
ErrorLog /srv/www/log/https/<%= homename %>/error_log
CustomLog /srv/www/log/https/<%= homename %>/access_log combined
ErrorLog /srv/www/log/https/<%= @homename %>/error_log
CustomLog /srv/www/log/https/<%= @homename %>/access_log combined
LogLevel warn
# SSL settings
@ -25,11 +25,11 @@ Listen 8140
SSLCipherSuite DHE-RSA-AES256-SHA
# Certificates and keys
SSLCertificateFile <%= puppet_ssldir %>/certs/<%= homename %>.pem
SSLCertificateKeyFile <%= puppet_ssldir %>/private_keys/<%= homename %>.pem
SSLCertificateChainFile <%= puppet_ssldir %>/certs/ca.pem
SSLCACertificateFile <%= puppet_ssldir %>/certs/ca.pem
SSLCARevocationFile <%= puppet_ssldir %>/ca/ca_crl.pem
SSLCertificateFile <%= @puppet_ssldir %>/certs/<%= @homename %>.pem
SSLCertificateKeyFile <%= @puppet_ssldir %>/private_keys/<%= @homename %>.pem
SSLCertificateChainFile <%= @puppet_ssldir %>/certs/ca.pem
SSLCACertificateFile <%= @puppet_ssldir %>/certs/ca.pem
SSLCARevocationFile <%= @puppet_ssldir %>/ca/ca_crl.pem
# Client authentication
SSLVerifyClient optional

8
puppet/templates/puppet-passenger.conf.erb
View file

@ -1,10 +1,10 @@
server {
server_name puppet;
listen 8140 default ssl;
ssl_certificate <%= puppet_ssldir %>/certs/<%= homename %>.pem;
ssl_certificate_key <%= puppet_ssldir %>/private_keys/<%= homename %>.pem;
ssl_client_certificate <%= puppet_ssldir %>/certs/ca.pem;
ssl_crl <%= puppet_ssldir %>/ca/ca_crl.pem;
ssl_certificate <%= @puppet_ssldir %>/certs/<%= @homename %>.pem;
ssl_certificate_key <%= @puppet_ssldir %>/private_keys/<%= @homename %>.pem;
ssl_client_certificate <%= @puppet_ssldir %>/certs/ca.pem;
ssl_crl <%= @puppet_ssldir %>/ca/ca_crl.pem;
ssl_protocols SSLv3 TLSv1;
ssl_ciphers HIGH:+MEDIUM;
ssl_prefer_server_ciphers on;

2
puppet/templates/puppet-report-cleanup.erb
View file

@ -1,6 +1,6 @@
#!/bin/sh
MAXAGE=<%= puppet_report_maxage %>
MAXAGE=<%= @puppet_report_maxage %>
/usr/sbin/tmpwatch -m ${MAXAGE} /srv/puppet/reports
find /srv/puppet/reports/ -mindepth 2 -mmin +1440 -type f -name \*.yaml -exec gzip {} \;

18
puppet/templates/puppet.conf.erb
View file

@ -1,9 +1,9 @@
[main]
# Where Puppet stores dynamic and growing data.
# The default value is '/var/puppet'.
vardir = <%= vardir %>
vardir = <%= @vardir %>
<% if kernel == 'Linux' -%>
<% if @kernel == 'Linux' -%>
# The Puppet log directory.
# The default value is '$vardir/log'.
logdir = /var/log/puppet
@ -13,7 +13,7 @@
rundir = /var/run/puppet
<% end -%>
<% if kernel == 'OpenBSD' -%>
<% if @kernel == 'OpenBSD' -%>
# The shell search path. Defaults to whatever is inherited
# from the parent process.
path = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
@ -22,11 +22,11 @@
# The server to which server puppetd should connect
# The default value is 'puppet'. Explicitly set to support
# re-installs on remote networks.
server = <%= puppet_server %>
server = <%= @puppet_server %>
# The name to use when handling certificates. Set during
# bootstrap based on the fully qualified domain name.
certname = <%= homename %>
certname = <%= @homename %>
# Enable sending reports to puppet server.
report = true
@ -37,14 +37,14 @@
factpath = $vardir/lib/facter
# The bit length of keys.
keylength = <%= puppet_keylength %>
keylength = <%= @puppet_keylength %>
<% if has_variable?("puppet_diffargs") -%>
<% if @puppet_diffargs -%>
# Arguments for puppet's use of diff
diff_args = <%= puppet_diffargs %>
diff_args = <%= @puppet_diffargs %>
<% end -%>
<% if puppetversion[/\d+/].to_i >= 2 -%>
<% if @puppetversion[/\d+/].to_i >= 2 -%>
[agent]
# Ignore site manifest when run as agent. Fixes warnings about
# storeconfigs on master.

18
puppet/templates/puppetmaster.conf.erb
View file

@ -1,5 +1,5 @@
<% if puppetversion[/\d+/].to_i >= 2 -%>
<% if @puppetversion[/\d+/].to_i >= 2 -%>
[master]
<% else -%>
[puppetmasterd]
@ -19,19 +19,19 @@
# Put custom templates under datadirectory
templatedir = /srv/puppet/templates
<% if puppet_storeconfigs != 'none' -%>
<% if @puppet_storeconfigs != 'none' -%>
# Use storeconfigs
storeconfigs = true
<% if puppet_storeconfigs == 'thin' -%>
<% if @puppet_storeconfigs == 'thin' -%>
thin_storeconfigs = true
<% end -%>
dbadapter = <%= puppet_dbadapter %>
<% if puppet_dbadapter == 'sqlite3' -%>
dbadapter = <%= @puppet_dbadapter %>
<% if @puppet_dbadapter == 'sqlite3' -%>
dblocation = /srv/puppet/storeconfigs/storeconfigs.db
<% else -%>
dbserver = <%= puppet_dbserver %>
dbname = <%= puppet_dbname %>
dbuser = <%= puppet_dbuser %>
dbpassword = <%= puppet_dbpassword %>
dbserver = <%= @puppet_dbserver %>
dbname = <%= @puppet_dbname %>
dbuser = <%= @puppet_dbuser %>
dbpassword = <%= @puppet_dbpassword %>
<% end -%>
<% end -%>

6
puppet/templates/puppetmaster.default.erb
View file

@ -15,7 +15,7 @@ DAEMON_OPTS=""
# mongrel. Requires front-end web-proxy such as
# apache, nginx, or pound)
# See: http://reductivelabs.com/trac/puppet/wiki/UsingMongrel
<% if puppet_listenports.length > 1 -%>
<% if @puppet_listenports.length > 1 -%>
SERVERTYPE=mongrel
<% else -%>
SERVERTYPE=webrick
@ -23,7 +23,7 @@ SERVERTYPE=webrick
# How many puppetmaster instances to start? Its pointless to set this
# higher than 1 if you are not using mongrel.
PUPPETMASTERS=<%= puppet_listenports.length %>
PUPPETMASTERS=<%= @puppet_listenports.length %>
# What port should the puppetmaster listen on (default: 8140). If
# PUPPETMASTERS is set to a number greater than 1, then the port for
@ -37,4 +37,4 @@ PUPPETMASTERS=<%= puppet_listenports.length %>
# processes. In this case it is recommended to run your web-proxy on
# port 8140 and change the below number to something else, such as
# 18140.
PORT=<%= puppet_listenports.first %>
PORT=<%= @puppet_listenports.first %>

2
puppet/templates/puppetmaster.sysconfig.erb
View file

@ -25,7 +25,7 @@
#PUPPETMASTER_PORTS="8141"
# Example with multiple ports which will start puppetmaster with mongrel
# as a servertype
PUPPETMASTER_PORTS=( <% puppet_listenports.each do |port| -%><%= port -%> <% end %>)
PUPPETMASTER_PORTS=( <% @puppet_listenports.each do |port| -%><%= port -%> <% end %>)
# You may specify other parameters to the puppetmaster here
#PUPPETMASTER_EXTRA_OPTS=--noca