dnapi 1.1.81.passenger.2 → 1.1.81.php

data/lib/dnapi/components/php.rb

@@ -0,0 +1,26 @@
+module DNApi
+  module Components
+    class PHP < VersionedComponent.new(:key)
+      include Component
+      desc "Hypertext Preprocessor scripting language"
+      key :php
+      belongs_to Environment
+
+      NAME = 'PHP'.freeze
+      VERSION = '5.2'.freeze
+      PATCH_LEVEL = '8'.freeze
+
+      def self.label
+        "#{NAME} - #{version}"
+      end
+
+      def self.version
+        "#{VERSION}.#{PATCH_LEVEL}"
+      end
+
+      def self.package
+        'dev-lang/php'
+      end
+    end
+  end
+end

data/lib/dnapi/environment.rb

@@ -41,7 +41,8 @@ module DNApi
         component(:ree) || component(:ruby_192) ||
         component(:jruby_187) || component(:jruby_192) ||
         component(:rubinius) || component(:ruby_193) ||
-        component(:nodejs) || component(:rubinius19) 
+        component(:nodejs) || component(:rubinius19) ||
+        component(:php)
     end
 
     def stack

data/lib/dnapi/recipe.rb

@@ -3,9 +3,8 @@ module DNApi
     Monit = new(:name => 'monit')
     Memcached = new(:name => 'memcached')
     Nginx = new(:name => 'nginx')
-    NginxPassenger = new(:name => 'passenger::nginx')
+    NginxPassenger = new(:name => 'nginx-passenger')
     Passenger = new(:name => 'passenger')
-    Passenger3 = new(:name => 'passenger3')
     ApachePassenger = new(:name => 'passenger::apache')
     Mongrel = new(:name => 'mongrel')
     Unicorn = new(:name => 'unicorn')
@@ -16,6 +15,7 @@ module DNApi
     Trinidad = new(:name => 'trinidad')
     Thin = new(:name => 'thin')
     Puma = new(:name => 'puma')
+    PHP = new(:name => 'php')
 
     def self.defaults
       [Memcached, Monit]
@@ -24,7 +24,7 @@ module DNApi
     def self.all
       [Monit, Memcached, Nginx, NginxPassenger, ApachePassenger,
        Mongrel, Unicorn, Mysql51, Mysql55, Nginxtcp, Node, 
-       Trinidad,Thin,Puma]
+       Trinidad, Thin, Puma, PHP]
     end
   end
 end

data/lib/dnapi/stack.rb

@@ -25,7 +25,7 @@ module DNApi
                                                                                    DNApi::Components::JRuby192,
                                                                                    DNApi::Components::Rubinius,
                                                                                    DNApi::Components::Rubinius19]),
-                          :recipes       => [Recipe::Nginx, Recipe::Passenger, Recipe::NginxPassenger])
+                          :recipes       => [Recipe::Nginx, Recipe::NginxPassenger])
 
     NginxPassenger3 = new(:name          => 'nginx_passenger3',
                           :label         => 'Passenger 3',
@@ -34,7 +34,7 @@ module DNApi
                           :ruby_versions => (DNApi::Components::RubyVersion.all - [DNApi::Components::JRuby187,
                                                                                    DNApi::Components::JRuby192,
                                                                                    DNApi::Components::Ruby186]),
-                          :recipes       => [Recipe::Nginx, Recipe::Passenger3])
+                          :recipes       => [Recipe::Nginx, Recipe::NginxPassenger])
 
     #FIXME: Remove
     ApachePassenger = new(:name          => 'apache_passenger',
@@ -81,9 +81,15 @@ module DNApi
                           :ruby_versions => DNApi::Components::RubyVersion.all,
                           :recipes       => [Recipe::Nginx, Recipe::Puma])
 
+    NginxPHP        = new(:name          => 'php_fcgi',
+                          :label         => 'PHP + FastCGI',
+                          :web_server    => :nginx,
+                          :rack_server   => :fastcgi,
+                          :ruby_versions => DNApi::Components::PHP,
+                          :recipes       => [Recipe::Nginx, Recipe::PHP])
 
     def self.all
-      [NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp,NginxThin,NginxPuma]
+      [NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp, NginxThin, NginxPuma, NginxPHP]
     end
 
     def self.get(name)

data/lib/dnapi/version.rb

@@ -1,3 +1,3 @@
 module DNApi
-  VERSION = '1.1.81.passenger.2'
+  VERSION = '1.1.81.php'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dnapi
 version: !ruby/object:Gem::Version
-  version: 1.1.81.passenger.2
+  version: 1.1.81.php
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-26 00:00:00.000000000 Z
+date: 2011-07-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2158311100 !ruby/object:Gem::Requirement
+  requirement: &70243759137500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158311100
+  version_requirements: *70243759137500
 - !ruby/object:Gem::Dependency
   name: extlib
-  requirement: &2158310620 !ruby/object:Gem::Requirement
+  requirement: &70243759136880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158310620
+  version_requirements: *70243759136880
 - !ruby/object:Gem::Dependency
   name: sexp_processor
-  requirement: &2158310140 !ruby/object:Gem::Requirement
+  requirement: &70243759136340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158310140
+  version_requirements: *70243759136340
 description: API for chef DNA.
 email:
 - gems@engineyard.com
@@ -64,6 +64,7 @@ files:
 - lib/dnapi/components/newrelic.rb
 - lib/dnapi/components/nodejs.rb
 - lib/dnapi/components/passenger3.rb
+- lib/dnapi/components/php.rb
 - lib/dnapi/components/ruby.rb
 - lib/dnapi/components/ssmtp.rb
 - lib/dnapi/components/stunneled.rb
@@ -149,4 +150,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/stack_spec.rb
 - spec/struct_spec.rb
-has_rdoc: