Rud5G · Rud5G · Apr 2, 2015 · Apr 2, 2015 · Apr 2, 2015 · Apr 2, 2015
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -17,6 17,4 @@
 # limitations under the License.
 #
 
-# ::Chef::Node.send(:include, Opscode::OpenSSL::Password)
-
 default['application']['admin']['email'] = '[email protected]'
diff --git a/metadata.rb b/metadata.rb
@@ -4,7 4,7 @@
 license 'Apache 2.0'
 description 'Installs/Configures ZF2'
 long_description 'Installs/Configures ZF2'
-version '0.7.2'
 version '0.7.3'
 
 # baseserver
 depends 'baseserver', '~> 0.7.10'

diff --git a/recipes/php.rb b/recipes/php.rb
@@ -7,18 7,29 @@
 # All rights reserved - Do Not Redistribute
 #
 
 # include_recipe 'zf2::webserver'
 
 # repository is also added to default, because of the issue:
 # installing php5.3 during compiletime. and never installing php5.4
 
 apt_repository 'php-5.4' do
- uri 'http://ppa.launchpad.net/ondrej/php5-oldstable/ubuntu'
- distribution node['lsb']['codename']
- components ['main']
- keyserver 'keyserver.ubuntu.com'
- key 'E5267A6C'
  uri  'http://ppa.launchpad.net/ondrej/php5-oldstable/ubuntu'
  distribution  node['lsb']['codename']
  components  ['main']
  keyserver  'keyserver.ubuntu.com'
  key  'E5267A6C'
  only_if { node['php']['set_version'] == '5.4' }
  action :add
 end
 
-include_recipe 'php'
 apt_repository 'php-5.4' do
  # uri 'http://ppa.launchpad.net/ondrej/php5-oldstable/ubuntu'
  # distribution node['lsb']['codename']
  # components ['main']
  # keyserver 'keyserver.ubuntu.com'
  # key 'E5267A6C'
  only_if { node['php']['set_version'] != '5.4' }
  action :remove
 end
 
 include_recipe 'php'
diff --git a/recipes/servernode.rb b/recipes/servernode.rb
@@ -21,10 21,10 @@
 
 include_recipe 'zf2::database'
 
 include_recipe 'zf2::webserver'
 
 include_recipe 'zf2::php'
 
 include_recipe 'zf2::nodejs'
 
-include_recipe 'zf2::projects'
-
-include_recipe 'zf2::webserver'
 include_recipe 'zf2::projects'