Permalink
Browse files

Merge branch 'master' of github.com:uberj/puppet-modules

  • Loading branch information...
2 parents 056ef9c + 9c63054 commit 725dc680db6c90f800eabc7f0256f27d86f2497d @uberj committed Dec 1, 2011
View
@@ -0,0 +1 @@
+.*.swp
@@ -461,8 +461,7 @@
exec { "git_clone_exec_$localtree/$_name":
cwd => $localtree,
- path => '/usr/bin/',
- command => "git clone `echo $source | sed -r -e 's,(git://|ssh://)(.*)//(.*),\\1\\2/\\3,g'` $_name",
+ command => "/usr/bin/git clone `echo $source | sed -r -e 's,(git://|ssh://)(.*)//(.*),\\1\\2/\\3,g'` $_name",
creates => "$localtree/$_name/.git/",
require => File["$localtree"]
}
Binary file not shown.
@@ -2,8 +2,13 @@
# Let's get this working before we make it pretty.
#
-class evnet () {
- define install(){
+class glaspot::evnet {
+
+ package { 'python-openssl':
+ ensure => present,
+ before => Exec['evnet install'],
+ }
+
file { '/home/glaspot/evnet/':
ensure => directory,
mode => 0640,
@@ -14,13 +19,13 @@
git::clone { "evnet":
source => "https://github.com/rep/evnet.git",
localtree => "/home/glaspot/",
+ require => User['glaspot'],
}
exec { 'evnet install':
- path => ['/usr/bin'],
cwd => "/home/glaspot/evnet/",
- command => "python setup.py build && python setup.py install",
+ unless => "/usr/bin/python -c 'import evnet'",
+ command => "/usr/bin/python setup.py build && python setup.py install",
require => Git::Clone['evnet'],
}
- {
}
@@ -1,11 +1,17 @@
class glaspot{
+ php_apd::install { "apd": }
+ class {"glaspot::evnet": }
+
package { 'subversion':
ensure => installed,
}
package { 'python-dev':
ensure => installed,
}
+ package { 'python-chardet':
+ ensure => installed,
+ }
user { 'glaspot':
ensure => present,
@@ -31,6 +37,4 @@
require => File['/home/glaspot/glaspot/'],
}
- php_apd::install { "apd": }
- glaspot::evnet::install { "evnet install": }
}
Binary file not shown.
@@ -5,9 +5,11 @@
$php_ini = "/etc/php5/cli/php.ini",
$trace_dir = "/tmp/apd_traces" )
{
+ Exec { path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" }
package {'php5':
ensure => present,
+ before => [Package['apd'],Exec['zend_extensions'],Exec['apd enable'],Exec['tracedir']],
}
package {'apd':
@@ -20,16 +22,16 @@
#apd.statement=1
#apd.tracedir=/tmp/apd-traces
exec { 'zend_extensions':
- unless => "/bin/grep zend_extension=/usr/lib/php5/20090626+lfs/apd.so ${php_ini}",
- command => "/bin/echo 'zend_extension=/usr/lib/php5/20090626+lfs/apd.so' >> ${php_ini}",
+ unless => "grep zend_extension=/usr/lib/php5/20090626+lfs/apd.so ${php_ini}",
+ command => "echo 'zend_extension=/usr/lib/php5/20090626+lfs/apd.so' >> ${php_ini}",
}
exec { 'apd enable':
- unless => "/bin/grep apd.statement=1 ${php_ini}",
- command => "/bin/echo 'apd.statement=1' >> ${php_ini}",
+ unless => "grep apd.statement=1 ${php_ini}",
+ command => "echo 'apd.statement=1' >> ${php_ini}",
}
exec { 'tracedir':
- unless => "/bin/grep apd.tracedir=${trace_dir} ${php_ini}",
- command => "/bin/echo 'apd.tracedir=${trace_dir}' >> ${php_ini}",
+ unless => "grep apd.tracedir=${trace_dir} ${php_ini}",
+ command => "echo 'apd.tracedir=${trace_dir}' >> ${php_ini}",
}
}
}

0 comments on commit 725dc68

Please sign in to comment.