provizioning 0.8.2 → 0.8.3

data/lib/provizioning/version.rb

@@ -1,3 +1,3 @@
 module Provizioning
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/puppet/modules/nginx/manifests/fcgi.pp

@@ -46,7 +46,7 @@ class nginx::fcgi inherits nginx {
 	#                 fastcgi_pass    => "127.0.0.1:9000",
 	#                 server_name     => "$fqdn",
 	#          }
-	define site ( $ensure = 'present', $index = 'index.php', $root, $fastcgi_pass, $include = '', $listen = '80', $server_name = '', $access_log = '', $ssl_certificate = '', $ssl_certificate_key = '', $ssl_session_timeout = '5m') { 
+	define site ( $ensure = 'present', $index = 'index.php', $root, $fastcgi_pass, $include = '', $listen = '80', $server_name = '', $access_log = '', $error_log = '', $ssl_certificate = '', $ssl_certificate_key = '', $ssl_session_timeout = '5m') { 
 
 		$real_server_name = $server_name ? { 
 			'' => "${name}",
@@ -58,6 +58,12 @@ class nginx::fcgi inherits nginx {
             		default => $access_log,
           	}
 
+        $real_error_log = $error_log ? { 
+			'' => "/var/log/nginx/${name}_error.log",
+            		default => $error_log,
+          	}
+
+
 		#Autogenerating ssl certs
 		if $listen == '443' and  $ensure == 'present' and ( $ssl_certificate == '' or $ssl_certificate_key == '') {
 			exec {"generate-${name}-certs":

data/puppet/modules/nginx/templates/fcgi_drupal_site.erb

@@ -0,0 +1,66 @@
+server {
+    server_name  <% real_server_name.each do |s_n| -%><%= s_n %> <% end -%>;
+    access_log  <%= real_access_log %>;
+    error_log <%= real_error_log %>;
+    root <%= root %>;
+
+    client_max_body_size 50M;
+    client_body_buffer_size 128k;
+
+    location = /favicon.ico {
+      log_not_found off;
+      access_log off;
+    }
+
+    location = /robots.txt {
+      allow all;
+      log_not_found off;
+      access_log off;
+    }
+
+    # This matters if you use drush
+    location = /backup {
+      deny all;
+    }
+
+    # Very rarely should these ever be accessed outside of your LAN
+    location ~* \.(txt|log)$ {
+      allow 10.0.0.0/8;
+      allow 172.16.0.0/12;
+      allow 192.168.0.0/16;
+      deny all;
+    }
+
+    location ~ \..*/.*\.php$ {
+      return 403;
+    }
+
+    location / {
+      # This is cool because no php is touched for static content
+       try_files $uri @rewrite;
+    }
+
+    location @rewrite {
+      # Some modules enforce no slash (/) at the end of the URL
+      # Else this rewrite block wouldn't be needed (GlobalRedirect)
+       rewrite ^/(.*)$ /index.php?q=$1;
+
+           location ~ \.php$ {
+      fastcgi_split_path_info ^(.+\.php)(/.+)$;
+      # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
+      include /etc/nginx/fastcgi_params;
+      fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+      fastcgi_intercept_errors on;
+      fastcgi_pass unix:/var/run/php-fastcgi/php-fastcgi.socket;
+    }
+
+    # Fighting with ImageCache? This little gem is amazing.
+    location ~ ^/sites/.*/files/styles/ {
+      try_files $uri @rewrite;
+    }
+
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
+      expires max;
+      log_not_found off;
+    }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: provizioning
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70169789063920 !ruby/object:Gem::Requirement
+  requirement: &70093075523280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169789063920
+  version_requirements: *70093075523280
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &70169789063400 !ruby/object:Gem::Requirement
+  requirement: &70093075522760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169789063400
+  version_requirements: *70093075522760
 description: Puppet server provisioning tools, recipes and templates
 email:
 - victor.castell@season.es
@@ -175,6 +175,7 @@ files:
 - puppet/modules/network/manifests/init.pp
 - puppet/modules/nginx/manifests/fcgi.pp
 - puppet/modules/nginx/manifests/init.pp
+- puppet/modules/nginx/templates/fcgi_drupal_site.erb
 - puppet/modules/nginx/templates/fcgi_site.erb
 - puppet/modules/nginx/templates/includes/fastcgi_params.erb
 - puppet/modules/nginx/templates/nginx.conf.erb