provizioning 0.9.13 → 0.9.14

data/bootstrap/bootstrap.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-# ruby-stack - Install Ruby and friends.
-# Author: Francesc Esplugas <http://francescesplugas.com/>
+# Bootstrap an ubuntu server
+# Author: Victor Castell <http://francescesplugas.com/>
+# Based on work by: Francesc Esplugas <http://francescesplugas.com/>
 # License: MIT-LICENSE
 #
-# DON'T CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU'RE DOING!
 
 ##############################################################################
 # Abort on any error.
@@ -26,18 +26,13 @@ then
 wget https://raw.github.com/seasonlabs/provizioning/master/bootstrap/lucid.sources.list -O sources.list
 fi
 
-if [ "$var" == "Ubuntu 11.04 \n \l" ]
-then
-wget https://raw.github.com/seasonlabs/provizioning/master/bootstrap/natty.sources.list -O sources.list
-fi
-
 if [ "$var" == "Ubuntu 12.04 \n \l" ]
 then
 wget https://raw.github.com/seasonlabs/provizioning/master/bootstrap/precise.sources.list -O sources.list
 fi
 
 export DEBIAN_FRONTEND=noninteractive
-apt-get update
+apt-get -y update
 apt-get -y upgrade
 
 ##############################################################################
@@ -77,5 +72,11 @@ fi
 # Cleanup the installation
 apt-get -y autoremove
 
+##############################################################################
 # Install Puppet
-gem install puppet --no-ri --no-rdoc
+##############################################################################
+
+gem install puppet --no-ri --no-rdoc
+puppet resource group puppet ensure=present
+puppet resource user puppet ensure=present gid=puppet shell='/sbin/nologin'
+reboot

data/lib/provizioning/version.rb

@@ -1,3 +1,3 @@
 module Provizioning
-  VERSION = "0.9.13"
+  VERSION = "0.9.14"
 end

data/puppet/classes/mongo.pp

@@ -25,10 +25,9 @@ class mongo {
     }
 
     class ubuntu {
-      include apt
-
       exec {"get-10gen-apt-key":
-        command => "apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10"
+        command => "apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10",
+        unless => "apt-key list | grep 7F0CEB10",
       }
 
       file {"/etc/apt/sources.list.d/mongo.list":
@@ -48,7 +47,9 @@ class mongo {
 
       exec {"update apt to find mongodb":
         command => "/usr/bin/apt-get -y update",
-        require => File["/etc/apt/sources.list.d/mongo.list"]
+        subscribe => File["/etc/apt/sources.list.d/mongo.list"],
+        require => File["/etc/apt/sources.list.d/mongo.list"],
+        refreshonly => true,
       }
 
       package {"mongodb-10gen":

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

@@ -33,18 +33,17 @@ 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"], 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 C3173AA6"
-        }
+    exec {"get-nginx-apt-key":
+      command => "apt-key adv --keyserver keyserver.ubuntu.com --recv C3173AA6",
+      unless => "apt-key list | grep C3173AA6",
+    }
         
     file {"/etc/apt/sources.list.d/nginx.list":
       ensure => present,
@@ -57,10 +56,12 @@ class nginx {
     exec {"update apt to find nginx":
       command => "/usr/bin/apt-get -y update",
       require => File["/etc/apt/sources.list.d/nginx.list"],
+      subscribe => File["/etc/apt/sources.list.d/nginx.list"],
+      refreshonly => true,
     }
-    }
+  }
 
-    file { "/etc/nginx/nginx.conf":
+  file { "/etc/nginx/nginx.conf":
     ensure  => present,
     mode  => 644,
     owner   => root,
@@ -68,7 +69,7 @@ class nginx {
     content => template("nginx/nginx.conf.erb"),
     notify  => Exec["reload-nginx"],
     require => Package["nginx"],
-    }
+  }
 
   file { $nginx_conf:
     ensure => directory,
@@ -103,8 +104,8 @@ class nginx {
 
   exec { "reload-nginx":
     command => "/etc/init.d/nginx reload",
-        refreshonly => true,
-    }
+    refreshonly => true,
+  }
 
   # Define: nginx::config
   #

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

@@ -31,8 +31,6 @@ class postgres {
     }
 
     class ubuntu {
-    	include apt
-		
   		exec {"get-postgres-apt-key":
         command => "apt-key adv --keyserver keyserver.ubuntu.com --recv 8683D8A2"
       }
@@ -48,6 +46,8 @@ class postgres {
   		exec {"update apt to find postgres":
   			command => '/usr/bin/apt-get -y update',
   			require => File['/etc/apt/sources.list.d/postgres.list'],
+        subscribe => File['/etc/apt/sources.list.d/postgres.list'],
+        refreshonly => true,
   		}
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: provizioning
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -56,7 +56,6 @@ files:
 - Rakefile
 - bootstrap/bootstrap.sh
 - bootstrap/lucid.sources.list
-- bootstrap/natty.sources.list
 - bootstrap/precise.sources.list
 - lib/provizioning/puppet.rb
 - lib/provizioning/version.rb

data/bootstrap/natty.sources.list

@@ -1,13 +0,0 @@
-#############################################################
-################### OFFICIAL UBUNTU REPOS ###################
-#############################################################
-
-###### Ubuntu Main Repos
-deb http://archive.ubuntu.com/ubuntu/ natty main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ natty main 
-
-###### Ubuntu Update Repos
-deb http://archive.ubuntu.com/ubuntu/ natty-security main restricted universe multiverse 
-deb http://archive.ubuntu.com/ubuntu/ natty-updates main restricted universe multiverse 
-deb http://archive.ubuntu.com/ubuntu/ natty-proposed main restricted universe multiverse 
-deb http://archive.ubuntu.com/ubuntu/ natty-backports main restricted universe multiverse