recipiez 0.1.5 → 0.1.6

data/lib/recipiez/version.rb

@@ -1,3 +1,3 @@
 module Recipiez
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/recipes/apache.rb

@@ -16,19 +16,13 @@ Capistrano::Configuration.instance(true).load do
 
     desc "PHP Vhost Setup"
     task :php_vhost do
-
-      unless exists? :apache_port
-        set :apache_port, '80'
-      end
       
-      unless exists? :allowed_ips
-        set :allowed_ips, []
-      end
+      _cset :apache_port, '80'
+      _cset :allowed_ips, []
+      _cset :server_aliases, []
+      _cset :ssl, 'off'
+      _cset :ssl_chain, 'none'
       
-      unless exists? :server_aliases
-        set :server_aliases, []
-      end
-
       logger.info "generating .conf file"
       logger.info "placing #{application}.conf on remote server"
       apache_conf = "/etc/apache2/sites-available/#{application}"

data/recipes/ssl.rb

@@ -2,27 +2,30 @@ Capistrano::Configuration.instance(true).load do
   
   namespace :ssl do
 
-    desc "Uploads certificates to the server, default to /etc/certs"
+    desc "Uploads certificates to the server, default to /etc/certs, supports ssl_cert_path, ssl_key_path, ssl_chain_path"
     task :upload_certificate_pairs do
 
       _cset :base_cert_path, "/etc/certs"
       _cset :ssl_cert_path, ""
       _cset :ssl_key_path, ""
-
-
-      put File.read(ssl_cert_path), File.basename(ssl_cert_path)
-      put File.read(ssl_key_path), File.basename(ssl_key_path)
-
+      
       begin
         sudo "mkdir #{base_cert_path}"
       rescue
         # ignore
       end
 
+      put File.read(ssl_cert_path), File.basename(ssl_cert_path)
+      put File.read(ssl_key_path), File.basename(ssl_key_path)
+      
+      if exists? :ssl_chain_path
+        File.read(ssl_chain_path), File.basename(ssl_chain_path)
+        sudo "mv #{File.basename(ssl_chain_path)} #{base_cert_path}/#{File.basename(ssl_chain_path)}"
+      end
+
       sudo "mv #{File.basename(ssl_cert_path)} #{base_cert_path}/#{File.basename(ssl_cert_path)}"
       sudo "mv #{File.basename(ssl_key_path)} #{base_cert_path}/#{File.basename(ssl_key_path)}"
 
-
     end
 
   end

data/recipes/templates/php_vhost.erb

@@ -17,4 +17,39 @@ DocumentRoot <%= deploy_to %>/current/public
   Options -Indexes
 </Directory>
 
-</VirtualHost>
+</VirtualHost>
+
+
+<% if ssl == 'on' %>
+
+<VirtualHost *:443>
+  ServerName <%= app_domain %>
+  
+  CustomLog     /var/log/apache2/<%= app_domain %>-access.log combined
+  ErrorLog      /var/log/apache2/<%= app_domain %>-error.log
+  DocumentRoot <%= deploy_to %>/current/public
+  
+  SSLEngine on
+  SSLCertificateFile    <%= ssl_cert %>
+  SSLCertificateKeyFile <%= ssl_key %>
+  
+  <% if ssl_chain != 'none' %>
+  SSLCertificateChainFile <%= ssl_chain %>
+  <% end %>
+  
+  SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+  
+</VirtualHost>
+
+<% end %>  
+  
+  
+    DocumentRoot /var/www-apps/activecollab/public
+
+    SSLEngine on
+    SSLCertificateFile    /etc/apache2/ssl/project.blissio.com.crt
+    SSLCertificateKeyFile /etc/apache2/ssl/project.blissio.com.key
+    SSLCertificateChainFile /etc/apache2/ssl/globalsign.roots.crt
+    SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+
+    RewriteEngine On

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: recipiez
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Alastair Brunton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 +01:00
+date: 2011-12-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency