Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

1204121552

  • Loading branch information...
commit 1d8d06a61c315e2125c5884bdb22ff014bf8d899 1 parent 730f3bb
@andyl authored
View
4 _puppet/modules/nginx/manifests/app_php.pp
@@ -10,14 +10,14 @@
file { $conf_file :
ensure => present,
- content => template("nginx/app_static.erb"),
+ content => template("nginx/app_php.erb"),
}
file { $root_dir : ensure => directory }
file { "$root_dir/index.php" :
ensure => present,
- content => "Hello World - AppName: $app_name / Deploy User: $deploy_user<br/><?php phpinfo();",
+ content => "Hello World - AppName: $app_name / Deploy User: $deploy_user<br/><?php phpinfo(); ?>",
replace => false,
}
View
17 _puppet/modules/nginx/manifests/init.pp
@@ -4,20 +4,15 @@
$nginx_conf = '/etc/nginx/conf.d'
$nginx_user = 'www-data'
- exec { 'apt-get update' :
- command => '/usr/bin/apt-get update',
- }
-
exec { 'add-apt nginx' :
- command => 'add-apt-repository ppa:nginx/stable',
+ command => 'add-apt-repository ppa:nginx/stable && apt-get update',
path => ['/usr/bin', '/bin'],
- before => Exec['apt-get update'],
unless => 'ls /etc/apt/sources.list.d | grep nginx',
}
package { 'nginx' :
ensure => latest,
- require => Exec['add-apt nginx', 'apt-get update'],
+ require => Exec['add-apt nginx'],
}
nginx::deploy_user { $nginx_deploy_users : }
@@ -50,8 +45,8 @@
}
# Nuke default files
- file { '/etc/nginx/fastcgi_params':
- ensure => absent,
- require => Package['nginx'],
- }
+ # file { '/etc/nginx/fastcgi_params':
+ # ensure => absent,
+ # require => Package['nginx'],
+ # }
}
View
5 _puppet/modules/nginx/tests/nginx_test.pp
@@ -7,7 +7,6 @@
nginx::app_static {'static1' : server_names => ['default_app'] }
nginx::app_static {'static2' : server_names => ['flex'] }
-nginx::app_passenger {'ptest' : deploy_user => 'vagrant', server_names => ['james localhost'] }
-
-nginx::app_php {'phptest' : deploy_user => 'vagrant', server_names => ['pzer'] }
+nginx::app_passenger {'ptest' : deploy_user => 'vagrant', server_names => ['james localhost'] }
+nginx::app_php {'phptest' : deploy_user => 'vagrant', server_names => ['pzer'] }
View
29 _puppet/modules/php/manifests/init.pp
@@ -1,29 +0,0 @@
-class php {
-
- exec { 'apt-get update' :
- command => '/usr/bin/apt-get update',
- }
-
- exec { 'add-apt php' :
- command => 'add-apt-repository ppa:brianmercer/php',
- path => ['/usr/bin', '/bin'],
- before => Exec['apt-get update'],
- unless => 'ls /etc/apt/sources.list.d | grep php5',
- }
-
- $php1 = "php5-fpm php5-curl php5-gd php5-idn php-pear php5-imagick"
- $php2 = "php5-mcrypt php5-mhash php5-ming php5-ps php5-pspell php5-recode"
- $php3 = "php5-sqlite php5-tidy php5-xmlrpc php5-xsl php5-json"
- $phpx = split("$php1 $php2 $php3", ' ')
-
- package { 'php5-fpm' :
- ensure => latest,
- require => Exec['add-apt php', 'apt-get update'],
- }
-
- service { 'php5-fpm' :
- ensure => running,
- require => Package['php5-fpm'],
- }
-
-}
View
3  _puppet/modules/php/tests/php_test.pp
@@ -1,3 +0,0 @@
-#!/usr/bin/puppet apply
-
-include php
Please sign in to comment.
Something went wrong with that request. Please try again.