recipiez 0.0.4 → 0.0.5

data/recipes/apache.rb

@@ -17,9 +17,17 @@ Capistrano::Configuration.instance(true).load do
     desc "PHP Vhost Setup"
     task :php_vhost do
 
-      unless defined? apache_port
+      unless exists? :apache_port
         set :apache_port, '80'
       end
+      
+      unless exists? :allowed_ips
+        set :allowed_ips, []
+      end
+      
+      unless exists? :server_aliases
+        set :server_aliases, []
+      end
 
       logger.info "generating .conf file"
       logger.info "placing #{application}.conf on remote server"

data/recipes/logrotate.rb

@@ -2,7 +2,12 @@ Capistrano::Configuration.instance(true).load do
 
   namespace :logrotate do
     desc "Configures logrotate for the application"
-    task :configure, :roles => :app do
+    task :configure, :roles => [:app, :web] do
+
+      unless exists? :log_directory
+        set :log_directory, 'log'
+      end
+
       generated = render('logrotate', binding)
       puts generated
       put generated, "#{application}"

data/recipes/templates/logrotate.erb

@@ -1,4 +1,4 @@
-<%= current_path %>/log/*.log {
+<%= current_path %>/<%= log_directory %>/*.log {
 daily
 missingok
 rotate 14

data/recipes/templates/passenger_vhost.erb

@@ -2,6 +2,9 @@
 ServerName <%= app_domain %>
 ServerAlias www.<%= app_domain %>
 
+CustomLog     /var/log/apache2/<%= app_domain %>-access.log combined
+ErrorLog      /var/log/apache2/<%= app_domain %>-error.log
+
 DocumentRoot <%= deploy_to %>/current/public
 RailsEnv <%= rails_env %>
 

data/recipes/templates/php_vhost.erb

@@ -1,12 +1,20 @@
-<VirtualHost *:<%= apache_port %>>
+<VirtualHost *:80>
 ServerName <%= app_domain %>
-ServerAlias www.<%= app_domain %>
+<% if server_aliases.length > 0 %>
+ServerAlias <%= server_aliases.join(" ") %>
+<% end %>
+
+CustomLog     /var/log/apache2/<%= app_domain %>-access.log combined
+ErrorLog      /var/log/apache2/<%= app_domain %>-error.log
 
 DocumentRoot <%= deploy_to %>/current/public
 
 <Directory <%= deploy_to %>/current/public>
   AllowOverride all
-  Options -MultiViews
+  <% if allowed_ips.length > 0 %>
+  Allow from <%= allowed_ips.join(" ") %>
+  <% end %>
+  Options -Indexes
 </Directory>
 
 </VirtualHost>

data/recipiez.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
  
 Gem::Specification.new do |s|
   s.name        = "recipiez"
-  s.version     = "0.0.4"
+  s.version     = "0.0.5"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Alastair Brunton"]
   s.email       = ["info@simplyexcited.co.uk"]

metadata

@@ -1,45 +1,61 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: recipiez
-version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
-authors:
+authors: 
 - Alastair Brunton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-06 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: xml-simple
-  requirement: &2157544840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2157544840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mechanize
-  requirement: &2157544400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2157544400
+  version_requirements: *id002
 description: DB Syncing, Logrotate, Apache, Thin, Basecamp, Activecollab, Monit
-email:
+email: 
 - info@simplyexcited.co.uk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - History.txt
 - MIT-LICENSE
@@ -70,28 +86,41 @@ files:
 - recipes/thin.rb
 - recipes/tolk.rb
 - recipiez.gemspec
+has_rdoc: true
 homepage: http://github.com/pyrat/deployment_recipiez
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Collection of capistrano recipies which do good things.
 test_files: []
+