@@ -1,6 +1,6 @@ <% @path = "/etc/apache2/mods-available/deflate.conf" - @post = "cd /etc/apache2/mods-enabled && ln -s ../mods-available/deflate.conf && ln -s ../mods-available/deflate.load" + @post = "a2enmod deflate" %> <IfModule mod_deflate.c> SetOutputFilter DEFLATE generators/vulcanize/templates/apache/config/rubber/role/web/deflate.conf @@ -1,6 +1,6 @@ <% @path = "/etc/apache2/mods-available/expires.conf" - @post = "cd /etc/apache2/mods-enabled && ln -s ../mods-available/expires.conf && ln -s ../mods-available/expires.load" + @post = "a2enmod expires" %> ExpiresActive On <FilesMatch "\.(ico|gif|jpe?g|png|js|css)$"> generators/vulcanize/templates/apache/config/rubber/role/web/expires.conf @@ -1,6 +1,6 @@ <% @path = "/etc/apache2/mods-available/headers.conf" - @post = "cd /etc/apache2/mods-enabled && ln -s ../mods-available/headers.conf && ln -s ../mods-available/headers.load" + @post = "a2enmod headers" %> # Make sure proxies don't deliver the wrong content Header append Vary User-Agent env=!dont-vary generators/vulcanize/templates/apache/config/rubber/role/web/headers.conf @@ -1,6 +1,6 @@ <% @path = "/etc/apache2/mods-available/setenvif.conf" - @post = "cd /etc/apache2/mods-enabled && ln -fs ../mods-available/setenvif.conf && ln -fs ../mods-available/setenvif.load" + @post = "a2enmod setenvif" %> <IfModule mod_setenvif.c> generators/vulcanize/templates/apache/config/rubber/role/web/setenvif.conf @@ -1,6 +1,6 @@ <% @path = "/etc/apache2/sites-available/#{rubber_env.app_name}" - @post = "a2ensite #{rubber_env.app_name} && /etc/init.d/apache2 restart" + @post = "a2enmod rewrite && a2ensite #{rubber_env.app_name} && /etc/init.d/apache2 reload" %> <VirtualHost *:80> ServerName <%= rubber_env.domain %> generators/vulcanize/templates/apache/config/rubber/role/web/vhost.conf 3ad015988c0563275d129db0886768529e0e6276 Kevin Menard nirvdrum@gmail.com http://github.com/wr0ngway/rubber/commit/8a392196e24e71196cbe3867adcec0b2ed9765c7 8a392196e24e71196cbe3867adcec0b2ed9765c7 2009-06-11T12:58:14-07:00 2009-06-11T05:13:14-07:00 Improvements to the apache templates. Signed-off-by: Matt Conway <wr0ngway@yahoo.com> f5fa6f8460c4eb57dfd9b2fc59d9a55bd984fbeb Matt Conway wr0ngway@yahoo.com