Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

@node is deprecated, use node, chef commit f904589

  • Loading branch information...
commit 1193f67beff7b61c0474df4582b87119bb5c2294 1 parent 6cd72a1
@jtimberman jtimberman authored
Showing with 485 additions and 485 deletions.
  1. +1 −1  activemq/templates/default/sv-activemq-run.erb
  2. +1 −1  apache2/templates/default/a2dismod.erb
  3. +2 −2 apache2/templates/default/a2dissite.erb
  4. +1 −1  apache2/templates/default/a2enmod.erb
  5. +1 −1  apache2/templates/default/a2ensite.erb
  6. +28 −28 apache2/templates/default/apache2.conf.erb
  7. +4 −4 apache2/templates/default/default-site.erb
  8. +1 −1  apache2/templates/default/mod_auth_openid.rb.erb
  9. +2 −2 apache2/templates/default/mods/alias.conf.erb
  10. +1 −1  apache2/templates/default/mods/fcgid.conf.erb
  11. +2 −2 apache2/templates/default/mods/ssl.conf.erb
  12. +3 −3 apache2/templates/default/security.erb
  13. +3 −3 apache2/templates/default/web_app.conf.erb
  14. +3 −3 application/templates/default/myproj.conf.erb
  15. +3 −3 application/templates/default/rails_nginx_passenger.conf.erb
  16. +1 −1  application/templates/default/sv-unicorn-run.erb
  17. +6 −6 bootstrap/templates/default/client.rb.erb
  18. +13 −13 bootstrap/templates/default/server.rb.erb
  19. +2 −2 bootstrap/templates/default/sv-chef-client-run.erb
  20. +2 −2 bootstrap/templates/default/sv-chef-server-run.erb
  21. +2 −2 bootstrap/templates/default/sv-chef-server-webui-run.erb
  22. +1 −1  bootstrap/templates/default/sv-chef-solr-indexer-run.erb
  23. +1 −1  bootstrap/templates/default/sv-chef-solr-run.erb
  24. +13 −13 chef/templates/default/chef_server.conf.erb
  25. +6 −6 chef/templates/default/client.rb.erb
  26. +14 −14 chef/templates/default/server.rb.erb
  27. +2 −2 chef/templates/default/sv-chef-client-run.erb
  28. +2 −2 chef/templates/default/sv-chef-server-run.erb
  29. +2 −2 chef/templates/default/sv-chef-server-webui-run.erb
  30. +1 −1  chef/templates/default/sv-chef-solr-indexer-run.erb
  31. +1 −1  chef/templates/default/sv-chef-solr-run.erb
  32. +3 −3 database/templates/default/app_grants.sql.erb
  33. +1 −1  djbdns/templates/default/sv-axfrdns-run.erb
  34. +1 −1  djbdns/templates/default/sv-public-dnscache-run.erb
  35. +1 −1  djbdns/templates/default/sv-tinydns-internal-run.erb
  36. +1 −1  djbdns/templates/default/sv-tinydns-run.erb
  37. +2 −2 djbdns/templates/default/tinydns-data.erb
  38. +2 −2 djbdns/templates/default/tinydns-internal-data.erb
  39. +6 −6 dynomite/templates/default/sv-dynomite-run.erb
  40. +3 −3 gems/templates/default/gem_server.conf.erb
  41. +27 −27 glassfish/templates/default/answer_file.erb
  42. +2 −2 glassfish/templates/default/glassfish-init.d-script.erb
  43. +4 −4 god/templates/default/master.god.erb
  44. +2 −2 hadoop/templates/default/cloudera.list.erb
  45. +2 −2 instiki/templates/default/instiki.conf.erb
  46. +9 −9 jira/templates/default/apache.conf.erb
  47. +1 −1  jira/templates/default/entityengine.xml.erb
  48. +3 −3 jira/templates/default/server.xml.erb
  49. +2 −2 jira/templates/default/sv-jira-run.erb
  50. +1 −1  keepalived/templates/default/keepalived.conf.erb
  51. +2 −2 kickstart/templates/default/kickstart.conf.erb
  52. +2 −2 kickstart/templates/default/ks.cfg.erb
  53. +3 −3 maradns/templates/default/mararc.erb
  54. +4 −4 munin/templates/default/apache2.conf.erb
  55. +2 −2 munin/templates/default/munin-node.conf.erb
  56. +2 −2 mysql/templates/default/debian.cnf.erb
  57. +5 −5 mysql/templates/default/grants.sql.erb
  58. +12 −12 mysql/templates/default/my.cnf.erb
  59. +2 −2 mysql/templates/default/mysql-server.seed.erb
  60. +12 −12 mysql/templates/ubuntu-10.04/my.cnf.erb
  61. +12 −12 mysql/templates/ubuntu-8.04/my.cnf.erb
  62. +12 −12 mysql/templates/ubuntu-9.10/my.cnf.erb
  63. +4 −4 nagios/libraries/default.rb
  64. +5 −5 nagios/templates/default/apache2.conf.erb
  65. +3 −3 nagios/templates/default/cgi.cfg.erb
  66. +1 −1  nagios/templates/default/commands.cfg.erb
  67. +1 −1  nagios/templates/default/hosts.cfg.erb
  68. +16 −16 nagios/templates/default/nagios.cfg.erb
  69. +8 −8 nagios/templates/default/nrpe.cfg.erb
  70. +2 −2 nginx/templates/default/default-site.erb
  71. +18 −18 nginx/templates/default/nginx.conf.erb
  72. +1 −1  nginx/templates/default/nxdissite.erb
  73. +1 −1  nginx/templates/default/nxensite.erb
  74. +1 −1  nginx/templates/default/sv-nginx-run.erb
  75. +2 −2 ntp/templates/default/ntp.conf.erb
  76. +2 −2 openldap/templates/default/ldap-ldap.conf.erb
  77. +7 −7 openldap/templates/default/ldap.conf.erb
  78. +6 −6 openldap/templates/default/libnss-ldap.conf.erb
  79. +4 −4 openldap/templates/default/login_access.conf.erb
  80. +25 −25 openldap/templates/default/slapd.conf.erb
  81. +1 −1  packages/libraries/packages.rb
  82. +2 −2 passenger_apache2/templates/default/passenger.conf.erb
  83. +1 −1  passenger_apache2/templates/default/passenger.load.erb
  84. +4 −4 passenger_apache2/templates/default/passenger_web_app.conf.erb
  85. +4 −4 passenger_apache2/templates/default/web_app.conf.erb
  86. +2 −2 passenger_enterprise/templates/default/passenger.conf.erb
  87. +1 −1  passenger_enterprise/templates/default/passenger.load.erb
  88. +2 −2 passenger_enterprise/templates/default/passenger_nginx.conf.erb
  89. +6 −6 php/templates/default/php.conf.erb
  90. +16 −16 postfix/templates/default/main.cf.erb
  91. +1 −1  postfix/templates/default/sasl_passwd.erb
  92. +1 −1  rabbitmq/templates/default/doterlang.cookie.erb
  93. +9 −9 rabbitmq/templates/default/rabbitmq.config.erb
  94. +2 −2 rabbitmq/templates/default/rabbitmq_cluster.config.erb
  95. +1 −1  radiant/libraries/radiant.rb
  96. +3 −3 radiant/templates/default/radiant.conf.erb
  97. +4 −4 rails/templates/default/rails_app.conf.erb
  98. +3 −3 redmine/templates/default/database.yml.erb
  99. +2 −2 redmine/templates/default/redmine.conf.erb
  100. +1 −1  redmine/templates/default/sv-redmine-run.erb
  101. +7 −7 reprepro/recipes/default.rb
  102. +3 −3 reprepro/templates/default/apt_repo.conf.erb
  103. +3 −3 reprepro/templates/default/distributions.erb
  104. +2 −2 resolver/templates/default/resolv.conf.erb
  105. +6 −6 riak/templates/default/iptables.erb
  106. +1 −1  solr/templates/default/sv-solr-run.erb
  107. +1 −1  ssh_known_hosts/templates/default/known_hosts.erb
  108. +1 −1  stompserver/templates/default/sv-stompserver-run.erb
  109. +1 −1  sudo/templates/default/sudoers.erb
  110. +2 −2 teamspeak/templates/default/server.ini.erb
  111. +1 −1  tomcat6/libraries/tomcat_manager.rb
  112. +1 −1  tomcat6/recipes/default.rb
  113. +1 −1  tomcat6/templates/default/manager.xml.erb
  114. +1 −1  tomcat6/templates/default/tomcat-users.xml.erb
  115. +7 −7 tomcat6/templates/default/tomcat6.conf.erb
  116. +2 −2 wordpress/recipes/default.rb
  117. +1 −1  wordpress/templates/default/grants.sql.erb
  118. +3 −3 wordpress/templates/default/wordpress.conf.erb
View
2  activemq/templates/default/sv-activemq-run.erb
@@ -1,3 +1,3 @@
#!/bin/sh
exec 2>&1
-exec /opt/apache-activemq-<%= @node[:activemq][:version] %>/bin/activemq
+exec /opt/apache-activemq-<%= node[:activemq][:version] %>/bin/activemq
View
2  apache2/templates/default/a2dismod.erb
@@ -1,6 +1,6 @@
#!/bin/sh -e
-SYSCONFDIR='<%= @node[:apache][:dir] %>'
+SYSCONFDIR='<%= node[:apache][:dir] %>'
if [ -z $1 ]; then
echo "Which module would you like to disable?"
View
4 apache2/templates/default/a2dissite.erb
@@ -1,11 +1,11 @@
#!/bin/sh -e
-SYSCONFDIR='<%= @node[:apache][:dir] %>'
+SYSCONFDIR='<%= node[:apache][:dir] %>'
if [ -z $1 ]; then
echo "Which site would you like to disable?"
echo -n "Your choices are: "
- ls $@node[:apache][:dir]/sites-enabled/* | \
+ ls $node[:apache][:dir]/sites-enabled/* | \
sed -e "s,$SYSCONFDIR/sites-enabled/,,g" | xargs echo
echo -n "Site name? "
read SITENAME
View
2  apache2/templates/default/a2enmod.erb
@@ -1,6 +1,6 @@
#!/bin/sh -e
-SYSCONFDIR='<%= @node[:apache][:dir] %>'
+SYSCONFDIR='<%= node[:apache][:dir] %>'
if [ -z $1 ]; then
echo "Which module would you like to enable?"
View
2  apache2/templates/default/a2ensite.erb
@@ -1,6 +1,6 @@
#!/bin/sh -e
-SYSCONFDIR='<%= @node[:apache][:dir] %>'
+SYSCONFDIR='<%= node[:apache][:dir] %>'
if [ -z $1 ]; then
echo "Which site would you like to enable?"
View
56 apache2/templates/default/apache2.conf.erb
@@ -3,12 +3,12 @@
#
# Based on the Ubuntu apache2.conf
-ServerRoot "<%= @node[:apache][:dir] %>"
+ServerRoot "<%= node[:apache][:dir] %>"
#
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
#
-<% if @node[:platform] == "debian" || @node[:platform] == "ubuntu" -%>
+<% if node[:platform] == "debian" || node[:platform] == "ubuntu" -%>
LockFile /var/lock/apache2/accept.lock
<% else %>
LockFile logs/accept.lock
@@ -18,9 +18,9 @@ LockFile logs/accept.lock
# PidFile: The file in which the server should record its process
# identification number when it starts.
#
-<% if @node[:platform] == "debian" || @node[:platform] == "ubuntu" -%>
+<% if node[:platform] == "debian" || node[:platform] == "ubuntu" -%>
PidFile /var/run/apache2.pid
-<% elsif @node[:platform] == "centos" || @node[:platform] == "redhat" || @node[:platform] == "fedora" -%>
+<% elsif node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%>
PidFile /var/run/httpd.pid
<% else -%>
PidFile logs/httpd.pid
@@ -29,26 +29,26 @@ PidFile logs/httpd.pid
#
# Timeout: The number of seconds before receives and sends time out.
#
-Timeout <%= @node[:apache][:timeout] %>
+Timeout <%= node[:apache][:timeout] %>
#
# KeepAlive: Whether or not to allow persistent connections (more than
# one request per connection). Set to "Off" to deactivate.
#
-KeepAlive <%= @node[:apache][:keepalive] %>
+KeepAlive <%= node[:apache][:keepalive] %>
#
# MaxKeepAliveRequests: The maximum number of requests to allow
# during a persistent connection. Set to 0 to allow an unlimited amount.
# We recommend you leave this number high, for maximum performance.
#
-MaxKeepAliveRequests <%= @node[:apache][:keepaliverequests] %>
+MaxKeepAliveRequests <%= node[:apache][:keepaliverequests] %>
#
# KeepAliveTimeout: Number of seconds to wait for the next request from the
# same client on the same connection.
#
-KeepAliveTimeout <%= @node[:apache][:keepalivetimeout] %>
+KeepAliveTimeout <%= node[:apache][:keepalivetimeout] %>
##
## Server-Pool Size Regulation (MPM specific)
@@ -61,12 +61,12 @@ KeepAliveTimeout <%= @node[:apache][:keepalivetimeout] %>
# MaxClients: maximum number of server processes allowed to start
# MaxRequestsPerChild: maximum number of requests a server process serves
<IfModule mpm_prefork_module>
- StartServers <%= @node[:apache][:prefork][:startservers] %>
- MinSpareServers <%= @node[:apache][:prefork][:minspareservers] %>
- MaxSpareServers <%= @node[:apache][:prefork][:maxspareservers] %>
- ServerLimit <%= @node[:apache][:prefork][:serverlimit] %>
- MaxClients <%= @node[:apache][:prefork][:maxclients] %>
- MaxRequestsPerChild <%= @node[:apache][:prefork][:maxrequestsperchild] %>
+ StartServers <%= node[:apache][:prefork][:startservers] %>
+ MinSpareServers <%= node[:apache][:prefork][:minspareservers] %>
+ MaxSpareServers <%= node[:apache][:prefork][:maxspareservers] %>
+ ServerLimit <%= node[:apache][:prefork][:serverlimit] %>
+ MaxClients <%= node[:apache][:prefork][:maxclients] %>
+ MaxRequestsPerChild <%= node[:apache][:prefork][:maxrequestsperchild] %>
</IfModule>
# worker MPM
@@ -77,16 +77,16 @@ KeepAliveTimeout <%= @node[:apache][:keepalivetimeout] %>
# ThreadsPerChild: constant number of worker threads in each server process
# MaxRequestsPerChild: maximum number of requests a server process serves
<IfModule mpm_worker_module>
- StartServers <%= @node[:apache][:worker][:startservers] %>
- MaxClients <%= @node[:apache][:worker][:maxclients] %>
- MinSpareThreads <%= @node[:apache][:worker][:minsparethreads] %>
- MaxSpareThreads <%= @node[:apache][:worker][:maxsparethreads] %>
- ThreadsPerChild <%= @node[:apache][:worker][:threadsperchild] %>
- MaxRequestsPerChild <%= @node[:apache][:worker][:maxrequestsperchild] %>
+ StartServers <%= node[:apache][:worker][:startservers] %>
+ MaxClients <%= node[:apache][:worker][:maxclients] %>
+ MinSpareThreads <%= node[:apache][:worker][:minsparethreads] %>
+ MaxSpareThreads <%= node[:apache][:worker][:maxsparethreads] %>
+ ThreadsPerChild <%= node[:apache][:worker][:threadsperchild] %>
+ MaxRequestsPerChild <%= node[:apache][:worker][:maxrequestsperchild] %>
</IfModule>
-User <%= @node[:apache][:user] %>
-Group <%= @node[:apache][:user] %>
+User <%= node[:apache][:user] %>
+Group <%= node[:apache][:user] %>
#
# AccessFileName: The name of the file to look for in each directory
@@ -133,7 +133,7 @@ HostnameLookups Off
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
-ErrorLog <%= @node[:apache][:log_dir] %>/error.log
+ErrorLog <%= node[:apache][:log_dir] %>/error.log
#
# LogLevel: Control the number of messages logged to the error_log.
@@ -143,11 +143,11 @@ ErrorLog <%= @node[:apache][:log_dir] %>/error.log
LogLevel warn
# Include module configuration:
-Include <%= @node[:apache][:dir] %>/mods-enabled/*.load
-Include <%= @node[:apache][:dir] %>/mods-enabled/*.conf
+Include <%= node[:apache][:dir] %>/mods-enabled/*.load
+Include <%= node[:apache][:dir] %>/mods-enabled/*.conf
# Include ports listing
-Include <%= @node[:apache][:dir] %>/ports.conf
+Include <%= node[:apache][:dir] %>/ports.conf
#
# The following directives define some format nicknames for use with
@@ -224,7 +224,7 @@ LogFormat "%{User-agent}i" agent
# Include generic snippets of statements
-Include <%= @node[:apache][:dir] %>/conf.d/
+Include <%= node[:apache][:dir] %>/conf.d/
# Include the virtual host configurations:
-Include <%= @node[:apache][:dir] %>/sites-enabled/
+Include <%= node[:apache][:dir] %>/sites-enabled/
View
8 apache2/templates/default/default-site.erb
@@ -1,5 +1,5 @@
<VirtualHost *:80>
- ServerAdmin <%= @node[:apache][:contact] %>
+ ServerAdmin <%= node[:apache][:contact] %>
DocumentRoot /var/www/
<Directory />
@@ -24,13 +24,13 @@
Allow from all
</Directory>
- ErrorLog <%= @node[:apache][:log_dir] %>/error.log
+ ErrorLog <%= node[:apache][:log_dir] %>/error.log
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
LogLevel warn
- CustomLog <%= @node[:apache][:log_dir] %>/access.log combined
+ CustomLog <%= node[:apache][:log_dir] %>/access.log combined
ServerSignature On
Alias /doc/ "/usr/share/doc/"
@@ -42,7 +42,7 @@
Allow from 127.0.0.0/255.0.0.0 ::1/128
</Directory>
- <% if @node[:platform] == "centos" || @node[:platform] == "redhat" || @node[:platform] == "fedora" -%>
+ <% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%>
#
# This configuration file enables the default "Welcome"
# page if there is no default index page present for
View
2  apache2/templates/default/mod_auth_openid.rb.erb
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
allowed_openids = Array.new
-<% @node[:apache][:allowed_openids].each do |id| -%>
+<% node[:apache][:allowed_openids].each do |id| -%>
allowed_openids << "<%= id %>"
<% end -%>
View
4 apache2/templates/default/mods/alias.conf.erb
@@ -12,9 +12,9 @@
# We include the /icons/ alias for FancyIndexed directory listings. If
# you do not use FancyIndexing, you may comment this out.
#
-Alias /icons/ "<%= @node[:apache][:icondir] %>"
+Alias /icons/ "<%= node[:apache][:icondir] %>"
-<Directory "<%= @node[:apache][:icondir] %>">
+<Directory "<%= node[:apache][:icondir] %>">
Options Indexes MultiViews
AllowOverride None
Order allow,deny
View
2  apache2/templates/default/mods/fcgid.conf.erb
@@ -3,7 +3,7 @@
IPCConnectTimeout 20
</IfModule>
-<% if @node[:platform] == "centos" || @node[:platform] == "redhat" || @node[:platform] == "fedora" -%>
+<% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%>
# Sane place to put sockets and shared memory file
SocketPath run/mod_fcgid
SharememPath run/mod_fcgid/fcgid_shm
View
4 apache2/templates/default/mods/ssl.conf.erb
@@ -39,7 +39,7 @@ SSLPassPhraseDialog builtin
# Configure the SSL Session Cache: First the mechanism
# to use and second the expiring timeout (in seconds).
#SSLSessionCache dbm:/var/run/apache2/ssl_scache
-<% if @node[:platform] == "centos" || @node[:platform] == "redhat" || @node[:platform] == "fedora" -%>
+<% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%>
SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000)
<% else -%>
SSLSessionCache shmcb:/var/run/apache2/ssl_scache
@@ -49,7 +49,7 @@ SSLSessionCacheTimeout 300
# Semaphore:
# Configure the path to the mutual exclusion semaphore the
# SSL engine uses internally for inter-process synchronization.
-<% if @node[:platform] == "centos" || @node[:platform] == "redhat" || @node[:platform] == "fedora" -%>
+<% if node[:platform] == "centos" || node[:platform] == "redhat" || node[:platform] == "fedora" -%>
SSLMutex default
<% else -%>
SSLMutex file:/var/run/apache2/ssl_mutex
View
6 apache2/templates/default/security.erb
@@ -24,7 +24,7 @@
# where Full conveys the most information, and Prod the least.
#
#ServerTokens Minimal
-ServerTokens <%= @node[:apache][:servertokens] %>
+ServerTokens <%= node[:apache][:servertokens] %>
#
# Optionally add a line containing the server version and virtual host
@@ -35,7 +35,7 @@ ServerTokens <%= @node[:apache][:servertokens] %>
# Set to one of: On | Off | EMail
#
#ServerSignature Off
-ServerSignature <%= @node[:apache][:serversignature] %>
+ServerSignature <%= node[:apache][:serversignature] %>
#
# Allow TRACE method
@@ -46,5 +46,5 @@ ServerSignature <%= @node[:apache][:serversignature] %>
# Set to one of: On | Off | extended
#
#TraceEnable Off
-TraceEnable <%= @node[:apache][:traceenable] %>
+TraceEnable <%= node[:apache][:traceenable] %>
View
6 apache2/templates/default/web_app.conf.erb
@@ -25,11 +25,11 @@
</Location>
LogLevel info
- ErrorLog <%= @node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log
- CustomLog <%= @node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined
+ ErrorLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log
+ CustomLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined
RewriteEngine On
- RewriteLog <%= @node[:apache][:log_dir] %>/<%= @application_name %>-rewrite.log
+ RewriteLog <%= node[:apache][:log_dir] %>/<%= @application_name %>-rewrite.log
RewriteLogLevel 0
# Canonical host, <%= @params[:server_name] %>
View
6 application/templates/default/myproj.conf.erb
@@ -1,13 +1,13 @@
# nginx + passenger application vhost
#
-# Generated by Chef for <%= @node[:fqdn] %>
+# Generated by Chef for <%= node[:fqdn] %>
# Local modifications will be overwritten.
#
server {
listen 80;
server_name <%= @server_name %><% @server_aliases.each do |a| %><%= " #{a}" %> <% end %>;
root <%= @docroot %>;
- error_log <%= @node[:nginx][:log_dir] %>/<%= @app %>-error.log;
- access_log <%= @node[:nginx][:log_dir] %>/<%= @app %>-access.log;
+ error_log <%= node[:nginx][:log_dir] %>/<%= @app %>-error.log;
+ access_log <%= node[:nginx][:log_dir] %>/<%= @app %>-access.log;
passenger_enabled on;
}
View
6 application/templates/default/rails_nginx_passenger.conf.erb
@@ -1,13 +1,13 @@
# nginx + passenger application vhost
#
-# Generated by Chef for <%= @node[:fqdn] %>
+# Generated by Chef for <%= node[:fqdn] %>
# Local modifications will be overwritten.
#
server {
listen 80;
server_name <%= @server_name %><% @server_aliases.each do |a| %><%= " #{a}" %> <% end %>;
root <%= @docroot %>;
- error_log <%= @node[:nginx][:log_dir] %>/<%= @app %>-error.log;
- access_log <%= @node[:nginx][:log_dir] %>/<%= @app %>-access.log;
+ error_log <%= node[:nginx][:log_dir] %>/<%= @app %>-error.log;
+ access_log <%= node[:nginx][:log_dir] %>/<%= @app %>-access.log;
passenger_enabled on;
}
View
2  application/templates/default/sv-unicorn-run.erb
@@ -3,5 +3,5 @@
cd <%= @options[:app]['deploy_to'] %>/current
exec 2>&1
-exec chpst -u <%= @options[:app]["owner"] %>:<%= @options[:app]["group"] %> unicorn_rails -E <%= @node[:app_environment] %> -c /etc/unicorn/<%= @options[:app]['id'] %>.rb
+exec chpst -u <%= @options[:app]["owner"] %>:<%= @options[:app]["group"] %> unicorn_rails -E <%= node[:app_environment] %> -c /etc/unicorn/<%= @options[:app]['id'] %>.rb
View
12 bootstrap/templates/default/client.rb.erb
@@ -7,18 +7,18 @@
log_level :info
log_location <%= @client_log %>
ssl_verify_mode :verify_none
-<% case @node[:bootstrap][:chef][:url_type] -%>
+<% case node[:bootstrap][:chef][:url_type] -%>
<% when "http" -%>
-chef_server_url "http://<%= @node[:bootstrap][:chef][:server_fqdn] %>:<%= @node[:bootstrap][:chef][:server_port] %>"
+chef_server_url "http://<%= node[:bootstrap][:chef][:server_fqdn] %>:<%= node[:bootstrap][:chef][:server_port] %>"
<% when "https" -%>
-chef_server_url "https://<%= @node[:bootstrap][:chef][:server_fqdn] %>"
+chef_server_url "https://<%= node[:bootstrap][:chef][:server_fqdn] %>"
<% end -%>
-validation_client_name "<%= @node[:bootstrap][:chef][:validation_client_name] %>"
+validation_client_name "<%= node[:bootstrap][:chef][:validation_client_name] %>"
validation_key "/etc/chef/validation.pem"
client_key "/etc/chef/client.pem"
-file_cache_path "<%= @node[:bootstrap][:chef][:cache_path] %>"
-pid_file "<%= @node[:bootstrap][:chef][:run_path] %>/chef-client.pid"
+file_cache_path "<%= node[:bootstrap][:chef][:cache_path] %>"
+pid_file "<%= node[:bootstrap][:chef][:run_path] %>/chef-client.pid"
Mixlib::Log::Formatter.show_time = <%= @show_time %>
View
26 bootstrap/templates/default/server.rb.erb
@@ -6,19 +6,19 @@
log_level :info
log_location <%= @server_log %>
ssl_verify_mode :verify_none
-chef_server_url "http://<%= @node[:bootstrap][:chef][:server_fqdn] %>:<%= @node[:bootstrap][:chef][:server_port] %>"
+chef_server_url "http://<%= node[:bootstrap][:chef][:server_fqdn] %>:<%= node[:bootstrap][:chef][:server_port] %>"
-signing_ca_path "<%= @node[:bootstrap][:chef][:path] %>/ca"
+signing_ca_path "<%= node[:bootstrap][:chef][:path] %>/ca"
couchdb_database 'chef'
-cookbook_path [ "<%= @node[:bootstrap][:chef][:serve_path] %>/cookbooks", "<%= @node[:bootstrap][:chef][:serve_path] %>/site-cookbooks" ]
+cookbook_path [ "<%= node[:bootstrap][:chef][:serve_path] %>/cookbooks", "<%= node[:bootstrap][:chef][:serve_path] %>/site-cookbooks" ]
-file_cache_path "<%= @node[:bootstrap][:chef][:cache_path] %>"
-node_path "<%= @node[:bootstrap][:chef][:serve_path] %>/nodes"
-openid_store_path "<%= @node[:bootstrap][:chef][:path] %>/openid/store"
-openid_cstore_path "<%= @node[:bootstrap][:chef][:path] %>/openid/cstore"
-search_index_path "<%= @node[:bootstrap][:chef][:path] %>/search_index"
-role_path "<%= @node[:bootstrap][:chef][:serve_path] %>/roles"
+file_cache_path "<%= node[:bootstrap][:chef][:cache_path] %>"
+node_path "<%= node[:bootstrap][:chef][:serve_path] %>/nodes"
+openid_store_path "<%= node[:bootstrap][:chef][:path] %>/openid/store"
+openid_cstore_path "<%= node[:bootstrap][:chef][:path] %>/openid/cstore"
+search_index_path "<%= node[:bootstrap][:chef][:path] %>/search_index"
+role_path "<%= node[:bootstrap][:chef][:serve_path] %>/roles"
validation_client_name "chef-validator"
validation_key "/etc/chef/validation.pem"
@@ -26,17 +26,17 @@ client_key "/etc/chef/client.pem"
web_ui_client_name "chef-webui"
web_ui_key "/etc/chef/webui.pem"
-<% if @node[:bootstrap][:chef][:webui_enabled] -%>
+<% if node[:bootstrap][:chef][:webui_enabled] -%>
web_ui_admin_user_name "admin"
-web_ui_admin_default_password "<%= @node[:bootstrap][:chef][:webui_admin_password] %>"
+web_ui_admin_default_password "<%= node[:bootstrap][:chef][:webui_admin_password] %>"
<% end -%>
-supportdir = "<%= @node[:bootstrap][:chef][:path] %>/support"
+supportdir = "<%= node[:bootstrap][:chef][:path] %>/support"
solr_jetty_path File.join(supportdir, "solr", "jetty")
solr_data_path File.join(supportdir, "solr", "data")
solr_home_path File.join(supportdir, "solr", "home")
solr_heap_size "256M"
-umask <%= @node[:bootstrap][:chef][:umask] %>
+umask <%= node[:bootstrap][:chef][:umask] %>
Mixlib::Log::Formatter.show_time = <%= @show_time %>
View
4 bootstrap/templates/default/sv-chef-client-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if @node[:languages][:ruby][:gems_dir] %>:<%= @node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node[:languages][:ruby][:gems_dir] %>:<%= node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
exec 2>&1
-exec /usr/bin/env chef-client -i <%= @node[:bootstrap][:chef][:client_interval] %> -s <%= @node[:bootstrap][:chef][:client_splay] %> <% if @node[:bootstrap][:chef][:client_log] != "STDOUT" then -%>-L <%= @node[:bootstrap][:chef][:client_log] %><% end -%>
+exec /usr/bin/env chef-client -i <%= node[:bootstrap][:chef][:client_interval] %> -s <%= node[:bootstrap][:chef][:client_splay] %> <% if node[:bootstrap][:chef][:client_log] != "STDOUT" then -%>-L <%= node[:bootstrap][:chef][:client_log] %><% end -%>
View
4 bootstrap/templates/default/sv-chef-server-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if @node[:languages][:ruby][:gems_dir] %>:<%= @node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node[:languages][:ruby][:gems_dir] %>:<%= node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
exec 2>&1
-exec /usr/bin/env chef-server -N -p <%= @node[:bootstrap][:chef][:server_port] %> -e production -P <%= @node[:bootstrap][:chef][:run_path] %>/server.%s.pid
+exec /usr/bin/env chef-server -N -p <%= node[:bootstrap][:chef][:server_port] %> -e production -P <%= node[:bootstrap][:chef][:run_path] %>/server.%s.pid
View
4 bootstrap/templates/default/sv-chef-server-webui-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if @node[:languages][:ruby][:gems_dir] %>:<%= @node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node[:languages][:ruby][:gems_dir] %>:<%= node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
exec 2>&1
-exec /usr/bin/env chef-server-webui -N -p <%= @node[:bootstrap][:chef][:webui_port] %> -e production -P <%= @node[:bootstrap][:chef][:run_path] %>/server-webui.%s.pid
+exec /usr/bin/env chef-server-webui -N -p <%= node[:bootstrap][:chef][:webui_port] %> -e production -P <%= node[:bootstrap][:chef][:run_path] %>/server-webui.%s.pid
View
2  bootstrap/templates/default/sv-chef-solr-indexer-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if @node[:languages][:ruby][:gems_dir] %>:<%= @node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node[:languages][:ruby][:gems_dir] %>:<%= node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
exec 2>&1
exec /usr/bin/env chef-solr-indexer
View
2  bootstrap/templates/default/sv-chef-solr-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if @node[:languages][:ruby][:gems_dir] %>:<%= @node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node[:languages][:ruby][:gems_dir] %>:<%= node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
exec 2>&1
exec /usr/bin/env chef-solr
View
26 chef/templates/default/chef_server.conf.erb
@@ -3,16 +3,16 @@
ServerName <%= @params[:server_name] %>
ServerAlias <% @params[:server_aliases].each do |a| %><%= "#{a}" %> <% end %>
- DocumentRoot <%= @node[:chef][:doc_root] %>
+ DocumentRoot <%= node[:chef][:doc_root] %>
ExpiresActive On
- ExpiresByType text/css "access plus <%= @node[:chef][:server_proxy][:css_expire_hours] %> hours"
- ExpiresByType text/javascript "access plus <%= @node[:chef][:server_proxy][:js_expire_hours] %> hours"
- ExpiresByType application/x-javascript "access plus <%= @node[:chef][:server_proxy][:js_expire_hours] %> hours"
- ExpiresByType application/javascript "access plus <%= @node[:chef][:server_proxy][:js_expire_hours] %> hours"
+ ExpiresByType text/css "access plus <%= node[:chef][:server_proxy][:css_expire_hours] %> hours"
+ ExpiresByType text/javascript "access plus <%= node[:chef][:server_proxy][:js_expire_hours] %> hours"
+ ExpiresByType application/x-javascript "access plus <%= node[:chef][:server_proxy][:js_expire_hours] %> hours"
+ ExpiresByType application/javascript "access plus <%= node[:chef][:server_proxy][:js_expire_hours] %> hours"
<Proxy balancer://chef_server>
- BalancerMember http://127.0.0.1:<%= @node[:chef][:server_port] %>
+ BalancerMember http://127.0.0.1:<%= node[:chef][:server_port] %>
Order deny,allow
Allow from all
</Proxy>
@@ -31,22 +31,22 @@
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
RewriteRule ^/(.*)$ balancer://chef_server%{REQUEST_URI} [P,QSA,L]
</VirtualHost>
-<% if @node[:chef][:webui_enabled] -%>
+<% if node[:chef][:webui_enabled] -%>
# Server Proxy for WebUI
<VirtualHost *:444>
ServerName <%= @params[:server_name] %>
ServerAlias <% @params[:server_aliases].each do |a| %><%= "#{a}" %> <% end %>
- DocumentRoot <%= @node[:chef][:doc_root] %>
+ DocumentRoot <%= node[:chef][:doc_root] %>
ExpiresActive On
- ExpiresByType text/css "access plus <%= @node[:chef][:server_proxy][:css_expire_hours] %> hours"
- ExpiresByType text/javascript "access plus <%= @node[:chef][:server_proxy][:js_expire_hours] %> hours"
- ExpiresByType application/x-javascript "access plus <%= @node[:chef][:server_proxy][:js_expire_hours] %> hours"
- ExpiresByType application/javascript "access plus <%= @node[:chef][:server_proxy][:js_expire_hours] %> hours"
+ ExpiresByType text/css "access plus <%= node[:chef][:server_proxy][:css_expire_hours] %> hours"
+ ExpiresByType text/javascript "access plus <%= node[:chef][:server_proxy][:js_expire_hours] %> hours"
+ ExpiresByType application/x-javascript "access plus <%= node[:chef][:server_proxy][:js_expire_hours] %> hours"
+ ExpiresByType application/javascript "access plus <%= node[:chef][:server_proxy][:js_expire_hours] %> hours"
<Proxy balancer://chef_server>
- BalancerMember http://127.0.0.1:<%= @node[:chef][:webui_port] %>
+ BalancerMember http://127.0.0.1:<%= node[:chef][:webui_port] %>
Order deny,allow
Allow from all
</Proxy>
View
12 chef/templates/default/client.rb.erb
@@ -7,16 +7,16 @@
log_level :info
log_location STDOUT
ssl_verify_mode :verify_none
-chef_server_url "<%= @node[:chef][:server_url] %>"
+chef_server_url "<%= node[:chef][:server_url] %>"
-validation_client_name "<%= @node[:chef][:validation_client_name] %>"
+validation_client_name "<%= node[:chef][:validation_client_name] %>"
validation_key "/etc/chef/validation.pem"
client_key "/etc/chef/client.pem"
-<% if @node[:chef][:backup_path] -%>
-file_backup_path "<%= @node[:chef][:backup_path] %>"
+<% if node[:chef][:backup_path] -%>
+file_backup_path "<%= node[:chef][:backup_path] %>"
<% else -%>
file_backup_path nil
<% end -%>
-file_cache_path "<%= @node[:chef][:cache_path] %>"
-pid_file "<%= @node[:chef][:run_path] %>/client.pid"
+file_cache_path "<%= node[:chef][:cache_path] %>"
+pid_file "<%= node[:chef][:run_path] %>/client.pid"
View
28 chef/templates/default/server.rb.erb
@@ -6,37 +6,37 @@
log_level :info
log_location STDOUT
ssl_verify_mode :verify_none
-chef_server_url "<%= @node[:chef][:server_url] %>"
+chef_server_url "<%= node[:chef][:server_url] %>"
couchdb_database 'chef'
-cookbook_path [ "<%= @node[:chef][:serve_path] %>/cookbooks", "<%= @node[:chef][:serve_path] %>/site-cookbooks" ]
-cookbook_tarball_path "<%= @node[:chef][:cache_path] %>/cookbook-tarballs"
+cookbook_path [ "<%= node[:chef][:serve_path] %>/cookbooks", "<%= node[:chef][:serve_path] %>/site-cookbooks" ]
+cookbook_tarball_path "<%= node[:chef][:cache_path] %>/cookbook-tarballs"
-file_cache_path "<%= @node[:chef][:cache_path] %>"
-node_path "<%= @node[:chef][:serve_path] %>/nodes"
-openid_store_path "<%= @node[:chef][:path] %>/openid/store"
-openid_cstore_path "<%= @node[:chef][:path] %>/openid/cstore"
-search_index_path "<%= @node[:chef][:path] %>/search_index"
-role_path "<%= @node[:chef][:serve_path] %>/roles"
+file_cache_path "<%= node[:chef][:cache_path] %>"
+node_path "<%= node[:chef][:serve_path] %>/nodes"
+openid_store_path "<%= node[:chef][:path] %>/openid/store"
+openid_cstore_path "<%= node[:chef][:path] %>/openid/cstore"
+search_index_path "<%= node[:chef][:path] %>/search_index"
+role_path "<%= node[:chef][:serve_path] %>/roles"
-validation_client_name "<%= @node[:chef][:validation_client_name] %>"
+validation_client_name "<%= node[:chef][:validation_client_name] %>"
validation_key "/etc/chef/validation.pem"
client_key "/etc/chef/client.pem"
web_ui_client_name "chef-webui"
web_ui_key "/etc/chef/webui.pem"
-<% if @node[:chef][:webui_enabled] -%>
+<% if node[:chef][:webui_enabled] -%>
web_ui_admin_user_name "admin"
<% end -%>
-supportdir = "<%= @node[:chef][:path] %>/support"
+supportdir = "<%= node[:chef][:path] %>/support"
solr_jetty_path File.join(supportdir, "solr", "jetty")
solr_data_path File.join(supportdir, "solr", "data")
solr_home_path File.join(supportdir, "solr", "home")
-solr_heap_size "256M"
+solr_heap_size "<%= node[:chef][:solr_heap_size] %>"
-umask <%= @node[:chef][:umask] %>
+umask <%= node[:chef][:umask] %>
signing_ca_cert "/etc/chef/certificates/cert.pem"
signing_ca_key "/etc/chef/certificates/key.pem"
View
4 chef/templates/default/sv-chef-client-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if @node[:languages][:ruby][:gems_dir] %>:<%= @node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node[:languages][:ruby][:gems_dir] %>:<%= node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
exec 2>&1
-exec /usr/bin/env chef-client -i <%= @node[:chef][:client_interval] %> -s <%= @node[:chef][:client_splay] %>
+exec /usr/bin/env chef-client -i <%= node[:chef][:client_interval] %> -s <%= node[:chef][:client_splay] %>
View
4 chef/templates/default/sv-chef-server-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if @node[:languages][:ruby][:gems_dir] %>:<%= @node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node[:languages][:ruby][:gems_dir] %>:<%= node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
exec 2>&1
-exec /usr/bin/env chef-server -N -p <%= @node[:chef][:server_port] %> -e production -P <%= @node[:chef][:run_path] %>/server.%s.pid
+exec /usr/bin/env chef-server -N -p <%= node[:chef][:server_port] %> -e production -P <%= node[:chef][:run_path] %>/server.%s.pid
View
4 chef/templates/default/sv-chef-server-webui-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if @node[:languages][:ruby][:gems_dir] %>:<%= @node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node[:languages][:ruby][:gems_dir] %>:<%= node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
exec 2>&1
-exec /usr/bin/env chef-server-webui -N -p <%= @node[:chef][:webui_port] %> -e production -P <%= @node[:chef][:run_path] %>/server-webui.%s.pid
+exec /usr/bin/env chef-server-webui -N -p <%= node[:chef][:webui_port] %> -e production -P <%= node[:chef][:run_path] %>/server-webui.%s.pid
View
2  chef/templates/default/sv-chef-solr-indexer-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if @node[:languages][:ruby][:gems_dir] %>:<%= @node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node[:languages][:ruby][:gems_dir] %>:<%= node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
exec 2>&1
exec /usr/bin/env chef-solr-indexer
View
2  chef/templates/default/sv-chef-solr-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if @node[:languages][:ruby][:gems_dir] %>:<%= @node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
+PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin<% if node[:languages][:ruby][:gems_dir] %>:<%= node[:languages][:ruby][:gems_dir] %>/bin<% end -%>
exec 2>&1
exec /usr/bin/env chef-solr
View
6 database/templates/default/app_grants.sql.erb
@@ -3,12 +3,12 @@
# Privileges for databases in <%= env %>
GRANT ALL ON <%= db['database'] %>.* TO '<%= db['username'] %>'@'%' IDENTIFIED BY '<%= db['password'] %>';
<% end -%>
-<% case @node[:platform] -%>
+<% case node[:platform] -%>
<% when "debian","ubuntu" -%>
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '<%= @node.mysql.server_debian_password %>' WITH GRANT OPTION;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '<%= node.mysql.server_debian_password %>' WITH GRANT OPTION;
<% end -%>
-GRANT REPLICATION SLAVE ON *.* TO 'repl'@'%' IDENTIFIED BY '<%= @node.mysql.server_repl_password %>';
+GRANT REPLICATION SLAVE ON *.* TO 'repl'@'%' IDENTIFIED BY '<%= node.mysql.server_repl_password %>';
SET PASSWORD FOR 'root'@'localhost' = PASSWORD('<%= @root_pw %>');
View
2  djbdns/templates/default/sv-axfrdns-run.erb
@@ -1,4 +1,4 @@
#!/bin/sh
exec 2>&1
exec chpst -e ./env sh -c '
- exec chpst -U axfrdns -d300000 tcpserver -vDRHl0 -x tcp.cdb -- "$IP" 53 <%= @node[:djbdns][:bin_dir] %>/axfrdns'
+ exec chpst -U axfrdns -d300000 tcpserver -vDRHl0 -x tcp.cdb -- "$IP" 53 <%= node[:djbdns][:bin_dir] %>/axfrdns'
View
2  djbdns/templates/default/sv-public-dnscache-run.erb
@@ -2,5 +2,5 @@
exec 2>&1
exec <seed
exec chpst -e ./env sh -c '
- exec chpst -U dnscache -o250 -d "$DATALIMIT" <%= @node[:djbdns][:bin_dir] %>/dnscache
+ exec chpst -U dnscache -o250 -d "$DATALIMIT" <%= node[:djbdns][:bin_dir] %>/dnscache
'
View
2  djbdns/templates/default/sv-tinydns-internal-run.erb
@@ -1,3 +1,3 @@
#!/bin/sh
exec 2>&1
-exec chpst -U tinydns -e ./env -d300000 <%= @node[:djbdns][:bin_dir] %>/tinydns
+exec chpst -U tinydns -e ./env -d300000 <%= node[:djbdns][:bin_dir] %>/tinydns
View
2  djbdns/templates/default/sv-tinydns-run.erb
@@ -1,3 +1,3 @@
#!/bin/sh
exec 2>&1
-exec chpst -U tinydns -e ./env -d300000 <%= @node[:djbdns][:bin_dir] %>/tinydns
+exec chpst -U tinydns -e ./env -d300000 <%= node[:djbdns][:bin_dir] %>/tinydns
View
4 djbdns/templates/default/tinydns-data.erb
@@ -1,4 +1,4 @@
-# Auto-generated by chef for <%= @node[:fqdn] %>
+# Auto-generated by chef for <%= node[:fqdn] %>
#
-.<%= @node[:domain] %>:<%= @node[:djbdns][:tinydns_ipaddress] %>:a:259200
+.<%= node[:domain] %>:<%= node[:djbdns][:tinydns_ipaddress] %>:a:259200
View
4 djbdns/templates/default/tinydns-internal-data.erb
@@ -1,5 +1,5 @@
-# Auto-generated by chef for <%= @node[:fqdn] %>
+# Auto-generated by chef for <%= node[:fqdn] %>
#
# This is the internal zone file.
-.<%= @node[:domain] %>:<%= @node[:djbdns][:tinydns_internal_ipaddress] %>:a:259200
+.<%= node[:domain] %>:<%= node[:djbdns][:tinydns_internal_ipaddress] %>:a:259200
View
12 dynomite/templates/default/sv-dynomite-run.erb
@@ -1,9 +1,9 @@
#!/bin/sh
exec 2>&1
exec /usr/bin/env HOME="/tmp" dynoctl \
- -n <%= @node[:dynomite][:num_nodes] %> \
- -d <%= @node[:dynomite][:data_dir] %> \
- -o <%= @node[:dynomite][:node_name] %> \
- -a <%= @node[:dynomite][:ascii_port] %> \
- -t <%= @node[:dynomite][:thrift_port] %> \
- -h <%= @node[:dynomite][:web_port] %>
+ -n <%= node[:dynomite][:num_nodes] %> \
+ -d <%= node[:dynomite][:data_dir] %> \
+ -o <%= node[:dynomite][:node_name] %> \
+ -a <%= node[:dynomite][:ascii_port] %> \
+ -t <%= node[:dynomite][:thrift_port] %> \
+ -h <%= node[:dynomite][:web_port] %>
View
6 gems/templates/default/gem_server.conf.erb
@@ -3,7 +3,7 @@
###
<VirtualHost *:80>
- ServerAdmin ops@<%= @node[:domain] %>
+ ServerAdmin ops@<%= node[:domain] %>
<% if @virtual_host_name -%>
ServerName <%= @virtual_host_name %>
<% end -%>
@@ -26,13 +26,13 @@
allow from all
</Directory>
- ErrorLog <%= @node[:apache][:log_dir] %>/gems-error.log
+ ErrorLog <%= node[:apache][:log_dir] %>/gems-error.log
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
LogLevel warn
- CustomLog <%= @node[:apache][:log_dir] %>/gems-access.log combined
+ CustomLog <%= node[:apache][:log_dir] %>/gems-access.log combined
ServerSignature On
</VirtualHost>
View
54 glassfish/templates/default/answer_file.erb
@@ -1,27 +1,27 @@
-InstallHome.directory.INSTALL_HOME=<%= @node[:glassfish][:INSTALL_HOME] %>
-License.license.ACCEPT_LICENSE=<%= @node[:glassfish][:ACCEPT_LICENSE] %>
-RegistrationOptions.regoptions.CREATE_NEWACCT=<%= @node[:glassfish][:CREATE_NEWACCT] %>
-RegistrationOptions.regoptions.DUMMY_PROP=<%= @node[:glassfish][:DUMMY_PROP] %>
-RegistrationOptions.regoptions.SKIP_REGISTRATION=<%= @node[:glassfish][:SKIP_REGISTRATION] %>
-RegistrationOptions.regoptions.USERNAME=<%= @node[:glassfish][:USERNAME] %>
-RegistrationOptions.regoptions.USERPASSWORD=<%= @node[:glassfish][:USERPASSWORD] %>
-RegistrationOptions.regoptions.USE_EXISTINGACCT=<%= @node[:glassfish][:USE_EXISTINGACCT] %>
-SOAccountCreation.accountinfo.COMPANYNAME=<%= @node[:glassfish][:COMPANYNAME] %>
-SOAccountCreation.accountinfo.COUNTRY=<%= @node[:glassfish][:COUNTRY] %>
-SOAccountCreation.accountinfo.COUNTRY_DROP_DOWN=<%= @node[:glassfish][:COUNTRY_DROP_DOWN] %>
-SOAccountCreation.accountinfo.EMAIL=<%= @node[:glassfish][:EMAIL] %>
-SOAccountCreation.accountinfo.FIRSTNAME=<%= @node[:glassfish][:FIRSTNAME] %>
-SOAccountCreation.accountinfo.LASTNAME=<%= @node[:glassfish][:LASTNAME] %>
-SOAccountCreation.accountinfo.PASSWORD=<%= @node[:glassfish][:PASSWORD] %>
-SOAccountCreation.accountinfo.REENTERPASSWORD=<%= @node[:glassfish][:REENTERPASSWORD] %>
-glassfish.Administration.ADMIN_PASSWORD=<%= @node[:glassfish][:ADMIN_PASSWORD] %>
-glassfish.Administration.ADMIN_PORT=<%= @node[:glassfish][:ADMIN_PORT] %>
-glassfish.Administration.ADMIN_USER=<%= @node[:glassfish][:ADMIN_USER] %>
-glassfish.Administration.ANONYMOUS=<%= @node[:glassfish][:ANONYMOUS] %>
-glassfish.Administration.LOGIN_MODE=<%= @node[:glassfish][:LOGIN_MODE] %>
-glassfish.Administration.HTTP_PORT=<%= @node[:glassfish][:HTTP_PORT] %>
-glassfish.Administration.NON_ANONYMOUS=<%= @node[:glassfish][:NON_ANONYMOUS] %>
-updatetool.Configuration.ALLOW_UPDATE_CHECK=<%= @node[:glassfish][:ALLOW_UPDATE_CHECK] %>
-updatetool.Configuration.BOOTSTRAP_UPDATETOOL=<%= @node[:glassfish][:BOOTSTRAP_UPDATETOOL] %>
-updatetool.Configuration.PROXY_HOST=<%= @node[:glassfish][:PROXY_HOST] %>
-updatetool.Configuration.PROXY_PORT=<%= @node[:glassfish][:PROXY_PORT] %>
+InstallHome.directory.INSTALL_HOME=<%= node[:glassfish][:INSTALL_HOME] %>
+License.license.ACCEPT_LICENSE=<%= node[:glassfish][:ACCEPT_LICENSE] %>
+RegistrationOptions.regoptions.CREATE_NEWACCT=<%= node[:glassfish][:CREATE_NEWACCT] %>
+RegistrationOptions.regoptions.DUMMY_PROP=<%= node[:glassfish][:DUMMY_PROP] %>
+RegistrationOptions.regoptions.SKIP_REGISTRATION=<%= node[:glassfish][:SKIP_REGISTRATION] %>
+RegistrationOptions.regoptions.USERNAME=<%= node[:glassfish][:USERNAME] %>
+RegistrationOptions.regoptions.USERPASSWORD=<%= node[:glassfish][:USERPASSWORD] %>
+RegistrationOptions.regoptions.USE_EXISTINGACCT=<%= node[:glassfish][:USE_EXISTINGACCT] %>
+SOAccountCreation.accountinfo.COMPANYNAME=<%= node[:glassfish][:COMPANYNAME] %>
+SOAccountCreation.accountinfo.COUNTRY=<%= node[:glassfish][:COUNTRY] %>
+SOAccountCreation.accountinfo.COUNTRY_DROP_DOWN=<%= node[:glassfish][:COUNTRY_DROP_DOWN] %>
+SOAccountCreation.accountinfo.EMAIL=<%= node[:glassfish][:EMAIL] %>
+SOAccountCreation.accountinfo.FIRSTNAME=<%= node[:glassfish][:FIRSTNAME] %>
+SOAccountCreation.accountinfo.LASTNAME=<%= node[:glassfish][:LASTNAME] %>
+SOAccountCreation.accountinfo.PASSWORD=<%= node[:glassfish][:PASSWORD] %>
+SOAccountCreation.accountinfo.REENTERPASSWORD=<%= node[:glassfish][:REENTERPASSWORD] %>
+glassfish.Administration.ADMIN_PASSWORD=<%= node[:glassfish][:ADMIN_PASSWORD] %>
+glassfish.Administration.ADMIN_PORT=<%= node[:glassfish][:ADMIN_PORT] %>
+glassfish.Administration.ADMIN_USER=<%= node[:glassfish][:ADMIN_USER] %>
+glassfish.Administration.ANONYMOUS=<%= node[:glassfish][:ANONYMOUS] %>
+glassfish.Administration.LOGIN_MODE=<%= node[:glassfish][:LOGIN_MODE] %>
+glassfish.Administration.HTTP_PORT=<%= node[:glassfish][:HTTP_PORT] %>
+glassfish.Administration.NON_ANONYMOUS=<%= node[:glassfish][:NON_ANONYMOUS] %>
+updatetool.Configuration.ALLOW_UPDATE_CHECK=<%= node[:glassfish][:ALLOW_UPDATE_CHECK] %>
+updatetool.Configuration.BOOTSTRAP_UPDATETOOL=<%= node[:glassfish][:BOOTSTRAP_UPDATETOOL] %>
+updatetool.Configuration.PROXY_HOST=<%= node[:glassfish][:PROXY_HOST] %>
+updatetool.Configuration.PROXY_PORT=<%= node[:glassfish][:PROXY_PORT] %>
View
4 glassfish/templates/default/glassfish-init.d-script.erb
@@ -5,10 +5,10 @@
# chkconfig: 3 80 05
# description: Startup script for domain1 of Glassfish Application Server.
-GLASSFISH_HOME=<%= File.join(@node[:glassfish][:INSTALL_HOME],"glassfish") %>
+GLASSFISH_HOME=<%= File.join(node[:glassfish][:INSTALL_HOME],"glassfish") %>
export GLASSFISH_HOME
-GLASSFISH_OWNER=<%= @node[:glassfish][:systemuser] %> ;
+GLASSFISH_OWNER=<%= node[:glassfish][:systemuser] %> ;
export GLASSFISH_OWNER
start() {
View
8 god/templates/default/master.god.erb
@@ -1,20 +1,20 @@
#
-# Generated by Chef for <%= @node[:hostname] %>
+# Generated by Chef for <%= node[:hostname] %>
#
God.load "/etc/god/conf.d/*.god"
God::Contacts::Email.message_settings = {
- :from => 'god@<%= @node[:domain] %>'
+ :from => 'god@<%= node[:domain] %>'
}
God::Contacts::Email.server_settings = {
:address => "localhost",
:port => 25,
- :domain => "<%= @node[:domain] %>",
+ :domain => "<%= node[:domain] %>",
}
God.contact(:email) do |c|
c.name = 'ops'
- c.email = 'ops@<%= @node[:domain] %>'
+ c.email = 'ops@<%= node[:domain] %>'
end
View
4 hadoop/templates/default/cloudera.list.erb
@@ -1,2 +1,2 @@
-deb http://archive.cloudera.com/debian <%= @node[:lsb][:codename] %> contrib
-deb-src http://archive.cloudera.com/debian <%= @node[:lsb][:codename] %> contrib
+deb http://archive.cloudera.com/debian <%= node[:lsb][:codename] %> contrib
+deb-src http://archive.cloudera.com/debian <%= node[:lsb][:codename] %> contrib
View
4 instiki/templates/default/instiki.conf.erb
@@ -14,7 +14,7 @@
</Directory>
LogLevel info
- ErrorLog <%= @node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log
- CustomLog <%= @node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined
+ ErrorLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log
+ CustomLog <%= node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined
</VirtualHost>
View
18 jira/templates/default/apache.conf.erb
@@ -1,20 +1,20 @@
<VirtualHost *:80>
- DocumentRoot <%= @node[:jira][:install_path] %>
- ServerAdmin ops@<%= @node[:domain] %>
- <% if @node[:jira][:virtual_host_name] -%>
- ServerName <%= @node[:jira][:virtual_host_name] %>
+ DocumentRoot <%= node[:jira][:install_path] %>
+ ServerAdmin ops@<%= node[:domain] %>
+ <% if node[:jira][:virtual_host_name] -%>
+ ServerName <%= node[:jira][:virtual_host_name] %>
<% end -%>
- <% if @node[:jira][:virtual_host_alias] -%>
- <% va_list = @node[:jira][:virtual_host_alias].kind_of?(Array) ? @node[:jira][:virtual_host_alias] : [ @node[:jira][:virtual_host_alias] ] -%>
+ <% if node[:jira][:virtual_host_alias] -%>
+ <% va_list = node[:jira][:virtual_host_alias].kind_of?(Array) ? node[:jira][:virtual_host_alias] : [ node[:jira][:virtual_host_alias] ] -%>
<% va_list.each do |va| -%>
ServerAlias <%= va %>
<% end -%>
<% end -%>
- ErrorLog <%= @node[:apache][:log_dir] %>/jira-error.log
- TransferLog <%= @node[:apache][:log_dir] %>/jira-access.log
+ ErrorLog <%= node[:apache][:log_dir] %>/jira-error.log
+ TransferLog <%= node[:apache][:log_dir] %>/jira-access.log
RewriteEngine On
- RewriteLog <%= @node[:apache][:log_dir] %>/jira-rewrite.log
+ RewriteLog <%= node[:apache][:log_dir] %>/jira-rewrite.log
RewriteLogLevel 0
<Proxy *>
View
2  jira/templates/default/entityengine.xml.erb
@@ -97,7 +97,7 @@ If you not using the 12 preconfigured DBs, you may also need to add your own fie
PLEASE DO NOT set the use-foreign-key* values to "true" as JIRA does not currently support this.
-->
- <datasource name="defaultDS" field-type-name="<%= @node[:jira][:database] %>"
+ <datasource name="defaultDS" field-type-name="<%= node[:jira][:database] %>"
helper-class="org.ofbiz.core.entity.GenericHelperDAO"
check-on-start="true"
use-foreign-keys="false"
View
6 jira/templates/default/server.xml.erb
@@ -11,10 +11,10 @@
<Context path="" docBase="${catalina.home}/atlassian-jira" reloadable="false">
<Resource name="jdbc/JiraDS" auth="Container" type="javax.sql.DataSource"
- username="<%= @node[:jira][:database_user] %>"
- password="<%= @node[:jira][:database_password] %>"
+ username="<%= node[:jira][:database_user] %>"
+ password="<%= node[:jira][:database_password] %>"
driverClassName="com.mysql.jdbc.Driver"
-url="jdbc:<%= @node[:jira][:database] %>://<%= @node[:jira][:database_host] %>/jiradb?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF8"
+url="jdbc:<%= node[:jira][:database] %>://<%= node[:jira][:database_host] %>/jiradb?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF8"
maxActive="20" />
<!-- NOTE: When a database server reboots or their is a network failure all the connections in the
View
4 jira/templates/default/sv-jira-run.erb
@@ -1,5 +1,5 @@
#!/bin/bash
-cd <%= @node[:jira][:install_path] %>
+cd <%= node[:jira][:install_path] %>
exec 2>&1
-exec chpst -u <%= @node[:jira][:run_user] %> env JAVA_HOME=/usr/lib/jvm/java-6-sun JAVA_OPTS="-Xms256m -Xmx256m" <%= @node[:jira][:install_path] %>/bin/startup.sh
+exec chpst -u <%= node[:jira][:run_user] %> env JAVA_HOME=/usr/lib/jvm/java-6-sun JAVA_OPTS="-Xms256m -Xmx256m" <%= node[:jira][:install_path] %>/bin/startup.sh
View
2  keepalived/templates/default/keepalived.conf.erb
@@ -5,7 +5,7 @@ global_defs {
notification_email {
acassen
}
- notification_email_from root@<%= @node[:domain] %>
+ notification_email_from root@<%= node[:domain] %>
smtp_server 192.168.200.1
smtp_connect_timeout 30
router_id LVS_DEVEL
View
4 kickstart/templates/default/kickstart.conf.erb
@@ -11,8 +11,8 @@
</Directory>
LogLevel info
- ErrorLog <%= @node[:apache][:log_dir] %>/kickstart-error.log
- CustomLog <%= @node[:apache][:log_dir] %>/kickstart-access.log combined
+ ErrorLog <%= node[:apache][:log_dir] %>/kickstart-error.log
+ CustomLog <%= node[:apache][:log_dir] %>/kickstart-access.log combined
<Directory <%= @docroot %>>
Options Indexes FollowSymLinks MultiViews
View
4 kickstart/templates/default/ks.cfg.erb
@@ -6,8 +6,8 @@ reboot
url --url http://mirrors.kernel.org/centos/5.3/os/i386
lang en_US.UTF-8
keyboard us
-network --device eth0 --bootproto dhcp --hostname centos5test.<%= @node[:domain] %>
-rootpw --iscrypted <%= @node[:kickstart][:rootpw] %>
+network --device eth0 --bootproto dhcp --hostname centos5test.<%= node[:domain] %>
+rootpw --iscrypted <%= node[:kickstart][:rootpw] %>
firewall --enabled --port=22:tcp
authconfig --enableshadow --enablemd5
selinux --permissive
View
6 maradns/templates/default/mararc.erb
@@ -5,8 +5,8 @@
##
csv2 = {}
-csv2["<%= @node[:domain] %>."] = "db.<%= @node[:domain] %>"
-bind_address = "<%= @node[:ipaddress] %>"
+csv2["<%= node[:domain] %>."] = "db.<%= node[:domain] %>"
+bind_address = "<%= node[:ipaddress] %>"
chroot_dir = "/etc/maradns"
maradns_uid = 109
maradns_gid = 109
@@ -28,4 +28,4 @@ verbose_level = 1
# The following line must be uncommented to enable recursive queries
root_servers = {}
-recursive_acl = "<%= @node[:maradns][:recursive_acl] %>"
+recursive_acl = "<%= node[:maradns][:recursive_acl] %>"
View
8 munin/templates/default/apache2.conf.erb
@@ -1,10 +1,10 @@
<VirtualHost *:80>
ServerAdmin ops@example.com
- ServerName <%= @node[:fqdn] %>
- ServerAlias munin munin.<%= @node[:app_environment] %>.<%= @public_domain %>
+ ServerName <%= node[:fqdn] %>
+ ServerAlias munin munin.<%= node[:app_environment] %>.<%= @public_domain %>
DocumentRoot /var/www/munin
- CustomLog <%= @node[:apache][:log_dir] %>/munin_access.log combined
- ErrorLog <%= @node[:apache][:log_dir] %>/munin_error.log
+ CustomLog <%= node[:apache][:log_dir] %>/munin_access.log combined
+ ErrorLog <%= node[:apache][:log_dir] %>/munin_error.log
Alias /munin /var/www/munin
View
4 munin/templates/default/munin-node.conf.erb
@@ -27,8 +27,8 @@ ignore_file \.rpm(save|new)$
# telnetting to localhost, port 4949
#
#host_name localhost.localdomain
-<% if @node[:ec2] %>
-host_name <%= @node[:hostname] %>.ec2.internal
+<% if node[:ec2] %>
+host_name <%= node[:hostname] %>.ec2.internal
<% end %>
# A list of addresses that are allowed to connect. This must be a
View
4 mysql/templates/default/debian.cnf.erb
@@ -1,11 +1,11 @@
[client]
host = localhost
user = debian-sys-maint
-password = <%= @node[:mysql][:server_debian_password] %>
+password = <%= node[:mysql][:server_debian_password] %>
socket = /var/run/mysqld/mysqld.sock
[mysql_upgrade]
host = localhost
user = debian-sys-maint
-password = <%= @node[:mysql][:server_debian_password] %>
+password = <%= node[:mysql][:server_debian_password] %>
socket = /var/run/mysqld/mysqld.sock
basedir = /usr
View
10 mysql/templates/default/grants.sql.erb
@@ -1,12 +1,12 @@
-# Generated by Chef for <%= @node[:fqdn] %>.
+# Generated by Chef for <%= node[:fqdn] %>.
# Local modifications will be overwritten.
-<% case @node[:platform] -%>
+<% case node[:platform] -%>
<% when "debian","ubuntu" -%>
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '<%= @node[:mysql][:server_debian_password] %>' WITH GRANT OPTION;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '<%= node[:mysql][:server_debian_password] %>' WITH GRANT OPTION;
<% end -%>
# Grant replication for a slave user.
-GRANT REPLICATION SLAVE ON *.* TO 'repl'@'%' identified by '<%= @node[:mysql][:server_repl_password] %>';
+GRANT REPLICATION SLAVE ON *.* TO 'repl'@'%' identified by '<%= node[:mysql][:server_repl_password] %>';
# Set the server root password. This should be preseeded by the package installation.
-SET PASSWORD FOR 'root'@'localhost' = PASSWORD('<%= @node[:mysql][:server_root_password] %>');
+SET PASSWORD FOR 'root'@'localhost' = PASSWORD('<%= node[:mysql][:server_root_password] %>');
View
24 mysql/templates/default/my.cnf.erb
@@ -1,5 +1,5 @@
#
-# Generated by Chef for <%= @node[:hostname] %>
+# Generated by Chef for <%= node[:hostname] %>
#
# Local modifications will be overwritten.
#
@@ -48,17 +48,17 @@ pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
port = 3306
basedir = /usr
-datadir = <%= @node[:mysql][:datadir] %>
+datadir = <%= node[:mysql][:datadir] %>
tmpdir = /tmp
skip-external-locking
#
# Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure.
-bind-address = <%= @node[:mysql][:bind_address] %>
+bind-address = <%= node[:mysql][:bind_address] %>
#
# * Fine Tuning
#
-key_buffer = <%= @node[:mysql][:tunable][:key_buffer] %>
+key_buffer = <%= node[:mysql][:tunable][:key_buffer] %>
max_allowed_packet = 16M
thread_stack = 128K
thread_cache_size = 8
@@ -68,13 +68,13 @@ myisam-recover = BACKUP
#max_connections = 100
#table_cache = 64
#thread_concurrency = 10
-max_connections = <%= @node[:mysql][:tunable][:max_connections] %>
-wait_timeout = <%= @node[:mysql][:tunable][:wait_timeout] %>
-net_read_timeout = <%= @node[:mysql][:tunable][:net_read_timeout] %>
-net_write_timeout = <%= @node[:mysql][:tunable][:net_write_timeout] %>
-back_log = <%= @node[:mysql][:tunable][:back_log] %>
-table_cache = <%= @node[:mysql][:tunable][:table_cache] %>
-max_heap_table_size = <%= @node[:mysql][:tunable][:max_heap_table_size] %>
+max_connections = <%= node[:mysql][:tunable][:max_connections] %>
+wait_timeout = <%= node[:mysql][:tunable][:wait_timeout] %>
+net_read_timeout = <%= node[:mysql][:tunable][:net_read_timeout] %>
+net_write_timeout = <%= node[:mysql][:tunable][:net_write_timeout] %>
+back_log = <%= node[:mysql][:tunable][:back_log] %>
+table_cache = <%= node[:mysql][:tunable][:table_cache] %>
+max_heap_table_size = <%= node[:mysql][:tunable][:max_heap_table_size] %>
#
# * Query Cache Configuration
@@ -160,4 +160,4 @@ key_buffer = 16M
# * IMPORTANT: Additional settings that can override those from this file!
# The files must end with '.cnf', otherwise they'll be ignored.
#
-<%= "!includedir /etc/mysql/conf.d/" unless ["centos", "redhat","suse"].include?(@node[:platform]) %>
+<%= "!includedir /etc/mysql/conf.d/" unless ["centos", "redhat","suse"].include?(node[:platform]) %>
View
4 mysql/templates/default/mysql-server.seed.erb
@@ -1,5 +1,5 @@
-mysql-server-5.0 mysql-server/root_password_again select <%= @node[:mysql][:server_root_password] %>
-mysql-server-5.0 mysql-server/root_password select <%= @node[:mysql][:server_root_password] %>
+mysql-server-5.0 mysql-server/root_password_again select <%= node[:mysql][:server_root_password] %>
+mysql-server-5.0 mysql-server/root_password select <%= node[:mysql][:server_root_password] %>
mysql-server-5.0 mysql-server-5.0/really_downgrade boolean false
mysql-server-5.0 mysql-server-5.0/need_sarge_compat boolean false
mysql-server-5.0 mysql-server-5.0/start_on_boot boolean true
View
24 mysql/templates/ubuntu-10.04/my.cnf.erb
@@ -1,5 +1,5 @@
#
-# Generated by Chef for <%= @node[:hostname] %>
+# Generated by Chef for <%= node[:hostname] %>
#
# Local modifications will be overwritten.
#
@@ -48,17 +48,17 @@ pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
port = 3306
basedir = /usr
-datadir = <%= @node[:mysql][:datadir] %>
+datadir = <%= node[:mysql][:datadir] %>
tmpdir = /tmp
skip-external-locking
#
# Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure.
-bind-address = <%= @node[:mysql][:bind_address] %>
+bind-address = <%= node[:mysql][:bind_address] %>
#
# * Fine Tuning
#
-key_buffer = <%= @node[:mysql][:tunable][:key_buffer] %>
+key_buffer = <%= node[:mysql][:tunable][:key_buffer] %>
max_allowed_packet = 16M
thread_stack = 192K
thread_cache_size = 8
@@ -68,13 +68,13 @@ myisam-recover = BACKUP
#max_connections = 100
#table_cache = 64
#thread_concurrency = 10
-max_connections = <%= @node[:mysql][:tunable][:max_connections] %>
-wait_timeout = <%= @node[:mysql][:tunable][:wait_timeout] %>
-net_read_timeout = <%= @node[:mysql][:tunable][:net_read_timeout] %>
-net_write_timeout = <%= @node[:mysql][:tunable][:net_write_timeout] %>
-back_log = <%= @node[:mysql][:tunable][:back_log] %>
-table_cache = <%= @node[:mysql][:tunable][:table_cache] %>
-max_heap_table_size = <%= @node[:mysql][:tunable][:max_heap_table_size] %>
+max_connections = <%= node[:mysql][:tunable][:max_connections] %>
+wait_timeout = <%= node[:mysql][:tunable][:wait_timeout] %>
+net_read_timeout = <%= node[:mysql][:tunable][:net_read_timeout] %>
+net_write_timeout = <%= node[:mysql][:tunable][:net_write_timeout] %>
+back_log = <%= node[:mysql][:tunable][:back_log] %>
+table_cache = <%= node[:mysql][:tunable][:table_cache] %>
+max_heap_table_size = <%= node[:mysql][:tunable][:max_heap_table_size] %>
#
# * Query Cache Configuration
@@ -155,4 +155,4 @@ key_buffer = 16M
# * IMPORTANT: Additional settings that can override those from this file!
# The files must end with '.cnf', otherwise they'll be ignored.
#
-<%= "!includedir /etc/mysql/conf.d/" unless ["centos", "redhat","suse"].include?(@node[:platform]) %>
+<%= "!includedir /etc/mysql/conf.d/" unless ["centos", "redhat","suse"].include?(node[:platform]) %>
View
24 mysql/templates/ubuntu-8.04/my.cnf.erb
@@ -1,5 +1,5 @@
#
-# Generated by Chef for <%= @node[:hostname] %>
+# Generated by Chef for <%= node[:hostname] %>
#
# Local modifications will be overwritten.
#
@@ -48,17 +48,17 @@ pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
port = 3306
basedir = /usr
-datadir = <%= @node[:mysql][:datadir] %>
+datadir = <%= node[:mysql][:datadir] %>
tmpdir = /tmp
skip-external-locking
#
# Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure.
-bind-address = <%= @node[:mysql][:bind_address] %>
+bind-address = <%= node[:mysql][:bind_address] %>
#
# * Fine Tuning
#
-key_buffer = <%= @node[:mysql][:tunable][:key_buffer] %>
+key_buffer = <%= node[:mysql][:tunable][:key_buffer] %>
max_allowed_packet = 16M
thread_stack = 128K
thread_cache_size = 8
@@ -68,13 +68,13 @@ myisam-recover = BACKUP
#max_connections = 100
#table_cache = 64
#thread_concurrency = 10
-max_connections = <%= @node[:mysql][:tunable][:max_connections] %>
-wait_timeout = <%= @node[:mysql][:tunable][:wait_timeout] %>
-net_read_timeout = <%= @node[:mysql][:tunable][:net_read_timeout] %>
-net_write_timeout = <%= @node[:mysql][:tunable][:net_write_timeout] %>
-back_log = <%= @node[:mysql][:tunable][:back_log] %>
-table_cache = <%= @node[:mysql][:tunable][:table_cache] %>
-max_heap_table_size = <%= @node[:mysql][:tunable][:max_heap_table_size] %>
+max_connections = <%= node[:mysql][:tunable][:max_connections] %>
+wait_timeout = <%= node[:mysql][:tunable][:wait_timeout] %>
+net_read_timeout = <%= node[:mysql][:tunable][:net_read_timeout] %>
+net_write_timeout = <%= node[:mysql][:tunable][:net_write_timeout] %>
+back_log = <%= node[:mysql][:tunable][:back_log] %>
+table_cache = <%= node[:mysql][:tunable][:table_cache] %>
+max_heap_table_size = <%= node[:mysql][:tunable][:max_heap_table_size] %>
#
# * Query Cache Configuration
@@ -153,4 +153,4 @@ key_buffer = 16M
# * IMPORTANT: Additional settings that can override those from this file!
# The files must end with '.cnf', otherwise they'll be ignored.
#
-<%= "!includedir /etc/mysql/conf.d/" unless ["centos", "redhat","suse"].include?(@node[:platform]) %>
+<%= "!includedir /etc/mysql/conf.d/" unless ["centos", "redhat","suse"].include?(node[:platform]) %>
View
24 mysql/templates/ubuntu-9.10/my.cnf.erb
@@ -1,5 +1,5 @@
#
-# Generated by Chef for <%= @node[:hostname] %>
+# Generated by Chef for <%= node[:hostname] %>
#
# Local modifications will be overwritten.
#
@@ -48,17 +48,17 @@ pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
port = 3306
basedir = /usr
-datadir = <%= @node[:mysql][:datadir] %>
+datadir = <%= node[:mysql][:datadir] %>
tmpdir = /tmp
skip-external-locking
#
# Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure.
-bind-address = <%= @node[:mysql][:bind_address] %>
+bind-address = <%= node[:mysql][:bind_address] %>
#
# * Fine Tuning
#
-key_buffer = <%= @node[:mysql][:tunable][:key_buffer] %>
+key_buffer = <%= node[:mysql][:tunable][:key_buffer] %>
max_allowed_packet = 16M
thread_stack = 192K
thread_cache_size = 8
@@ -68,13 +68,13 @@ myisam-recover = BACKUP
#max_connections = 100
#table_cache = 64
#thread_concurrency = 10
-max_connections = <%= @node[:mysql][:tunable][:max_connections] %>
-wait_timeout = <%= @node[:mysql][:tunable][:wait_timeout] %>
-net_read_timeout = <%= @node[:mysql][:tunable][:net_read_timeout] %>
-net_write_timeout = <%= @node[:mysql][:tunable][:net_write_timeout] %>
-back_log = <%= @node[:mysql][:tunable][:back_log] %>
-table_cache = <%= @node[:mysql][:tunable][:table_cache] %>
-max_heap_table_size = <%= @node[:mysql][:tunable][:max_heap_table_size] %>
+max_connections = <%= node[:mysql][:tunable][:max_connections] %>
+wait_timeout = <%= node[:mysql][:tunable][:wait_timeout] %>
+net_read_timeout = <%= node[:mysql][:tunable][:net_read_timeout] %>
+net_write_timeout = <%= node[:mysql][:tunable][:net_write_timeout] %>
+back_log = <%= node[:mysql][:tunable][:back_log] %>
+table_cache = <%= node[:mysql][:tunable][:table_cache] %>
+max_heap_table_size = <%= node[:mysql][:tunable][:max_heap_table_size] %>
#
# * Query Cache Configuration
@@ -155,4 +155,4 @@ key_buffer = 16M
# * IMPORTANT: Additional settings that can override those from this file!
# The files must end with '.cnf', otherwise they'll be ignored.
#
-<%= "!includedir /etc/mysql/conf.d/" unless ["centos", "redhat","suse"].include?(@node[:platform]) %>
+<%= "!includedir /etc/mysql/conf.d/" unless ["centos", "redhat","suse"].include?(node[:platform]) %>
View
8 nagios/libraries/default.rb
@@ -22,13 +22,13 @@ def nagios_boolean(true_or_false)
end
def nagios_interval(seconds)
- if seconds.to_i < @node[:nagios][:interval_length].to_i
- raise ArgumentError, "Specified nagios interval of #{seconds} seconds must be equal to or greater than the default interval length of #{@node[:nagios][:interval_length]}"
+ if seconds.to_i < node[:nagios][:interval_length].to_i
+ raise ArgumentError, "Specified nagios interval of #{seconds} seconds must be equal to or greater than the default interval length of #{node[:nagios][:interval_length]}"
end
- interval = seconds / @node[:nagios][:interval_length]
+ interval = seconds / node[:nagios][:interval_length]
interval
end
def nagios_attr(name)
- @node[:nagios][name]
+ node[:nagios][name]
end
View
10 nagios/templates/default/apache2.conf.erb
@@ -1,8 +1,8 @@
<VirtualHost *:80>
- ServerAdmin <%= @node[:nagios][:sysadmin_email] %>
- ServerName <%= @node[:fqdn] %>
- ServerAlias nagios nagios.<%= @node[:app_environment]%>.<%= @public_domain %>
- DocumentRoot <%= @node[:nagios][:docroot] %>
+ ServerAdmin <%= node[:nagios][:sysadmin_email] %>
+ ServerName <%= node[:fqdn] %>
+ ServerAlias nagios nagios.<%= node[:app_environment]%>.<%= @public_domain %>
+ DocumentRoot <%= node[:nagios][:docroot] %>
CustomLog /var/log/nagios3/apache_access.log combined
ErrorLog /var/log/nagios3/apache_error.log
@@ -10,7 +10,7 @@
ScriptAlias /nagios3/cgi-bin /usr/lib/cgi-bin/nagios3
Alias /nagios3/stylesheets /etc/nagios3/stylesheets
- Alias /nagios3 <%= @node[:nagios][:docroot] %>
+ Alias /nagios3 <%= node[:nagios][:docroot] %>
<Location />
AuthName "Nagios Server"
View
6 nagios/templates/default/cgi.cfg.erb
@@ -6,14 +6,14 @@
# The CGIs will read the main and host config files for any other
# data they might need.
-main_config_file=<%= @node[:nagios][:dir] %>/nagios.cfg
+main_config_file=<%= node[:nagios][:dir] %>/nagios.cfg
# PHYSICAL HTML PATH
# This is the path where the HTML files for Nagios reside. This
# value is used to locate the logo images needed by the statusmap
# and statuswrl CGIs.
-physical_html_path=<%= @node[:nagios][:docroot] %>
+physical_html_path=<%= node[:nagios][:docroot] %>
# URL HTML PATH
# This is the path portion of the URL that corresponds to the
@@ -48,7 +48,7 @@ show_context_help=1
# have to be tweaked a bit, as different versions of the plugin
# use different command line arguments/syntaxes.
-nagios_check_command=/usr/lib/nagios/plugins/check_nagios <%= @node[:nagios][:cache_dir] %>/status.dat 5 '/usr/sbin/nagios3'
+nagios_check_command=/usr/lib/nagios/plugins/check_nagios <%= node[:nagios][:cache_dir] %>/status.dat 5 '/usr/sbin/nagios3'
# AUTHENTICATION USAGE
# This option controls whether or not the CGIs will use any
View
2  nagios/templates/default/commands.cfg.erb
@@ -51,7 +51,7 @@ define command {
define command {
command_name check-nagios
- command_line $USER1$/check_nagios -F <%= @node[:nagios][:cache_dir] %>/status.dat -e 4 -C /usr/sbin/nagios3
+ command_line $USER1$/check_nagios -F <%= node[:nagios][:cache_dir] %>/status.dat -e 4 -C /usr/sbin/nagios3
}
define command {
View
2  nagios/templates/default/hosts.cfg.erb
@@ -1,7 +1,7 @@
# Generated by Chef
# host definitions
-<% @nodes.each do |n| -%>
+<% nodes.each do |n| -%>
define host {
use server
address <%= n['ipaddress'] %>
View
32 nagios/templates/default/nagios.cfg.erb
@@ -1,35 +1,35 @@
# Generated by Chef
#
-log_file=<%= @node[:nagios][:log_dir] %>/nagios.log
+log_file=<%= node[:nagios][:log_dir] %>/nagios.log
-admin_email=<%= @node[:nagios][:sysadmin_email] %>
-admin_pager=<%= @node[:nagios][:sysadmin_sms_email] %>
+admin_email=<%= node[:nagios][:sysadmin_email] %>
+admin_pager=<%= node[:nagios][:sysadmin_sms_email] %>
-cfg_dir=<%= @node[:nagios][:dir] %>/<%= @node[:nagios][:config_subdir] %>
+cfg_dir=<%= node[:nagios][:dir] %>/<%= node[:nagios][:config_subdir] %>
-object_cache_file=<%= @node[:nagios][:cache_dir] %>/objects.cache
-precached_object_file=<%= @node[:nagios][:cache_dir] %>/objects.precache
+object_cache_file=<%= node[:nagios][:cache_dir] %>/objects.cache
+precached_object_file=<%= node[:nagios][:cache_dir] %>/objects.precache
resource_file=/etc/nagios3/resource.cfg
-status_file=<%= @node[:nagios][:cache_dir] %>/status.dat
+status_file=<%= node[:nagios][:cache_dir] %>/status.dat
status_update_interval=10
nagios_user=nagios
nagios_group=nagios
-check_external_commands=<%= nagios_boolean(@node[:nagios][:check_external_commands]) %>
+check_external_commands=<%= nagios_boolean(node[:nagios][:check_external_commands]) %>
# NOTE: Setting this value to -1 causes Nagios to check the external command file as often as possible.
command_check_interval=-1
-command_file=<%= @node[:nagios][:state_dir] %>/rw/nagios.cmd
+command_file=<%= node[:nagios][:state_dir] %>/rw/nagios.cmd
external_command_buffer_slots=4096
lock_file=/var/run/nagios3/nagios3.pid
-temp_file=<%= @node[:nagios][:cache_dir] %>/nagios.tmp
+temp_file=<%= node[:nagios][:cache_dir] %>/nagios.tmp
temp_path=/tmp
event_broker_options=-1
log_rotation_method=d
-log_archive_path=<%= @node[:nagios][:log_dir] %>/archives
+log_archive_path=<%= node[:nagios][:log_dir] %>/archives
use_syslog=1
log_notifications=1
log_service_retries=1
@@ -47,7 +47,7 @@ max_host_check_spread=5
max_concurrent_checks=0
check_result_reaper_frequency=10
max_check_result_reaper_time=30
-check_result_path=<%= @node[:nagios][:state_dir] %>/spool/checkresults
+check_result_path=<%= node[:nagios][:state_dir] %>/spool/checkresults
max_check_result_file_age=3600
cached_host_check_horizon=15
cached_service_check_horizon=15
@@ -68,7 +68,7 @@ ocsp_timeout=5
perfdata_timeout=5
retain_state_information=1
-state_retention_file=<%= @node[:nagios][:state_dir] %>/retention.dat
+state_retention_file=<%= node[:nagios][:state_dir] %>/retention.dat
retention_update_interval=60
use_retained_program_state=1
use_retained_scheduling_info=1
@@ -79,7 +79,7 @@ retained_process_service_attribute_mask=0
retained_contact_host_attribute_mask=0
retained_contact_service_attribute_mask=0
-interval_length=<%= @node[:nagios][:interval_length] %>
+interval_length=<%= node[:nagios][:interval_length] %>
use_aggressive_host_checking=0
@@ -88,7 +88,7 @@ accept_passive_service_checks=1
execute_host_checks=1
accept_passive_host_checks=1
-enable_notifications=<%= @node[:nagios][:notifications_enabled] %>
+enable_notifications=<%= node[:nagios][:notifications_enabled] %>
enable_event_handlers=1
#process_performance_data=1
@@ -152,5 +152,5 @@ enable_environment_macros=1
debug_level=0
debug_verbosity=1
-debug_file=<% @node[:nagios][:state_dir] %>/nagios.debug
+debug_file=<% node[:nagios][:state_dir] %>/nagios.debug
max_debug_file_size=1000000
View
16 nagios/templates/default/nrpe.cfg.erb
@@ -8,22 +8,22 @@ command_timeout=60
allowed_hosts=<%= @mon_host.join(',') %>
command[check_users]=/usr/lib/nagios/plugins/check_users -w 20 -c 30
-command[check_load]=/usr/lib/nagios/plugins/check_load -w <%= @node[:nagios][:checks][:load][:warning] %> -c <%= @node[:nagios][:checks][:load][:critical] %>
+command[check_load]=/usr/lib/nagios/plugins/check_load -w <%= node[:nagios][:checks][:load][:warning] %> -c <%= node[:nagios][:checks][:load][:critical] %>
command[check_all_disks]=/usr/lib/nagios/plugins/check_disk -w 8% -c 5% -A -x /dev/shm -X nfs -i /boot
command[check_zombie_procs]=/usr/lib/nagios/plugins/check_procs -w 5 -c 10 -s Z
command[check_total_procs]=/usr/lib/nagios/plugins/check_procs -w 500 -c 800
command[check_swap]=/usr/lib/nagios/plugins/check_swap -w '50%' -c '25%'
-command[check_mem]=/usr/lib/nagios/plugins/check_mem.sh -w <%= @node[:nagios][:checks][:memory][:warning] %> -c <%= @node[:nagios][:checks][:memory][:critical] %> -p
+command[check_mem]=/usr/lib/nagios/plugins/check_mem.sh -w <%= node[:nagios][:checks][:memory][:warning] %> -c <%= node[:nagios][:checks][:memory][:critical] %> -p
command[check_chef_client]=/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1:2 -C chef-client
-command[check_smtp]=/usr/lib/nagios/plugins/check_smtp -H <%= @node[:nagios][:checks][:smtp_host] %>
+command[check_smtp]=/usr/lib/nagios/plugins/check_smtp -H <%= node[:nagios][:checks][:smtp_host] %>
command[check_nginx]=/usr/lib/nagios/plugins/check_procs -w 2:3 -c 1:5 -C nginx
command[check_sphinx]=/usr/lib/nagios/plugins/check_procs -c 1:1 -C searchd
-<% unless @node[:mysql].nil? -%>
-command[check_mysql_server]=/usr/lib/nagios/plugins/check_mysql -H localhost -u debian-sys-maint -p <%= @node[:mysql][:server_debian_password] %>
+<% unless node[:mysql].nil? -%>
+command[check_mysql_server]=/usr/lib/nagios/plugins/check_mysql -H localhost -u debian-sys-maint -p <%= node[:mysql][:server_debian_password] %>
<% end -%>
#command[check_unicorn]=/usr/lib/nagios/plugins/check_procs -c 4:8 -C unicorn_rails
#
# memcached checks require cpan modules, "Cache::Memcached" and "Nagios::Plugins::Memcached"
-#command[check_memcached_response]=/usr/local/bin/check_memcached -H <%= @node[:ipaddress] %> -w 3 -c 5
-#command[check_memcached_size]=/usr/local/bin/check_memcached -H <%= @node[:ipaddress] %> --size-warning 60 --size-critical 80
-#command[check_memcached_hit]=/usr/local/bin/check_memcached -H <%= @node[:ipaddress] %> --hit-warning 40 --hit-critical 20
+#command[check_memcached_response]=/usr/local/bin/check_memcached -H <%= node[:ipaddress] %> -w 3 -c 5
+#command[check_memcached_size]=/usr/local/bin/check_memcached -H <%= node[:ipaddress] %> --size-warning 60 --size-critical 80
+#command[check_memcached_hit]=/usr/local/bin/check_memcached -H <%= node[:ipaddress] %> --hit-warning 40 --hit-critical 20
View
4 nginx/templates/default/default-site.erb
@@ -1,8 +1,8 @@
server {
listen 80;
- server_name <%= @node[:hostname] %>;
+ server_name <%= node[:hostname] %>;
- access_log <%= @node[:nginx][:log_dir] %>/localhost.access.log;
+ access_log <%= node[:nginx][:log_dir] %>/localhost.access.log;
location / {
root /var/www/nginx-default;
View
36 nginx/templates/default/nginx.conf.erb
@@ -1,40 +1,40 @@
-user <%= @node[:nginx][:user] %>;
-worker_processes <%= @node[:nginx][:worker_processes] %>;
-<% if @node[:nginx][:daemon_disable] -%>
+user <%= node[:nginx][:user] %>;
+worker_processes <%= node[:nginx][:worker_processes] %>;
+<% if node[:nginx][:daemon_disable] -%>
daemon off;
<% end -%>
-error_log <%= @node[:nginx][:log_dir] %>/error.log;
+error_log <%= node[:nginx][:log_dir] %>/error.log;
pid /var/run/nginx.pid;
events {
- worker_connections <%= @node[:nginx][:worker_connections] %>;
+ worker_connections <%= node[:nginx][:worker_connections] %>;
}
http {
- include <%= @node[:nginx][:dir] %>/mime.types;
+ include <%= node[:nginx][:dir] %>/mime.types;
default_type application/octet-stream;
- access_log <%= @node[:nginx][:log_dir] %>/access.log;
+ access_log <%= node[:nginx][:log_dir] %>/access.log;
sendfile on;
tcp_nopush on;
tcp_nodelay on;
- <% if @node[:nginx][:keepalive] == "on" %>
- keepalive_timeout <%= @node[:nginx][:keepalive_timeout] %>;
+ <% if node[:nginx][:keepalive] == "on" %>
+ keepalive_timeout <%= node[:nginx][:keepalive_timeout] %>;
<% end %>
- gzip <%= @node[:nginx][:gzip] %>;
- <% if @node[:nginx][:gzip] == "on" %>
- gzip_http_version <%= @node[:nginx][:gzip_http_version] %>;
- gzip_comp_level <%= @node[:nginx][:gzip_comp_level] %>;
- gzip_proxied <%= @node[:nginx][:gzip_proxied] %>;
- gzip_types <%= @node[:nginx][:gzip_types].join(' ') %>;
+ gzip <%= node[:nginx][:gzip] %>;
+ <% if node[:nginx][:gzip] == "on" %>
+ gzip_http_version <%= node[:nginx][:gzip_http_version] %>;
+ gzip_comp_level <%= node[:nginx][:gzip_comp_level] %>;
+ gzip_proxied <%= node[:nginx][:gzip_proxied] %>;
+ gzip_types <%= node[:nginx][:gzip_types].join(' ') %>;
<% end %>
- server_names_hash_bucket_size <%= @node[:nginx][:server_names_hash_bucket_size] %>;
+ server_names_hash_bucket_size <%= node[:nginx][:server_names_hash_bucket_size] %>;
- include <%= @node[:nginx][:dir] %>/conf.d/*.conf;
- include <%= @node[:nginx][:dir] %>/sites-enabled/*;
+ include <%= node[:nginx][:dir] %>/conf.d/*.conf;
+ include <%= node[:nginx][:dir] %>/sites-enabled/*;
}
View
2  nginx/templates/default/nxdissite.erb
@@ -1,6 +1,6 @@
#!/bin/sh -e
-SYSCONFDIR='<%= @node[:nginx][:dir] %>'
+SYSCONFDIR='<%= node[:nginx][:dir] %>'
if [ -z $1 ]; then
echo "Which site would you like to disable?"
View
2  nginx/templates/default/nxensite.erb
@@ -1,6 +1,6 @@
#!/bin/sh -e
-SYSCONFDIR='<%= @node[:nginx][:dir] %>'
+SYSCONFDIR='<%= node[:nginx][:dir] %>'
if [ -z $1 ]; then
echo "Which site would you like to enable?"
View
2  nginx/templates/default/sv-nginx-run.erb
@@ -1,3 +1,3 @@
#!/bin/sh
exec 2>&1
-exec <%= @node[:nginx][:install_path] %>/sbin/nginx -c <%= @node[:nginx][:dir] %>/nginx.conf
+exec <%= node[:nginx][:install_path] %>/sbin/nginx -c <%= node[:nginx][:dir] %>/nginx.conf
View
4 ntp/templates/default/ntp.conf.erb
@@ -6,13 +6,13 @@ filegen loopstats file loopstats type day enable
filegen peerstats file peerstats type day enable
filegen clockstats file clockstats type day enable
-<% if @node[:ntp][:is_server] -%>
+<% if node[:ntp][:is_server] -%>
server 0.us.pool.ntp.org
server 1.us.pool.ntp.org
server 2.us.pool.ntp.org
server 3.us.pool.ntp.org
<% else -%>
-<% @node[:ntp][:servers].each do |ntpserver| -%>
+<% node[:ntp][:servers].each do |ntpserver| -%>
server <%= ntpserver %>
<% end -%>
<% end -%>
View
4 openldap/templates/default/ldap-ldap.conf.erb
@@ -1,13 +1,13 @@
#
# LDAP Defaults
#
-# Generated by Chef for <% @node[:hostname] %>
+# Generated by Chef for <% node[:hostname] %>
#
# See ldap.conf(5) for details
# This file should be world readable but not world writable.
-BASE <%= @node[:openldap][:basedn] %>
+BASE <%= node[:openldap][:basedn] %>
TLS_REQCERT never
#URI ldap://ldap.example.com ldap://ldap-master.example.com:666
View
14 openldap/templates/default/ldap.conf.erb
@@ -1,22 +1,22 @@
#
-# <%= @node[:openldap][:dir] %>.conf generated for <%= @node[:hostname] %>
+# <%= node[:openldap][:dir] %>.conf generated for <%= node[:hostname] %>
#
<