Rewrite aliases that aren't full addresses

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index a5ceee9403578cf5e6fd319eed10d85cacfb9806..c93176e2587c1a68b4644099806dc607f81bc037 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -37,7 +37,6 @@ package %w[
   php-db
   php-fpm
   php-imagick
   php-db
   php-fpm
   php-imagick

-  php-mcrypt

   php-mysql
   php-pear
   php-pgsql
   php-mysql
   php-pear
   php-pgsql


@@ -244,7 +243,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
 
       apache_site site_name do
         template "apache.rails.erb"
 
       apache_site site_name do
         template "apache.rails.erb"

-        variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base
+        variables :application_name => name, :aliases => site_aliases, :secret_key_base => secret_key_base

       end
     else
       apache_site site_name do
       end
     else
       apache_site site_name do