provizioning 0.5.2 → 0.5.3

data/bootstrap/bootstrap.sh

@@ -34,11 +34,6 @@ apt-get -y upgrade
 # Install essential stuff ...
 ##############################################################################
 
-apt-get -y install python-software-properties
-add-apt-repository ppa:pitti/postgresql
-add-apt-repository ppa:nginx/stable
-#10gen key
-apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10
 apt-get update
 apt-get -y install build-essential
 apt-get -y install git-core

data/lib/provizioning/version.rb

@@ -1,3 +1,3 @@
 module Provizioning
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/puppet/classes/mongo.pp

@@ -52,7 +52,7 @@ class mongo {
       }
 
       package {"mongodb-10gen":
-        ensure => "2.0.2",
+        ensure => "2.0.3",
         require => [Exec["update apt to find mongodb"], File["/etc/mongodb.conf"]]
       }
     }

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

@@ -21,6 +21,7 @@
 #
 
 class nginx {
+	include "nginx::$operatingsystem"
 
 	$nginx_includes = "/etc/nginx/includes"
 	$nginx_conf = "/etc/nginx/conf.d"
@@ -32,12 +33,36 @@ class nginx {
 	if ! defined(Package['nginx']) { package { nginx: ensure => installed }}
 
 	service { nginx:
-        	ensure => running,
-        	enable => true,
+        ensure => running,
+        enable => true,
 		hasrestart => true,
-		require => File["/etc/nginx/nginx.conf"],
+		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,
@@ -46,7 +71,7 @@ class nginx {
 		content => template("nginx/nginx.conf.erb"),
 		notify 	=> Exec["reload-nginx"],
 		require => Package["nginx"],
-        }
+    }
 
 	file { $nginx_conf:
 		ensure => directory,
@@ -81,8 +106,8 @@ class nginx {
 
 	exec { "reload-nginx":
 		command => "/etc/init.d/nginx reload",
-                refreshonly => true,
-        }
+        refreshonly => true,
+    }
 
 	# Define: nginx::config
 	#
@@ -119,7 +144,7 @@ class nginx {
 	# * ensure: typically set to "present" or "absent". Defaults to "present"
 	# * content: site definition (should be a template).
 	#
-	define site ( $ensure = 'present', $content = '' ) {
+	define site($ensure = 'present', $content = '') {
 		case $ensure {
 			'present' : {
 				nginx::install_site { $name:
@@ -143,7 +168,7 @@ class nginx {
 	# Install nginx vhost
 	# This definition is private, not intended to be called directly
 	#
-	define install_site ($content = '' ) {
+	define install_site($content = '' ) {
 	  # first, make sure the site config exists
 		case $content {
 			'': {
@@ -200,6 +225,4 @@ class nginx {
 			notify => Exec["reload-nginx"],
 		}    
 	}
-
-
 }

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

@@ -13,6 +13,8 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 class postgres {
+	include "postgres::$operatingsystem"
+
 	package { [postgresql]: ensure => installed }
 	package { [libpq-dev]: ensure => installed }
 
@@ -20,6 +22,31 @@ class postgres {
         ensure => running,
         enable => true,
         hasstatus => true,
-        subscribe => [Package[postgresql]]
+        subscribe => [Package[postgresql]],
+        require => [File['/etc/apt/sources.list.d/postgres.list']]
+    }
+
+    class ubuntu {
+    	include apt
+		
+		exec {"get-postgres-apt-key":
+        	command => "apt-key adv --keyserver keyserver.ubuntu.com --recv 8683D8A2"
+      	}
+
+		file {"/etc/apt/sources.list.d/postgres.list":
+			ensure => present,
+			owner => root,
+			group => root,
+			content => $operatingsystemrelease ? {
+				'10.04' => 'deb http://ppa.launchpad.net/pitti/postgresql/ubuntu lucid main',
+				'11.04' => 'deb http://ppa.launchpad.net/pitti/postgresql/ubuntu natty main',
+			},
+			require => Exec["get-postgres-apt-key"],
+		}
+
+		exec {"update apt to find postgres":
+			command => '/usr/bin/apt-get -y update',
+			require => File['/etc/apt/sources.list.d/postgres.list'],
+		}
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: provizioning
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70346636664320 !ruby/object:Gem::Requirement
+  requirement: &70318656139260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346636664320
+  version_requirements: *70318656139260
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &70346636663180 !ruby/object:Gem::Requirement
+  requirement: &70318656138240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346636663180
+  version_requirements: *70318656138240
 description: Puppet server provisioning tools, recipes and templates
 email:
 - victor.castell@season.es