lib/deprec/recipes/apache.rb in deprec-3.1.0.rc13 vs lib/deprec/recipes/apache.rb in deprec-3.1.0.rc15
- old
+ new
@@ -12,11 +12,11 @@
set :apache_ssl_chainfile, false
set :apache_modules_enabled,
%w(rewrite ssl proxy_balancer proxy_http deflate expires headers)
desc "Install Apache"
- task :install do
+ task :install, :roles => :web do
apt.install(
{:base => %w(apache2-mpm-prefork apache2-prefork-dev rsync ssl-cert)},
:stable )
config
end
@@ -82,11 +82,11 @@
deprec2.push_configs(:apache, SYSTEM_CONFIG_FILES[:apache])
run "#{sudo} touch /var/www/check.txt" # Used to test webserver up
end
# Stub so generic tasks don't fail (e.g. deprec:web:config_project)
- task :config_project do
+ task :config_project, :roles => :web do
# XXX Need to flesh out generation of custom certs
# In the meantime we'll just use the snakeoil cert
#
top.deprec.ssl.config if apache_ssl_enabled
end
@@ -150,10 +150,10 @@
set(:apache_vhost_document_root) {
File.join('/var/apps', "#{apache_vhost_domain}", 'public')
}
set :apache_vhost_rack_env, false
#
- task :vhost do
+ task :vhost, :roles => :web do
file = {
:template => 'vhost.erb',
:path => "/etc/apache2/sites-available/#{apache_vhost_domain}",
:mode => 0644,
:owner => 'root:root'