Revert "Bugfix: use default value in optionIsTrue"

The commit wasn't atomic

This reverts commit 7a329a4e.

slapos/recipe/librecipe/generic.py

@@ -120,6 +120,4 @@ class GenericBaseRecipe(object):
     return str(value).lower() in GenericBaseRecipe.TRUE_VALUES
 
   def optionIsTrue(self, optionname, default=None):
-    if default is not None and optionname not in self.options:
-      return default
     return self.isTrueValue(self.options[optionname])

software/wordpress/instance-wordpress.cfg

+[buildout]
+
+parts =
+  apache-php
+  request-mariadb
+  mkdir
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[apache-php]
+recipe = slapos.cookbook:lamp.request
+source = ${application:location}
+template = ${application-template:location}/${application-template:filename}
+configuration = ${application-configuration:location}
+
+httpd_binary = ${apache:location}/bin/httpd
+stunnel_binary = ${stunnel:location}/bin/stunnel
+
+mysql-url = $${request-mariadb:connection-url}
+
+[request-mariadb]
+recipe = slapos.cookbook:request
+name = MariaDB DataBase
+software-url = $${slap_connection:software_release_url}
+software-type = mariadb
+return = url

software/wordpress/instance.cfg

+[buildout]
+parts =
+  switch_softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch_softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${instance_wordpress:output}
+mariadb = ${instance_mariadb:output}

software/wordpress/software.cfg

 [buildout]
 versions = versions
 
+parts =
+  apache-php
+  template
+  eggs
+  instance-recipe-egg
+  instance_wordpress
+  instance_mariadb
   
 extends =
-  ../../stack/lamp/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../stack/apache-php.cfg
+  ../../stack/shacache-client.cfg
 
 # XXX: This is dirty, recipe trick shall be used.
 develop =
@@ -35,6 +44,28 @@ recipe = zc.recipe.egg
 python = python2.7
 eggs = ${instance-recipe:egg}
 
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 817407b6bb7af1dce7588e259ead0d26
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[instance_mariadb]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/../mariadb/instance-mariadb.cfg
+md5sum = 38aefa725d21988485c20ae9d58f9455
+output = ${buildout:directory}/template-mariadb.cfg
+mode = 0644
+
+[instance_wordpress]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-wordpress.cfg
+md5sum = 220e14b7a46742b1fd83d699c352b888
+output = ${buildout:directory}/template-wordpress.cfg
+mode = 0644
+
 [versions]
 #slapos.cookbook = 0.12
 

stack/apache-php.cfg

+[buildout]
+find-links +=
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
+parts =
+  template
+  apache-php
+  mariadb
+  eggs
+  instance-recipe-egg
+  stunnel
+
+extends =
+  ../component/apache/buildout.cfg
+  ../component/apache-php/buildout.cfg
+  ../component/dcron/buildout.cfg
+  ../component/git/buildout.cfg
+  ../component/glib/buildout.cfg
+  ../component/logrotate/buildout.cfg
+  ../component/python-2.7/buildout.cfg
+  ../component/lxml-python/buildout.cfg
+  ../component/zlib/buildout.cfg
+  ../component/stunnel/buildout.cfg
+
+[application]
+recipe = hexagonit.recipe.download
+#If provided tarball does not containt top directory this option shall be changed to false
+strip-top-level-dir = true
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}