lib/fulmar/domain/task/optional/vhost.rb in fulmar-1.5.1 vs lib/fulmar/domain/task/optional/vhost.rb in fulmar-1.5.2

@@ -47,10 +47,11 @@
 
     desc "List existing vhosts for #{env}"
     task (vhost_count > 1 ? "list:#{env}" : 'list') do
       configuration.environment = env
       configuration.target      = target
+      configuration.merge(VHOST_DEFAULT_CONFIG)
 
       remote_shell.run 'ls -1'
       remote_shell.last_output.each do |line|
         match = line.match(/auto_vhost_(.*)\.conf/)
         if match
@@ -62,12 +63,14 @@
 
     desc "Delete a vhost for #{env}"
     task (vhost_count > 1 ? "delete:#{env}" : 'delete'), [:name] do |_t, argv|
       configuration.environment = env
       configuration.target      = target
+      configuration.merge(VHOST_DEFAULT_CONFIG)
 
       remote_shell.run [
                          "rm auto_vhost_#{argv[:name]}.conf",
+                         "rm #{configuration[:sites_enabled_dir]}/auto_vhost_#{argv[:name]}.conf",
                          "service #{configuration[:webserver] || 'nginx'} reload"
                        ]
     end
   end
 end