provizioning 0.8.5 → 0.8.6

data/lib/provizioning/version.rb

@@ -1,3 +1,3 @@
 module Provizioning
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/puppet/modules/nginx/files/init-php-fastcgi

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+### BEGIN INIT INFO                                                                                                                     
+# Provides:          php-fastcgi                                                                                                        
+# Required-Start:    $remote_fs $syslog                                                                                                 
+# Required-Stop:     $remote_fs $syslog                                                                                                 
+# Default-Start:     2 3 4 5                                                                                                            
+# Default-Stop:      0 1 6                                                                                                              
+# Short-Description: Start daemon at boot time                                                                                          
+# Description:       Enable service provided by daemon.                                                                                 
+### END INIT INFO                                                                                                                       
+
+
+
+if [ `grep -c "nginx" /etc/passwd` = "1" ]; then 
+   FASTCGI_USER=nginx
+elif [ `grep -c "www-data" /etc/passwd` = "1" ]; then 
+   FASTCGI_USER=www-data
+elif [ `grep -c "http" /etc/passwd` = "1" ]; then 
+   FASTCGI_USER=http
+else 
+# Set the FASTCGI_USER variable below to the user that 
+# you want to run the php-fastcgi processes as
+
+FASTCGI_USER=
+fi
+
+PHP_SCRIPT=/usr/bin/php-fastcgi
+RETVAL=0
+case "$1" in
+    start)
+      sudo -u $FASTCGI_USER $PHP_SCRIPT
+      RETVAL=$?
+  ;;
+    stop)
+      killall -9 php5-cgi
+      RETVAL=$?
+  ;;
+    restart)
+      killall -9 php5-cgi
+      sudo -u $FASTCGI_USER $PHP_SCRIPT
+      RETVAL=$?
+  ;;
+    *)
+      echo "Usage: php-fastcgi {start|stop|restart}"
+      exit 1
+  ;;
+esac      
+exit $RETVAL

data/puppet/modules/nginx/files/php-fastcgi

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ `grep -c "nginx" /etc/passwd` = "1" ]; then 
+   FASTCGI_USER=nginx
+elif [ `grep -c "www-data" /etc/passwd` = "1" ]; then 
+   FASTCGI_USER=www-data
+elif [ `grep -c "http" /etc/passwd` = "1" ]; then 
+   FASTCGI_USER=http
+else 
+# Set the FASTCGI_USER variable below to the user that 
+# you want to run the php-fastcgi processes as
+
+FASTCGI_USER=
+fi
+
+/usr/bin/spawn-fcgi -a 127.0.0.1 -p 9000 -C 6 -u $FASTCGI_USER -f /usr/bin/php5-cgi

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

@@ -72,6 +72,41 @@ class nginx::fcgi inherits nginx {
       default => $error_log,
     }
 
+    $packagelist = ['php5-cgi', 'psmisc', 'spawn-fcgi']
+    package { $packagelist: 
+      ensure => installed,
+    }
+
+    file {"/var/run/php-fastcgi":
+      ensure => directory,
+      owner => 'www-data', group => 'www-data'
+    }
+
+    file {"/usr/bin/php-fastcgi":
+      source => 'puppet:///modules/nginx/php-fastcgi',
+      owner => 'root', group => 'root', mode => '0777',
+      ensure => present,
+    }
+
+    file {"/etc/init.d/init-php-fastcgi":
+      source => 'puppet:///modules/nginx/init-php-fastcgi',
+      owner => 'root', group => 'root', mode => '0777',
+      ensure => present,
+    }
+
+    service {"init-php-fastcgi":
+      ensure => running,
+      subscribe => File['/usr/bin/php-fastcgi'],
+      enable => true,
+      hasstatus => false,
+      pattern => '/usr/bin/php5-cgi',
+      require => [
+        File['/usr/bin/php-fastcgi'], 
+        File['/etc/init.d/init-php-fastcgi'], 
+        File['/var/run/php-fastcgi']
+      ],
+    }
+    
 		#Autogenerating ssl certs
 		if $listen == '443' and  $ensure == 'present' and ( $ssl_certificate == '' or $ssl_certificate_key == '') {
 			exec {"generate-${name}-certs":

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

@@ -3,226 +3,226 @@
 # Install nginx.
 #
 # Parameters:
-#	* $nginx_user. Defaults to 'www-data'. 
-#	* $nginx_worker_processes. Defaults to '1'.
-#	* $nginx_worker_connections. Defaults to '1024'.
+# * $nginx_user. Defaults to 'www-data'. 
+# * $nginx_worker_processes. Defaults to '1'.
+# * $nginx_worker_connections. Defaults to '1024'.
 #
 # Create config directories :
-#	* /etc/nginx/conf.d for http config snippet
-#	* /etc/nginx/includes for sites includes
+# * /etc/nginx/conf.d for http config snippet
+# * /etc/nginx/includes for sites includes
 #
 # Provide 3 definitions : 
-#	* nginx::config (http config snippet)
-#	* nginx::site (http site)
-#	* nginx::site_include (site includes)
+# * nginx::config (http config snippet)
+# * nginx::site (http site)
+# * nginx::site_include (site includes)
 #
 # Templates:
-# 	- nginx.conf.erb => /etc/nginx/nginx.conf
+#   - nginx.conf.erb => /etc/nginx/nginx.conf
 #
 
 class nginx {
-	include "nginx::$operatingsystem"
+  include "nginx::$operatingsystem"
 
-	$nginx_includes = "/etc/nginx/includes"
-	$nginx_conf = "/etc/nginx/conf.d"
+  $nginx_includes = "/etc/nginx/includes"
+  $nginx_conf = "/etc/nginx/conf.d"
 
-	$real_nginx_user = $nginx_user ? { '' => 'www-data', default => $nginx_user }
-	$real_nginx_worker_processes = $nginx_worker_processes ? { '' => '1', default => $nginx_worker_processes }
-	$real_nginx_worker_connections = $nginx_worker_connections ? { '' => '1024', default => $nginx_worker_connections }
+  $real_nginx_user = $nginx_user ? { '' => 'www-data', default => $nginx_user }
+  $real_nginx_worker_processes = $nginx_worker_processes ? { '' => '1', default => $nginx_worker_processes }
+  $real_nginx_worker_connections = $nginx_worker_connections ? { '' => '1024', default => $nginx_worker_connections }
 
-	if ! defined(Package['nginx']) { package { nginx: ensure => installed }}
+  if ! defined(Package['nginx']) { package { nginx: ensure => installed }}
 
-	service { nginx:
+  service { nginx:
         ensure => running,
         enable => true,
-		hasrestart => true,
-		require => [File["/etc/nginx/nginx.conf"], File["/etc/apt/sources.list.d/nginx.list"]],
-	}
-
-	class ubuntu {
-    	include apt
-
-    	exec {"get-nginx-apt-key":
-        	command => "apt-key adv --keyserver keyserver.ubuntu.com --recv C300EE8C"
-      	}
-      	
-		file {"/etc/apt/sources.list.d/nginx.list":
-			ensure => present,
-			owner => root,
-			group => root,
-			content => $operatingsystemrelease ? {
-				'10.04' => 'deb http://ppa.launchpad.net/nginx/stable/ubuntu lucid main',
-				'11.04' => 'deb http://ppa.launchpad.net/nginx/stable/ubuntu natty main',
-			},
-			require => Exec["get-nginx-apt-key"],
-		}
-
-		exec {"update apt to find nginx":
-			command => "/usr/bin/apt-get -y update",
-			require => File["/etc/apt/sources.list.d/nginx.list"],
-		}
+    hasrestart => true,
+    require => [File["/etc/nginx/nginx.conf"], File["/etc/apt/sources.list.d/nginx.list"]],
+  }
+
+  class ubuntu {
+      include apt
+
+      exec {"get-nginx-apt-key":
+          command => "apt-key adv --keyserver keyserver.ubuntu.com --recv C300EE8C"
+        }
+        
+    file {"/etc/apt/sources.list.d/nginx.list":
+      ensure => present,
+      owner => root,
+      group => root,
+      content => $operatingsystemrelease ? {
+        '10.04' => 'deb http://ppa.launchpad.net/nginx/stable/ubuntu lucid main',
+        '11.04' => 'deb http://ppa.launchpad.net/nginx/stable/ubuntu natty main',
+      },
+      require => Exec["get-nginx-apt-key"],
+    }
+
+    exec {"update apt to find nginx":
+      command => "/usr/bin/apt-get -y update",
+      require => File["/etc/apt/sources.list.d/nginx.list"],
+    }
     }
 
     file { "/etc/nginx/nginx.conf":
-		ensure 	=> present,
-		mode 	=> 644,
-		owner 	=> root,
-		group 	=> root,
-		content => template("nginx/nginx.conf.erb"),
-		notify 	=> Exec["reload-nginx"],
-		require => Package["nginx"],
+    ensure  => present,
+    mode  => 644,
+    owner   => root,
+    group   => root,
+    content => template("nginx/nginx.conf.erb"),
+    notify  => Exec["reload-nginx"],
+    require => Package["nginx"],
     }
 
-	file { $nginx_conf:
-		ensure => directory,
-		mode => 644, 
-		owner => root, 
-		group => root,
-		require => Package["nginx"],
-	}
-
-	file { "/etc/nginx/ssl":
-		ensure => directory,
-		mode => 644, 
-		owner => root, 
-		group => root,
-		require => Package["nginx"],
-	}
-
-	file { $nginx_includes:
-		ensure => directory,
-		mode => 644, 
-		owner => root, 
-		group => root,
-		require => Package["nginx"],
-	}
-
-	#Nuke default files
-	file { "/etc/nginx/fastcgi_params":
-		ensure => absent,
-		require => Package["nginx"],
-	}
-
-
-	exec { "reload-nginx":
-		command => "/etc/init.d/nginx reload",
+  file { $nginx_conf:
+    ensure => directory,
+    mode => 644, 
+    owner => root, 
+    group => root,
+    require => Package["nginx"],
+  }
+
+  file { "/etc/nginx/ssl":
+    ensure => directory,
+    mode => 644, 
+    owner => root, 
+    group => root,
+    require => Package["nginx"],
+  }
+
+  file { $nginx_includes:
+    ensure => directory,
+    mode => 644, 
+    owner => root, 
+    group => root,
+    require => Package["nginx"],
+  }
+
+  #Nuke default files
+  file { "/etc/nginx/fastcgi_params":
+    ensure => absent,
+    require => Package["nginx"],
+  }
+
+
+  exec { "reload-nginx":
+    command => "/etc/init.d/nginx reload",
         refreshonly => true,
     }
 
-	# Define: nginx::config
-	#
-	# Define a nginx config snippet. Places all config snippets into
-	# /etc/nginx/conf.d, where they will be automatically loaded by http module
-	#
-	#
-	# Parameters :
-	# * ensure: typically set to "present" or "absent". Defaults to "present"
-	# * content: set the content of the config snipppet. Defaults to 'template("nginx/${name}.conf.erb")'
-	# * order: specifies the load order for this config snippet. Defaults to "500"
-	#
-        define config ( $ensure = 'present', $content = '', $order="500") {
-          $real_content = $content ? { '' => template("nginx/${name}.conf.erb"),
-            default => $content,
-          }
-
-          file { "${nginx_conf}/${order}-${name}.conf":
-		ensure => $ensure,
-		content => $real_content,
-		mode => 644,
-		owner => root,
-		group => root,
-		notify => Exec["reload-nginx"],
-    		}
+  # Define: nginx::config
+  #
+  # Define a nginx config snippet. Places all config snippets into
+  # /etc/nginx/conf.d, where they will be automatically loaded by http module
+  #
+  #
+  # Parameters :
+  # * ensure: typically set to "present" or "absent". Defaults to "present"
+  # * content: set the content of the config snipppet. Defaults to 'template("nginx/${name}.conf.erb")'
+  # * order: specifies the load order for this config snippet. Defaults to "500"
+  #
+  define config ($ensure = 'present', $content = '', $order="500") {
+    $real_content = $content ? { '' => template("nginx/${name}.conf.erb"),
+      default => $content,
+    }
+
+    file { "${nginx_conf}/${order}-${name}.conf":
+        ensure => $ensure,
+        content => $real_content,
+        mode => 644,
+        owner => root,
+        group => root,
+        notify => Exec["reload-nginx"],
+    }
+  }
+
+  # Define: nginx::site
+  #
+  # Install a nginx site in /etc/nginx/sites-available (and symlink in /etc/nginx/sites-enabled). 
+  #
+  #
+  # Parameters :
+  # * ensure: typically set to "present" or "absent". Defaults to "present"
+  # * content: site definition (should be a template).
+  #
+  define site($ensure = 'present', $content = '') {
+    case $ensure {
+      'present' : {
+        nginx::install_site { $name:
+            content => $content
+        }
+      }
+      'absent' : {
+        exec { "rm -f /etc/nginx/sites-enabled/$name":
+          onlyif => "/bin/sh -c '[ -L /etc/nginx/sites-enabled/$name ] \\
+              && [ /etc/nginx/sites-enabled/$name -ef /etc/nginx/sites-available/$name ]'",
+          notify => Exec["reload-nginx"],
+          require => Package["nginx"],
+        }
+      }
+      default: { err ( "Unknown ensure value: '$ensure'" ) }
+    }
+  }
+
+  # Define: install_site
+  #
+  # Install nginx vhost
+  # This definition is private, not intended to be called directly
+  #
+  define install_site($content = '' ) {
+    # first, make sure the site config exists
+    case $content {
+      '': {
+        file { "/etc/nginx/sites-available/${name}":
+          mode => 644,
+          owner => root,
+          group => root,
+          ensure => present,
+          alias => "sites-$name",
+            require => Package["nginx"],
+            notify => Exec["reload-nginx"],
         }
+      }
+
+      default: {
+          file { "/etc/nginx/sites-available/${name}":
+            content => $content,
+            mode => 644,
+            owner => root,
+            group => root,
+                ensure => present,
+                alias => "sites-$name",
+            require => Package["nginx"],
+            notify => Exec["reload-nginx"],
+        }
+      }
+    }
 
-	# Define: nginx::site
-	#
-	# Install a nginx site in /etc/nginx/sites-available (and symlink in /etc/nginx/sites-enabled). 
-	#
-	#
-	# Parameters :
-	# * ensure: typically set to "present" or "absent". Defaults to "present"
-	# * content: site definition (should be a template).
-	#
-	define site($ensure = 'present', $content = '') {
-		case $ensure {
-			'present' : {
-				nginx::install_site { $name:
-		  			content => $content
-				}
-			}
-			'absent' : {
-				exec { "rm -f /etc/nginx/sites-enabled/$name":
-					onlyif => "/bin/sh -c '[ -L /etc/nginx/sites-enabled/$name ] \\
-							&& [ /etc/nginx/sites-enabled/$name -ef /etc/nginx/sites-available/$name ]'",
-					notify => Exec["reload-nginx"],
-					require => Package["nginx"],
-				}
-			}
-			default: { err ( "Unknown ensure value: '$ensure'" ) }
-		}
-	}
-
-	# Define: install_site
-	#
-	# Install nginx vhost
-	# This definition is private, not intended to be called directly
-	#
-	define install_site($content = '' ) {
-	  # first, make sure the site config exists
-		case $content {
-			'': {
-				file { "/etc/nginx/sites-available/${name}":
-					mode => 644,
-					owner => root,
-					group => root,
-					ensure => present,
-					alias => "sites-$name",
-				  	require => Package["nginx"],
-				  	notify => Exec["reload-nginx"],
-				}
-			}
-
-			default: {
-				  file { "/etc/nginx/sites-available/${name}":
-				  	content => $content,
-				  	mode => 644,
-				  	owner => root,
-				  	group => root,
-				      	ensure => present,
-				      	alias => "sites-$name",
-				  	require => Package["nginx"],
-				  	notify => Exec["reload-nginx"],
-				}
-			}
-		}
-
-	  # now, enable it.
-		exec { "ln -s /etc/nginx/sites-available/${name} /etc/nginx/sites-enabled/${name}":
-			unless => "/bin/sh -c '[ -L /etc/nginx/sites-enabled/$name ] \\
+    # now, enable it.
+    exec { "ln -s /etc/nginx/sites-available/${name} /etc/nginx/sites-enabled/${name}":
+      unless => "/bin/sh -c '[ -L /etc/nginx/sites-enabled/$name ] \\
                                                                 && [ /etc/nginx/sites-enabled/$name -ef /etc/nginx/sites-available/$name ]'",
-			notify => Exec["reload-nginx"],
-			require => File["sites-$name"],
-		}
-	}
-
-	# Define: site_include
-	#
-	# Define a site config include in /etc/nginx/includes
-	#
-	# Parameters :
-	# * ensure: typically set to "present" or "absent". Defaults to "present"
-	# * content: include definition (should be a template).
-	#
-	define site_include ( $ensure = 'present', $content = '' ) {
-		file { "${nginx_includes}/${name}.inc":
-			content => $content,
-			mode => 644,
-			owner => root,
-			group => root,
-			ensure => $ensure,
-			require => File["${nginx_includes}"],
-			notify => Exec["reload-nginx"],
-		}    
-	}
+      notify => Exec["reload-nginx"],
+      require => File["sites-$name"],
+    }
+  }
+
+  # Define: site_include
+  #
+  # Define a site config include in /etc/nginx/includes
+  #
+  # Parameters :
+  # * ensure: typically set to "present" or "absent". Defaults to "present"
+  # * content: include definition (should be a template).
+  #
+  define site_include($ensure = 'present', $content = '') {
+    file { "${nginx::nginx_includes}/${name}.inc":
+      content => $content,
+      mode => 644,
+      owner => root,
+      group => root,
+      ensure => $ensure,
+      require => File["${nginx::nginx_includes}"],
+      notify => Exec["reload-nginx"],
+    }    
+  }
 }

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

@@ -44,11 +44,12 @@ server {
       # 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$ {
+    location ~ \.php$ {
       fastcgi_split_path_info ^(.+\.php)(/.+)$;
       # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
-      include /etc/nginx/fastcgi_params;
+      include /etc/nginx/includes/fastcgi_params.inc;
       fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
       fastcgi_intercept_errors on;
 		  fastcgi_pass <%= fastcgi_pass %>;

data/puppet/site.pp

@@ -1,5 +1,13 @@
 Exec {
-  path => "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
+  path => [
+    '/usr/local/sbin',
+    '/usr/local/bin',
+    '/opt/local/bin',
+    '/usr/bin', 
+    '/usr/sbin', 
+    '/bin',
+    '/sbin'],
+  logoutput => true,
 }
 
 import "classes/*"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: provizioning
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70236230682540 !ruby/object:Gem::Requirement
+  requirement: &70322742592560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236230682540
+  version_requirements: *70322742592560
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &70236230681920 !ruby/object:Gem::Requirement
+  requirement: &70322742582000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236230681920
+  version_requirements: *70322742582000
 description: Puppet server provisioning tools, recipes and templates
 email:
 - victor.castell@season.es
@@ -173,6 +173,8 @@ files:
 - puppet/modules/mysql/templates/variables_mysql.erb
 - puppet/modules/network/README
 - puppet/modules/network/manifests/init.pp
+- puppet/modules/nginx/files/init-php-fastcgi
+- puppet/modules/nginx/files/php-fastcgi
 - puppet/modules/nginx/manifests/fcgi.pp
 - puppet/modules/nginx/manifests/init.pp
 - puppet/modules/nginx/templates/fcgi_drupal_site.erb