Merge pull request onema#6 from onema/develop

Develop
ldayan · Oct 31, 2013 · 3f980a3 · 3f980a3
2 parents f3adc97 + 68d227e
commit 3f980a3
Show file tree

Hide file tree

Showing 34 changed files with 48 additions and 2,175 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Some of the cookbooks functionality include:
 * mod_env must be enabled. 
 
 # Version
-0.2.0
+0.3.0
 
 # Credits
 Some parts of this code where taken from the [ace-cookbooks opsworks_app_environment](https://github.com/ace-cookbooks/opsworks_app_environment). Also see [this](https://forums.aws.amazon.com/thread.jspa?threadID=118107).
@@ -57,8 +57,13 @@ See these references for more info:
 - [Symfony2, Composer, Capifony and an EC2 Micro instance](http://jonathaningram.com.au/category/composerphp/)
 - [ErrorException: proc_open(): fork failed - Cannot allocate memory in phar](https://github.com/composer/composer/issues/945)
 
-###phpenv::mongodb
-This recipe installs the mongodb php driver using PECL (Requires the **php-pear** OS package). 
+###phpenv::php_mongodb
+This recipe installs the mongodb php module using PECL (Requires the **php-pear** OS package). 
+
+Use recipe on **Setup** ONLY.
+
+###phpenv::php_redis
+This recipe installs the redis php module using PECL (Requires the **php-pear** OS package). 
 
 Use recipe on **Setup** ONLY.
 

diff --git a/phpenv/recipes/configure.rb b/phpenv/recipes/configure.rb
diff --git a/phpenv/recipes/dbconfig.rb b/phpenv/recipes/dbconfig.rb
diff --git a/phpenv/recipes/mongodb.rb b/phpenv/recipes/mongodb.rb
diff --git a/phpenv/recipes/php_mongodb.rb b/phpenv/recipes/php_mongodb.rb
@@ -0,0 +1,18 @@
+execute 'install_php_mongo_driver' do
+  command "pecl install mongo"
+  action :run
+end
+
+template 'mongo.ini' do
+  case node[:platform]
+  when 'centos','redhat','fedora','amazon'
+    path "/etc/php.d/mongo.ini"
+  when 'debian','ubuntu'
+    path "/etc/php5/conf.d/mongo.ini"
+  end
+  source 'mongo.ini.erb'
+  owner 'root'
+  group 'root'
+  mode 0644
+  notifies :restart, resources(:service => 'apache2')
+end
diff --git a/phpenv/recipes/php_redis.rb b/phpenv/recipes/php_redis.rb
@@ -0,0 +1,18 @@
+execute 'install_php_redis' do
+  command "pecl install redis"
+  action :run
+end
+
+template 'redis.ini' do
+  case node[:platform]
+  when 'centos','redhat','fedora','amazon'
+    path "/etc/php.d/redis.ini"
+  when 'debian','ubuntu'
+    path "/etc/php5/conf.d/redis.ini"
+  end
+  source 'redis.ini.erb'
+  owner 'root'
+  group 'root'
+  mode 0644
+  notifies :restart, resources(:service => 'apache2')
+end
diff --git a/phpenv/recipes/rdsconfig.rb b/phpenv/recipes/rdsconfig.rb
diff --git a/phpenv/recipes/ses.rb b/phpenv/recipes/ses.rb
diff --git a/phpenv/templates/default/db.php.erb b/phpenv/templates/default/db.php.erb
diff --git a/phpenv/templates/default/mongo.ini.erb b/phpenv/templates/default/mongo.ini.erb
@@ -0,0 +1,2 @@
+; MongoDB Driver
+extension=mongo.so
diff --git a/phpenv/templates/default/redis.ini.erb b/phpenv/templates/default/redis.ini.erb
@@ -0,0 +1,2 @@
+; configuration for php REDIS module
+extension=redis.so
diff --git a/phpenv/templates/default/ses.php.erb b/phpenv/templates/default/ses.php.erb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		; configuration for php REDIS module
		extension=redis.so