From 1193f67beff7b61c0474df4582b87119bb5c2294 Mon Sep 17 00:00:00 2001 From: jtimberman Date: Sun, 13 Jun 2010 13:16:20 -0600 Subject: [PATCH] @node is deprecated, use node, chef commit f904589 --- .../templates/default/sv-activemq-run.erb | 2 +- apache2/templates/default/a2dismod.erb | 2 +- apache2/templates/default/a2dissite.erb | 4 +- apache2/templates/default/a2enmod.erb | 2 +- apache2/templates/default/a2ensite.erb | 2 +- apache2/templates/default/apache2.conf.erb | 56 +++++++++---------- apache2/templates/default/default-site.erb | 8 +-- .../templates/default/mod_auth_openid.rb.erb | 2 +- apache2/templates/default/mods/alias.conf.erb | 4 +- apache2/templates/default/mods/fcgid.conf.erb | 2 +- apache2/templates/default/mods/ssl.conf.erb | 4 +- apache2/templates/default/security.erb | 6 +- apache2/templates/default/web_app.conf.erb | 6 +- application/templates/default/myproj.conf.erb | 6 +- .../default/rails_nginx_passenger.conf.erb | 6 +- .../templates/default/sv-unicorn-run.erb | 2 +- bootstrap/templates/default/client.rb.erb | 12 ++-- bootstrap/templates/default/server.rb.erb | 26 ++++----- .../templates/default/sv-chef-client-run.erb | 4 +- .../templates/default/sv-chef-server-run.erb | 4 +- .../default/sv-chef-server-webui-run.erb | 4 +- .../default/sv-chef-solr-indexer-run.erb | 2 +- .../templates/default/sv-chef-solr-run.erb | 2 +- chef/templates/default/chef_server.conf.erb | 26 ++++----- chef/templates/default/client.rb.erb | 12 ++-- chef/templates/default/server.rb.erb | 28 +++++----- chef/templates/default/sv-chef-client-run.erb | 4 +- chef/templates/default/sv-chef-server-run.erb | 4 +- .../default/sv-chef-server-webui-run.erb | 4 +- .../default/sv-chef-solr-indexer-run.erb | 2 +- chef/templates/default/sv-chef-solr-run.erb | 2 +- database/templates/default/app_grants.sql.erb | 6 +- djbdns/templates/default/sv-axfrdns-run.erb | 2 +- .../default/sv-public-dnscache-run.erb | 2 +- .../default/sv-tinydns-internal-run.erb | 2 +- djbdns/templates/default/sv-tinydns-run.erb | 2 +- djbdns/templates/default/tinydns-data.erb | 4 +- .../default/tinydns-internal-data.erb | 4 +- .../templates/default/sv-dynomite-run.erb | 12 ++-- gems/templates/default/gem_server.conf.erb | 6 +- glassfish/templates/default/answer_file.erb | 54 +++++++++--------- .../default/glassfish-init.d-script.erb | 4 +- god/templates/default/master.god.erb | 8 +-- hadoop/templates/default/cloudera.list.erb | 4 +- instiki/templates/default/instiki.conf.erb | 4 +- jira/templates/default/apache.conf.erb | 18 +++--- jira/templates/default/entityengine.xml.erb | 2 +- jira/templates/default/server.xml.erb | 6 +- jira/templates/default/sv-jira-run.erb | 4 +- .../templates/default/keepalived.conf.erb | 2 +- .../templates/default/kickstart.conf.erb | 4 +- kickstart/templates/default/ks.cfg.erb | 4 +- maradns/templates/default/mararc.erb | 6 +- munin/templates/default/apache2.conf.erb | 8 +-- munin/templates/default/munin-node.conf.erb | 4 +- mysql/templates/default/debian.cnf.erb | 4 +- mysql/templates/default/grants.sql.erb | 10 ++-- mysql/templates/default/my.cnf.erb | 24 ++++---- mysql/templates/default/mysql-server.seed.erb | 4 +- mysql/templates/ubuntu-10.04/my.cnf.erb | 24 ++++---- mysql/templates/ubuntu-8.04/my.cnf.erb | 24 ++++---- mysql/templates/ubuntu-9.10/my.cnf.erb | 24 ++++---- nagios/libraries/default.rb | 8 +-- nagios/templates/default/apache2.conf.erb | 10 ++-- nagios/templates/default/cgi.cfg.erb | 6 +- nagios/templates/default/commands.cfg.erb | 2 +- nagios/templates/default/hosts.cfg.erb | 2 +- nagios/templates/default/nagios.cfg.erb | 32 +++++------ nagios/templates/default/nrpe.cfg.erb | 16 +++--- nginx/templates/default/default-site.erb | 4 +- nginx/templates/default/nginx.conf.erb | 36 ++++++------ nginx/templates/default/nxdissite.erb | 2 +- nginx/templates/default/nxensite.erb | 2 +- nginx/templates/default/sv-nginx-run.erb | 2 +- ntp/templates/default/ntp.conf.erb | 4 +- openldap/templates/default/ldap-ldap.conf.erb | 4 +- openldap/templates/default/ldap.conf.erb | 14 ++--- .../templates/default/libnss-ldap.conf.erb | 12 ++-- .../templates/default/login_access.conf.erb | 8 +-- openldap/templates/default/slapd.conf.erb | 50 ++++++++--------- packages/libraries/packages.rb | 2 +- .../templates/default/passenger.conf.erb | 4 +- .../templates/default/passenger.load.erb | 2 +- .../default/passenger_web_app.conf.erb | 8 +-- .../templates/default/web_app.conf.erb | 8 +-- .../templates/default/passenger.conf.erb | 4 +- .../templates/default/passenger.load.erb | 2 +- .../default/passenger_nginx.conf.erb | 4 +- php/templates/default/php.conf.erb | 12 ++-- postfix/templates/default/main.cf.erb | 32 +++++------ postfix/templates/default/sasl_passwd.erb | 2 +- .../templates/default/doterlang.cookie.erb | 2 +- .../templates/default/rabbitmq.config.erb | 18 +++--- .../default/rabbitmq_cluster.config.erb | 4 +- radiant/libraries/radiant.rb | 2 +- radiant/templates/default/radiant.conf.erb | 6 +- rails/templates/default/rails_app.conf.erb | 8 +-- redmine/templates/default/database.yml.erb | 6 +- redmine/templates/default/redmine.conf.erb | 4 +- redmine/templates/default/sv-redmine-run.erb | 2 +- reprepro/recipes/default.rb | 14 ++--- reprepro/templates/default/apt_repo.conf.erb | 6 +- reprepro/templates/default/distributions.erb | 6 +- resolver/templates/default/resolv.conf.erb | 4 +- riak/templates/default/iptables.erb | 12 ++-- solr/templates/default/sv-solr-run.erb | 2 +- .../templates/default/known_hosts.erb | 2 +- .../templates/default/sv-stompserver-run.erb | 2 +- sudo/templates/default/sudoers.erb | 2 +- teamspeak/templates/default/server.ini.erb | 4 +- tomcat6/libraries/tomcat_manager.rb | 2 +- tomcat6/recipes/default.rb | 2 +- tomcat6/templates/default/manager.xml.erb | 2 +- .../templates/default/tomcat-users.xml.erb | 2 +- tomcat6/templates/default/tomcat6.conf.erb | 14 ++--- wordpress/recipes/default.rb | 4 +- wordpress/templates/default/grants.sql.erb | 2 +- .../templates/default/wordpress.conf.erb | 6 +- 118 files changed, 485 insertions(+), 485 deletions(-) diff --git a/activemq/templates/default/sv-activemq-run.erb b/activemq/templates/default/sv-activemq-run.erb index 3982bbcda..e97a68e80 100644 --- a/activemq/templates/default/sv-activemq-run.erb +++ b/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 diff --git a/apache2/templates/default/a2dismod.erb b/apache2/templates/default/a2dismod.erb index bcb73bfda..06fb6b36c 100644 --- a/apache2/templates/default/a2dismod.erb +++ b/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?" diff --git a/apache2/templates/default/a2dissite.erb b/apache2/templates/default/a2dissite.erb index 7bcd80e5a..41feda57f 100644 --- a/apache2/templates/default/a2dissite.erb +++ b/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 diff --git a/apache2/templates/default/a2enmod.erb b/apache2/templates/default/a2enmod.erb index 4579cbbf5..a59c72fe9 100644 --- a/apache2/templates/default/a2enmod.erb +++ b/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?" diff --git a/apache2/templates/default/a2ensite.erb b/apache2/templates/default/a2ensite.erb index 68b3a1550..4288869ff 100644 --- a/apache2/templates/default/a2ensite.erb +++ b/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?" diff --git a/apache2/templates/default/apache2.conf.erb b/apache2/templates/default/apache2.conf.erb index b7384805e..c94b92a14 100644 --- a/apache2/templates/default/apache2.conf.erb +++ b/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 - 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] %> # 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 - 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] %> -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 # 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/ diff --git a/apache2/templates/default/default-site.erb b/apache2/templates/default/default-site.erb index d461bed2c..14b25639c 100644 --- a/apache2/templates/default/default-site.erb +++ b/apache2/templates/default/default-site.erb @@ -1,5 +1,5 @@ - ServerAdmin <%= @node[:apache][:contact] %> + ServerAdmin <%= node[:apache][:contact] %> DocumentRoot /var/www/ @@ -24,13 +24,13 @@ Allow from all - 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 - <% 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 diff --git a/apache2/templates/default/mod_auth_openid.rb.erb b/apache2/templates/default/mod_auth_openid.rb.erb index aad32f178..51fc1d752 100644 --- a/apache2/templates/default/mod_auth_openid.rb.erb +++ b/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 -%> diff --git a/apache2/templates/default/mods/alias.conf.erb b/apache2/templates/default/mods/alias.conf.erb index d70670f09..45568a57d 100644 --- a/apache2/templates/default/mods/alias.conf.erb +++ b/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] %>" -"> +"> Options Indexes MultiViews AllowOverride None Order allow,deny diff --git a/apache2/templates/default/mods/fcgid.conf.erb b/apache2/templates/default/mods/fcgid.conf.erb index 214114176..0e6fc9a89 100644 --- a/apache2/templates/default/mods/fcgid.conf.erb +++ b/apache2/templates/default/mods/fcgid.conf.erb @@ -3,7 +3,7 @@ IPCConnectTimeout 20 -<% 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 diff --git a/apache2/templates/default/mods/ssl.conf.erb b/apache2/templates/default/mods/ssl.conf.erb index 14f72a664..3b7735f66 100644 --- a/apache2/templates/default/mods/ssl.conf.erb +++ b/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 diff --git a/apache2/templates/default/security.erb b/apache2/templates/default/security.erb index dbb1a47c5..70c97ad37 100644 --- a/apache2/templates/default/security.erb +++ b/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] %> diff --git a/apache2/templates/default/web_app.conf.erb b/apache2/templates/default/web_app.conf.erb index d6a12c419..6be3fc984 100644 --- a/apache2/templates/default/web_app.conf.erb +++ b/apache2/templates/default/web_app.conf.erb @@ -25,11 +25,11 @@ 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] %> diff --git a/application/templates/default/myproj.conf.erb b/application/templates/default/myproj.conf.erb index 113e5a89c..20142eb6b 100644 --- a/application/templates/default/myproj.conf.erb +++ b/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; } diff --git a/application/templates/default/rails_nginx_passenger.conf.erb b/application/templates/default/rails_nginx_passenger.conf.erb index 113e5a89c..20142eb6b 100644 --- a/application/templates/default/rails_nginx_passenger.conf.erb +++ b/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; } diff --git a/application/templates/default/sv-unicorn-run.erb b/application/templates/default/sv-unicorn-run.erb index df0a2e212..90fa42957 100644 --- a/application/templates/default/sv-unicorn-run.erb +++ b/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 diff --git a/bootstrap/templates/default/client.rb.erb b/bootstrap/templates/default/client.rb.erb index 9a0d6ced3..c50b2fdde 100644 --- a/bootstrap/templates/default/client.rb.erb +++ b/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 %> diff --git a/bootstrap/templates/default/server.rb.erb b/bootstrap/templates/default/server.rb.erb index 0c100d05b..ff7b67ac5 100644 --- a/bootstrap/templates/default/server.rb.erb +++ b/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 %> diff --git a/bootstrap/templates/default/sv-chef-client-run.erb b/bootstrap/templates/default/sv-chef-client-run.erb index 7c0dec7eb..bd9502869 100644 --- a/bootstrap/templates/default/sv-chef-client-run.erb +++ b/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 -%> diff --git a/bootstrap/templates/default/sv-chef-server-run.erb b/bootstrap/templates/default/sv-chef-server-run.erb index 25f09086b..7db1a6611 100644 --- a/bootstrap/templates/default/sv-chef-server-run.erb +++ b/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 diff --git a/bootstrap/templates/default/sv-chef-server-webui-run.erb b/bootstrap/templates/default/sv-chef-server-webui-run.erb index ebc855f10..88261ba77 100644 --- a/bootstrap/templates/default/sv-chef-server-webui-run.erb +++ b/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 diff --git a/bootstrap/templates/default/sv-chef-solr-indexer-run.erb b/bootstrap/templates/default/sv-chef-solr-indexer-run.erb index 0b01719e9..be8b7bb49 100644 --- a/bootstrap/templates/default/sv-chef-solr-indexer-run.erb +++ b/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 diff --git a/bootstrap/templates/default/sv-chef-solr-run.erb b/bootstrap/templates/default/sv-chef-solr-run.erb index 45812c3bc..5e6e54369 100644 --- a/bootstrap/templates/default/sv-chef-solr-run.erb +++ b/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 diff --git a/chef/templates/default/chef_server.conf.erb b/chef/templates/default/chef_server.conf.erb index e8c8c8fe5..f15bd7334 100644 --- a/chef/templates/default/chef_server.conf.erb +++ b/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" - 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 @@ -31,22 +31,22 @@ RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f RewriteRule ^/(.*)$ balancer://chef_server%{REQUEST_URI} [P,QSA,L] -<% if @node[:chef][:webui_enabled] -%> +<% if node[:chef][:webui_enabled] -%> # Server Proxy for WebUI 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" - 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 diff --git a/chef/templates/default/client.rb.erb b/chef/templates/default/client.rb.erb index 5e3185395..2de484265 100644 --- a/chef/templates/default/client.rb.erb +++ b/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" diff --git a/chef/templates/default/server.rb.erb b/chef/templates/default/server.rb.erb index 97ac84e87..897c13017 100644 --- a/chef/templates/default/server.rb.erb +++ b/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" diff --git a/chef/templates/default/sv-chef-client-run.erb b/chef/templates/default/sv-chef-client-run.erb index 5bbd8e925..093835eaf 100644 --- a/chef/templates/default/sv-chef-client-run.erb +++ b/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] %> diff --git a/chef/templates/default/sv-chef-server-run.erb b/chef/templates/default/sv-chef-server-run.erb index 9a2f05a70..2c6563732 100644 --- a/chef/templates/default/sv-chef-server-run.erb +++ b/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 diff --git a/chef/templates/default/sv-chef-server-webui-run.erb b/chef/templates/default/sv-chef-server-webui-run.erb index 8e18e69a8..ad0baa1da 100644 --- a/chef/templates/default/sv-chef-server-webui-run.erb +++ b/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 diff --git a/chef/templates/default/sv-chef-solr-indexer-run.erb b/chef/templates/default/sv-chef-solr-indexer-run.erb index 0b01719e9..be8b7bb49 100644 --- a/chef/templates/default/sv-chef-solr-indexer-run.erb +++ b/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 diff --git a/chef/templates/default/sv-chef-solr-run.erb b/chef/templates/default/sv-chef-solr-run.erb index 45812c3bc..5e6e54369 100644 --- a/chef/templates/default/sv-chef-solr-run.erb +++ b/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 diff --git a/database/templates/default/app_grants.sql.erb b/database/templates/default/app_grants.sql.erb index 3004f973f..fc9acab57 100644 --- a/database/templates/default/app_grants.sql.erb +++ b/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 %>'); diff --git a/djbdns/templates/default/sv-axfrdns-run.erb b/djbdns/templates/default/sv-axfrdns-run.erb index 338cafd43..1b9038dd4 100644 --- a/djbdns/templates/default/sv-axfrdns-run.erb +++ b/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' diff --git a/djbdns/templates/default/sv-public-dnscache-run.erb b/djbdns/templates/default/sv-public-dnscache-run.erb index 32b62487a..f91686393 100644 --- a/djbdns/templates/default/sv-public-dnscache-run.erb +++ b/djbdns/templates/default/sv-public-dnscache-run.erb @@ -2,5 +2,5 @@ exec 2>&1 exec /dnscache + exec chpst -U dnscache -o250 -d "$DATALIMIT" <%= node[:djbdns][:bin_dir] %>/dnscache ' diff --git a/djbdns/templates/default/sv-tinydns-internal-run.erb b/djbdns/templates/default/sv-tinydns-internal-run.erb index 9a4b80c17..e42ad4b71 100644 --- a/djbdns/templates/default/sv-tinydns-internal-run.erb +++ b/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 diff --git a/djbdns/templates/default/sv-tinydns-run.erb b/djbdns/templates/default/sv-tinydns-run.erb index 9a4b80c17..e42ad4b71 100644 --- a/djbdns/templates/default/sv-tinydns-run.erb +++ b/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 diff --git a/djbdns/templates/default/tinydns-data.erb b/djbdns/templates/default/tinydns-data.erb index 2a7a5df8a..2c482579c 100644 --- a/djbdns/templates/default/tinydns-data.erb +++ b/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 \ No newline at end of file +.<%= node[:domain] %>:<%= node[:djbdns][:tinydns_ipaddress] %>:a:259200 \ No newline at end of file diff --git a/djbdns/templates/default/tinydns-internal-data.erb b/djbdns/templates/default/tinydns-internal-data.erb index 314e5d9cf..64170124b 100644 --- a/djbdns/templates/default/tinydns-internal-data.erb +++ b/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 \ No newline at end of file +.<%= node[:domain] %>:<%= node[:djbdns][:tinydns_internal_ipaddress] %>:a:259200 \ No newline at end of file diff --git a/dynomite/templates/default/sv-dynomite-run.erb b/dynomite/templates/default/sv-dynomite-run.erb index 459e1819f..90b4fa735 100644 --- a/dynomite/templates/default/sv-dynomite-run.erb +++ b/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] %> diff --git a/gems/templates/default/gem_server.conf.erb b/gems/templates/default/gem_server.conf.erb index 8e7b12ba0..682377f2e 100644 --- a/gems/templates/default/gem_server.conf.erb +++ b/gems/templates/default/gem_server.conf.erb @@ -3,7 +3,7 @@ ### - ServerAdmin ops@<%= @node[:domain] %> + ServerAdmin ops@<%= node[:domain] %> <% if @virtual_host_name -%> ServerName <%= @virtual_host_name %> <% end -%> @@ -26,13 +26,13 @@ allow from all - 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 \ No newline at end of file diff --git a/glassfish/templates/default/answer_file.erb b/glassfish/templates/default/answer_file.erb index 4880d890f..a14854711 100644 --- a/glassfish/templates/default/answer_file.erb +++ b/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] %> diff --git a/glassfish/templates/default/glassfish-init.d-script.erb b/glassfish/templates/default/glassfish-init.d-script.erb index f402c7750..d5d644dfc 100644 --- a/glassfish/templates/default/glassfish-init.d-script.erb +++ b/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() { diff --git a/god/templates/default/master.god.erb b/god/templates/default/master.god.erb index 28362583a..80eaaca97 100644 --- a/god/templates/default/master.god.erb +++ b/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 diff --git a/hadoop/templates/default/cloudera.list.erb b/hadoop/templates/default/cloudera.list.erb index ab9e5b89e..54fb2d4a1 100644 --- a/hadoop/templates/default/cloudera.list.erb +++ b/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 diff --git a/instiki/templates/default/instiki.conf.erb b/instiki/templates/default/instiki.conf.erb index 2602e6a69..d75a96356 100644 --- a/instiki/templates/default/instiki.conf.erb +++ b/instiki/templates/default/instiki.conf.erb @@ -14,7 +14,7 @@ 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 diff --git a/jira/templates/default/apache.conf.erb b/jira/templates/default/apache.conf.erb index 1f472f482..f7dc28453 100644 --- a/jira/templates/default/apache.conf.erb +++ b/jira/templates/default/apache.conf.erb @@ -1,20 +1,20 @@ - 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 diff --git a/jira/templates/default/entityengine.xml.erb b/jira/templates/default/entityengine.xml.erb index 3dd6635a4..3209b1107 100644 --- a/jira/templates/default/entityengine.xml.erb +++ b/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. --> - \ No newline at end of file diff --git a/tomcat6/templates/default/tomcat-users.xml.erb b/tomcat6/templates/default/tomcat-users.xml.erb index d81c58318..e5190f564 100644 --- a/tomcat6/templates/default/tomcat-users.xml.erb +++ b/tomcat6/templates/default/tomcat-users.xml.erb @@ -1,5 +1,5 @@ - + diff --git a/tomcat6/templates/default/tomcat6.conf.erb b/tomcat6/templates/default/tomcat6.conf.erb index e1746a26b..c51fad3fb 100644 --- a/tomcat6/templates/default/tomcat6.conf.erb +++ b/tomcat6/templates/default/tomcat6.conf.erb @@ -9,22 +9,22 @@ # # Where your java installation lives -JAVA_HOME="<%= @node[:tomcat6][:java_home]%>" +JAVA_HOME="<%= node[:tomcat6][:java_home]%>" # Where your tomcat installation lives -CATALINA_BASE="<%= @node[:tomcat6][:home]%>" -CATALINA_HOME="<%= @node[:tomcat6][:home]%>" -JASPER_HOME="<%= @node[:tomcat6][:home]%>" -CATALINA_TMPDIR="<%= @node[:tomcat6][:temp]%>" +CATALINA_BASE="<%= node[:tomcat6][:home]%>" +CATALINA_HOME="<%= node[:tomcat6][:home]%>" +JASPER_HOME="<%= node[:tomcat6][:home]%>" +CATALINA_TMPDIR="<%= node[:tomcat6][:temp]%>" # You can pass some parameters to java here if you wish to #JAVA_OPTS="-Xminf0.1 -Xmaxf0.3" -JAVA_OPTS="-Dcom.sun.management.snmp.interface=0.0.0.0 -Dcom.sun.management.snmp.acl=false -Dcom.sun.management.snmp.port=1161 <%= @node[:tomcat6][:java_opts]%> " +JAVA_OPTS="-Dcom.sun.management.snmp.interface=0.0.0.0 -Dcom.sun.management.snmp.acl=false -Dcom.sun.management.snmp.port=1161 <%= node[:tomcat6][:java_opts]%> " # Use JAVA_OPTS to set java.library.path for libtcnative.so #JAVA_OPTS="-Djava.library.path=/usr/lib" #JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n" # What user should run tomcat -TOMCAT_USER="<%= @node[:tomcat6][:user]%>" +TOMCAT_USER="<%= node[:tomcat6][:user]%>" # You can change your tomcat locale here #LANG="en_US" diff --git a/wordpress/recipes/default.rb b/wordpress/recipes/default.rb index ed14d729f..251d18185 100644 --- a/wordpress/recipes/default.rb +++ b/wordpress/recipes/default.rb @@ -71,8 +71,8 @@ execute "create #{node[:wordpress][:db][:database]} database" do command "/usr/bin/mysqladmin -u root -p#{node[:mysql][:server_root_password]} create #{node[:wordpress][:db][:database]}" not_if do - m = Mysql.new("localhost", "root", @node[:mysql][:server_root_password]) - m.list_dbs.include?(@node[:wordpress][:db][:database]) + m = Mysql.new("localhost", "root", node[:mysql][:server_root_password]) + m.list_dbs.include?(node[:wordpress][:db][:database]) end end diff --git a/wordpress/templates/default/grants.sql.erb b/wordpress/templates/default/grants.sql.erb index 61276894b..1b4d8f101 100644 --- a/wordpress/templates/default/grants.sql.erb +++ b/wordpress/templates/default/grants.sql.erb @@ -1,5 +1,5 @@ GRANT ALL ON <%= @database %>.* TO '<%= @user %>'@'%' IDENTIFIED BY '<%= @password %>'; -SET PASSWORD FOR 'root'@'localhost' = PASSWORD('<%= @node[:mysql][:server_root_password] %>'); +SET PASSWORD FOR 'root'@'localhost' = PASSWORD('<%= node[:mysql][:server_root_password] %>'); FLUSH PRIVILEGES; diff --git a/wordpress/templates/default/wordpress.conf.erb b/wordpress/templates/default/wordpress.conf.erb index 8dfaaf43f..36715bc1d 100644 --- a/wordpress/templates/default/wordpress.conf.erb +++ b/wordpress/templates/default/wordpress.conf.erb @@ -16,11 +16,11 @@ 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