deprec 1.2.0 → 1.2.1

data/lib/deprec/third_party/railsmachine/recipes/apache.rb

@@ -48,7 +48,7 @@ Capistrano.configuration(:must_exist).load do
       buffer += ssl_buffer
     end
     
-    put buffer, "#{shared_path}/httpd.conf"
+    put buffer, "#{shared_path}/httpd.conf", :mode => 0444
     send(run_method, "cp #{shared_path}/httpd.conf #{apache_conf}")
     delete "#{shared_path}/httpd.conf"
   end

data/lib/deprec/third_party/railsmachine/recipes/templates/httpd-ssl.conf

@@ -58,10 +58,14 @@ SSLEngine on
 SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
 
 # Server Certificate
-SSLCertificateFile /etc/httpd/conf/ssl.crt/<%= domain %>.crt
+SSLCertificateFile /usr/local/apache2/conf/ssl.crt/<%= domain %>.crt
 
 # Server Private Key
-SSLCertificateKeyFile /etc/httpd/conf/ssl.key/<%= domain %>.key
+SSLCertificateKeyFile /usr/local/apache2/conf/ssl.key/<%= domain %>.key
+
+# XXX put this into deploy.rb
+## Intermediate keys
+# SSLCertificateChainFile /usr/local/apache2/conf/ssl.crt/<%= domain %>-chainfile.crt
 
 BrowserMatch ".*MSIE.*" \
          nokeepalive ssl-unclean-shutdown \

data/lib/deprec/third_party/railsmachine/recipes/templates/httpd.conf

@@ -57,7 +57,3 @@
   ErrorLog logs/<%= domain %>-error_log
   CustomLog logs/<%= domain %>-access_log combined
 </VirtualHost>
-
-<% if apache_ssl_enabled %>
-Include "<%= apache_ssl_config %>"
-<% end %>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: deprec
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2006-12-22 00:00:00 +11:00
+  version: 1.2.1
+date: 2006-12-27 00:00:00 +11:00
 summary: deployment recipes for capistrano
 require_paths: 
 - lib