Merge branch 'wordpress'

slapos/recipe/request.py

@@ -57,7 +57,7 @@ class Recipe(object):
       self.logger.debug("No parameter to return to main instance."
                           "Be careful about that...")
 
-    software_type = 'RootInstanceSoftware'
+    software_type = 'RootSoftwareInstance'
     if 'software-type' in options:
       software_type = options['software-type']
 
@@ -98,6 +98,7 @@ class Recipe(object):
         status = "unknown"
       self.logger.error("Connection parameter %s not found. "
           "Status of requested instance is : %s." % (self.failed, status))
+      raise KeyError("Connection parameter %s not found. " % self.failed)
     return []
 
   update = install

software/wordpress/software.cfg

@@ -26,3 +26,101 @@ md5sum = 3859841a4ad6ed23744d6bc5a01321e0
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-003
+
+# Automatically picked by buildout-versions
+Jinja2 = 2.6
+Pygments = 1.5
+Sphinx = 1.1.3
+Werkzeug = 0.8.3
+apache-libcloud = 0.8.0
+async = 0.6.1
+buildout-versions = 1.7
+docutils = 0.8.1
+gitdb = 0.5.4
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.8
+pycrypto = 2.5
+rdiff-backup = 1.0.5
+slapos.cookbook = 0.44
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.19
+smmap = 0.8.2
+
+# Required by:
+# slapos.core==0.23
+# slapos.toolbox==0.19
+Flask = 0.8
+
+# Required by:
+# slapos.toolbox==0.19
+GitPython = 0.3.2.RC1
+
+# Required by:
+# slapos.cookbook==0.44
+PyXML = 0.8.4
+
+# Required by:
+# slapos.toolbox==0.19
+atomize = 0.1.1
+
+# Required by:
+# slapos.toolbox==0.19
+feedparser = 5.1.1
+
+# Required by:
+# slapos.cookbook==0.44
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.44
+# slapos.core==0.23
+# xml-marshaller==0.9.7
+lxml = 2.3.4
+
+# Required by:
+# slapos.cookbook==0.44
+netaddr = 0.7.6
+
+# Required by:
+# slapos.core==0.23
+netifaces = 0.8
+
+# Required by:
+# slapos.toolbox==0.19
+paramiko = 1.7.7.1
+
+# Required by:
+# slapos.toolbox==0.19
+psutil = 0.4.1
+
+# Required by:
+# slapos.cookbook==0.44
+# slapos.core==0.23
+# slapos.toolbox==0.19
+# zc.buildout==1.6.0-dev-SlapOS-003
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.44
+# slapos.toolbox==0.19
+slapos.core = 0.23
+
+# Required by:
+# slapos.core==0.23
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.44
+# slapos.toolbox==0.19
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.44
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.23
+zope.interface = 3.8.0
\ No newline at end of file

stack/lamp/buildout.cfg

@@ -19,6 +19,7 @@ extends =
   ../../component/mariadb/buildout.cfg
   ../../component/apache/buildout.cfg
   ../../component/apache-php/buildout.cfg
+  ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/glib/buildout.cfg
@@ -68,7 +69,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-php.cfg
 output = ${buildout:directory}/template-apache-php.cfg
-md5sum = 8ebed1e26127c066e5b69372e69e6c38
+md5sum = b98e76abcf091ea0aee20d1ac59bb877
 mode = 0644
 
 [template-apache-backup]

stack/lamp/instance-apache-php.cfg

 [buildout]
 
 parts =
-  url
-  request-mariadb
-  apache-php
-  stunnel
   certificate-authority
   ca-stunnel
   logrotate
@@ -13,21 +9,34 @@ parts =
   cron
   cron-entry-logrotate
   promise
+  publish-backend-connection-informations
+  frontend-promise
+  publish-frontend-connection-informations
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[url]
-recipe = slapos.cookbook:publishurl
-url = http://[$${apache-php:ip}]:$${apache-php:port}/
-
 [promise]
 recipe = slapos.cookbook:check_port_listening
 path = $${basedirectory:promises}/apache
 hostname = $${apache-php:ip}
 port = $${apache-php:port}
 
+[frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/frontend
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+
+[publish-backend-connection-informations]
+recipe = slapos.cookbook:publish
+backend_url = $${apache-php:url}
+
+[publish-frontend-connection-informations]
+<= publish-backend-connection-informations
+url = $${request-frontend:connection-site_url}
+
 [mariadb-urlparse]
 recipe = slapos.cookbook:urlparse
 url = $${request-mariadb:connection-url}
@@ -38,11 +47,12 @@ source = ${application:location}
 template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
-htdocs = $${directory:htdocs}
+htdocs = $${rootdirectory:srv}/www/
 pid-file = $${basedirectory:run}/apache.pid
 lock-file = $${basedirectory:run}/apache.lock
 ip = $${slap-network-information:global-ipv6}
 port = 8080
+url = http://[$${:ip}]:$${:port}/
 error-log = $${directory:httpd-log}/error.log
 access-log = $${directory:httpd-log}/access.log
 php-ini-dir = $${directory:php-ini-dir}
@@ -109,6 +119,17 @@ software-url = $${slap-connection:software-release-url}
 software-type = mariadb
 return = url
 
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:request
+name = Frontend
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url
+config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
+return = site_url
+
 [logrotate]
 recipe = slapos.cookbook:logrotate
 # Binaries
@@ -184,7 +205,6 @@ promises = $${rootdirectory:etc}/promise/
 [directory]
 recipe = slapos.cookbook:mkdirectory
 ca-dir = $${rootdirectory:srv}/ssl/
-htdocs = $${rootdirectory:srv}/www/
 httpd-log = $${basedirectory:log}/apache/
 php-ini-dir = $${rootdirectory:etc}/php/
 tmp-php = $${rootdirectory:tmp}/php/