Merge branch 'erp5-component' into erp5

CHANGES.txt

 Changes
 =======
 
+0.78.0 (2013-04-28)
+-------------------
+
+ * LAMP stack: Allow to give application-dependent parameters to application configuration file. [Cedric de Saint Martin]
+ * zabbix-agent: Allow user to pass zabbix parameter. [Cedric de Saint Martin]
+ * kvm frontend: listen to ipv6 and ipv4. [Jean-Baptiste Petre]
+
 0.77.1 (2013-04-18)
 -------------------
 

component/groonga/buildout.cfg

@@ -11,9 +11,9 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-version = 3.0.2
+version = 3.0.3
 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = b17934ef2589a4e261ed0d99aec713eb
+md5sum = 19dbee5393b2f9c793c4caae5ba81bec
 configure-options =
   --disable-static
   --disable-glibtest
@@ -27,9 +27,9 @@ environment =
 
 [groonga-normalizer-mysql]
 recipe = slapos.recipe.cmmi
-version = 1.0.2
+version = 1.0.3
 url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
-md5sum = 782111599dcba5023beb698dc5ea514a
+md5sum = 3f266c608017eb1b2e24b6bac1801ab2
 location = ${groonga:location}
 depends =
   ${groonga:version}

component/jsl/buildout.cfg

+# jsl - command line javascript lint
+# http://javascriptlint.com/
+
+[buildout]
+parts = jsl
+
+[jsl]
+recipe = slapos.recipe.build
+url = http://www.javascriptlint.com/download/jsl-0.3.0-src.tar.gz
+md5sum = 2b94ffa4fab07acabe0c5e73cd49bcdf
+script =
+  location = %(location)r
+  self.failIfPathExists(location)
+  import sys
+  url = self.options['url']
+  md5sum = self.options['md5sum']
+  extract_dir = self.extract(self.download(url, md5sum))
+  workdir = guessworkdir(extract_dir)
+  os.chdir(os.path.join(workdir, 'src'))
+  os.system('make -f Makefile.ref')
+  os.mkdir(location)
+  bindir = os.path.join(location, 'bin')
+  os.mkdir(bindir)
+  os.system('cp */jsl ' + bindir)

component/libxml2/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 
 [libxml2]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.0.tar.gz
-md5sum = 5b9bebf4f5d2200ae2c4efe8fa6103f7
+url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz
+md5sum = 9c0cfef285d5c4a5c80d00904ddab380
 configure-options =
   --disable-static
   --without-python

component/mariadb/buildout.cfg

@@ -62,8 +62,8 @@ environment =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/mroonga/mroonga-3.02.tar.gz
-md5sum = b2d1a4abc12030fdbd9064bbb6175366
+url = http://packages.groonga.org/source/mroonga/mroonga-3.03.tar.gz
+md5sum = daa1547259145b05b4cdee6b513bf8c8
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

component/noVNC/buildout.cfg

@@ -6,5 +6,5 @@ parts =
 recipe = hexagonit.recipe.download
 # Post-0.4 release from January 2013
 url = http://github.com/kanaka/noVNC/zipball/3b2acc2258d36137a37edfbe0f03a3099189c49d
-md5sum = 0d06abc20e59643e14fefe52b42daf60
+md5sum = a276be8fa193652bb5de8a271603f11f
 strip-top-level-dir = true

component/qemu-kvm/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../../component/gnutls/buildout.cfg
   ../../component/libpng/buildout.cfg
   ../../component/libuuid/buildout.cfg
+  ../../component/xorg/buildout.cfg
   ../../component/zlib/buildout.cfg
 
 [kvm]
@@ -11,9 +12,11 @@ extends =
 
 [qemu-kvm]
 recipe = slapos.recipe.cmmi
-url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/1.2.0/qemu-kvm-1.2.0.tar.gz
-md5sum = d7b18b673c48abfee65a9c0245df0415
+# qemu-kvm and qemu are now the same since 1.3.
+url = http://wiki.qemu-project.org/download/qemu-1.4.1.tar.bz2
+md5sum = eb2d696956324722b5ecfa46e41f9a75
 configure-options =
+  --target-list=""
   --disable-sdl
   --disable-xen
   --enable-vnc-tls
@@ -24,9 +27,11 @@ configure-options =
   --disable-docs
   --enable-vnc-png
   --disable-vnc-jpeg
+  --enable-vnc-ws
   --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include"
   --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -L${gpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
   --disable-werror
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
+

component/zabbix/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [zabbix-agent]
 recipe = slapos.recipe.cmmi
-url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.1.tar.gz?download
-md5sum = 3b301aa4f2b7cb5ede46884b9c7873e1
+url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.5.tar.gz?download
+md5sum = 0c0721c31889b63bce9aa556bcb927e8
 configure-options =
   --enable-agent
   --enable-ipv6

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.77.2.dev'
+version = '0.78.1.dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

slapos/recipe/apachephp/__init__.py

@@ -105,6 +105,11 @@ class Recipe(GenericBaseRecipe):
                               port=self.options['port'],
                               # XXX-Cedric: add frontend url.
                              )
+      # Allow to give custom parameters to template
+      application_parameter_prefix = 'application-'
+      for key in self.options.keys():
+        if key.startswith(application_parameter_prefix):
+          application_conf[key.lstrip(application_parameter_prefix)] = self.options[key]
 
       directory, file_ = os.path.split(self.options['configuration'])
 

slapos/recipe/kvm_frontend/__init__.py

@@ -107,7 +107,8 @@ class Recipe(GenericSlapRecipe):
       http_redirect_server = ''
 
     config = dict(
-      ip=self.options['ip'],
+      ipv6=self.options['ipv6'],
+      ipv4=self.options['ipv4'],
       port=self.options['port'],
       key=self.options['ssl-key-path'],
       certificate=self.options['ssl-cert-path'],

slapos/recipe/kvm_frontend/template/kvm-proxy.js

@@ -37,12 +37,13 @@ var fs = require('fs'),
     httpProxy = require('http-proxy'),
     proxyByUrl = require('proxy-by-url');
 
-var listenInterface = process.argv[2],
-    port = process.argv[3],
-    sslKeyFile = process.argv[4],
-    sslCertFile = process.argv[5],
-    proxyTable = process.argv[6],
-    redirect = process.argv[7] || false,
+var listenInterfacev6 = process.argv[2],
+    listenInterfacev4 = process.argv[3],
+    port = process.argv[4],
+    sslKeyFile = process.argv[5],
+    sslCertFile = process.argv[6],
+    proxyTable = process.argv[7],
+    redirect = process.argv[8] || false,
     isRawIPv6;
 
 if (process.argv.length < 7) {
@@ -50,11 +51,6 @@ if (process.argv.length < 7) {
   process.exit(1);
 }
 
-isRawIPv6 = function checkipv6(str) {
-  // Inspired by http://forums.intermapper.com/viewtopic.php?t=452
-  return (/^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/.test(str));
-}(listenInterface);
-
 /**
  * Dummy middleware that throws 404 not found. Does not contain websocket
  * middleware.
@@ -69,7 +65,7 @@ var middlewareNotFound = function(req, res, proxy) {
 /**
  * Create server
  */
-var proxyServer = httpProxy.createServer(
+var proxyServerv6 = httpProxy.createServer(
   // We declare our proxyByUrl middleware
   proxyByUrl(proxyTable),
   // Then we add your dummy middleware, called when proxyByUrl doesn't find url.
@@ -87,42 +83,70 @@ var proxyServer = httpProxy.createServer(
       )
     },
     source: {
-    host: listenInterface,
+    host: listenInterfacev6,
     port: port
   }}
 );
 
+
+var proxyServerv4 = httpProxy.createServer(
+  // We declare our proxyByUrl middleware
+  proxyByUrl(proxyTable),
+  // Then we add your dummy middleware, called when proxyByUrl doesn't find url.
+  middlewareNotFound,
+  // And we set HTTPS options for server. HTTP will be forbidden.
+  {
+    https: {
+      key: fs.readFileSync(
+        sslKeyFile,
+        'utf8'
+      ),
+      cert: fs.readFileSync(
+        sslCertFile,
+        'utf8'
+      )
+    },
+    source: {
+    host: listenInterfacev4,
+    port: port
+  }}
+);
+
+
 console.log('HTTPS server starting and trying to listen on ' +
-            listenInterface + ':' + port);
+            listenInterfacev4 + ':' + port);
 // Release the beast.
-proxyServer.listen(port, listenInterface);
+proxyServerv6.listen(port, listenInterfacev6);
+proxyServerv4.listen(port, listenInterfacev4);
 
 // Dummy HTTP server redirecting to HTTPS. Only has sense if we can use port 80
 if (redirect === '1') {
   console.log('HTTP redirect server starting and trying to listen on ' +
               listenInterface + ':' + httpPort);
-  try {
-    var httpPort = 80;
-    http.createServer(function(req, res) {
-      var url;
-      if (isRawIPv6 === true) {
-        url = 'https://[' + listenInterface + ']';
-      } else {
-        url = 'https://' + listenInterface;
-      }
-      // If non standard port : need to specify it
-      if (port !== 443) {
-        url = url + ':' + port;
-      }
-      // Add last part of URL
-      url = url + req.url;
-      console.log(url);
-      // Anwser "permanently redirected"
-      res.statusCode = 301;
-      res.setHeader('Location', url);
-      res.end();
-    }).listen(httpPort, listenInterface);
-  } catch (error) {
-    console.log('Couldn\'t start plain HTTP redirection server : ' + error)
-  }
+/*   
+*try {
+*    var httpPort = 80;
+*    http.createServer(function(req, res) {
+*      var url;
+*      if (isRawIPv6 === true) {
+*        url = 'https://[' + listenInterface + ']';
+*      } else {
+*        url = 'https://' + listenInterface;
+*      }
+*      // If non standard port : need to specify it
+*      if (port !== 443) {
+*        url = url + ':' + port;
+*      }
+*      // Add last part of URL
+*      url = url + req.url;
+*      console.log(url);
+*      // Anwser "permanently redirected"
+*      res.statusCode = 301;
+*      res.setHeader('Location', url);
+*      res.end();
+*    }).listen(httpPort, listenInterface);
+*  } catch (error) {
+*    console.log('Couldn\'t start plain HTTP redirection server : ' + error)
+*  }
+*/
 }

slapos/recipe/kvm_frontend/template/nodejs_run.in

@@ -2,4 +2,4 @@
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
 export NODE_PATH=%(node_env)s
-exec %(node_path)s %(conf_path)s %(ip)s %(port)s %(key)s %(certificate)s %(map_path)s %(plain_http)s
+exec %(node_path)s %(conf_path)s %(ipv6)s %(ipv4)s %(port)s %(key)s %(certificate)s %(map_path)s %(plain_http)s

slapos/recipe/zabbixagent/__init__.py

@@ -119,10 +119,13 @@ class Recipe(BaseSlapRecipe):
     # self.cron_d is a directory, where cron jobs can be registered
     self.cron_d = self.installCrond()
     self.logrotate_d, self.logrotate_backup = self.installLogrotate()
-    zabbix_agentd_conf = self.installZabbixAgentd(self.getGlobalIPv6Address(),
-                                                  10050,
-                                                  self.parameter_dict['hostname'],
-                                                  self.parameter_dict['server'])
+    zabbix_agentd_conf = self.installZabbixAgentd(
+        self.getGlobalIPv6Address(),
+        10050,
+        self.parameter_dict['hostname'],
+        self.parameter_dict['server'],
+        self.parameter_dict.get('custom-user-parameter', '')
+    )
     self.setConnectionDict(dict(ip=zabbix_agentd_conf['ip'],
       name=zabbix_agentd_conf['hostname'],
       port=str(zabbix_agentd_conf['port'])))

software/kvm/common.cfg

@@ -56,6 +56,7 @@ recipe = plone.recipe.command
 destination = ${buildout:parts-directory}/${:_buildout_section_name_}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 command =
+  export HOME=${:location};
   rm -fr ${:destination} &&
   mkdir -p ${:destination} &&
   cd ${:destination} &&
@@ -69,17 +70,10 @@ command =
 [template-kvm]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvm.cfg.in
-md5sum = c0320447308299ec9caaeece4187bc1f
+md5sum = 87197471aa93863c310204e8865b5ac1
 output = ${buildout:directory}/template-kvm.cfg
 mode = 0644
 
-[template-kvmplus]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-kvmplus.cfg.in
-md5sum = c8e92237eeda93caca1132b5202c3a02
-output = ${buildout:directory}/template-kvmplus.cfg
-mode = 0644
-
 [template-nbd]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-nbd.cfg.in
@@ -90,13 +84,13 @@ mode = 0644
 [template-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-frontend.cfg.in
-md5sum = 73359b52013b1b65f75005e8698ed180
+md5sum = cdb690495e9eb007d2b7d2f8e12f5c59
 output = ${buildout:directory}/template-frontend.cfg
 mode = 0644
 
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 68788763d23f70f24b9e575871c903a8
+md5sum = 0a98e34aaec7097a84066c0665e3a49a
 output = ${buildout:directory}/template.cfg
 mode = 0644

software/kvm/development.cfg

 [buildout]
 extends =
-  ../../git/buildout.cfg
+  ../../component/git/buildout.cfg
   common.cfg
 
 parts +=
   slapos.cookbook-repository
-  slapos.core-repository
   slapos.toolbox-repository
   check-recipe
 
 develop =
   ${:parts-directory}/slapos.cookbook-repository
+  ${:parts-directory}/slapos.toolbox-repository
 
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
-branch = slaprunner
+branch = kvm
+git-executable = ${git:location}/bin/git
+
+[slapos.toolbox-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.toolbox.git
+branch = master
 git-executable = ${git:location}/bin/git
 
 [check-recipe]
@@ -24,3 +30,4 @@ stop-on-error = true
 update-command = ${:command}
 command =
   grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
+  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link

software/kvm/instance-frontend.cfg.in

@@ -11,7 +11,8 @@ parts =
   cron-entry-logrotate
   ca-frontend
   certificate-authority
-  frontend-promise
+  frontend-promise-ipv6
+  frontend-promise-ipv4
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -47,7 +48,8 @@ logrotate-entries = $${rootdirectory:etc}/logrotate.d
 recipe = slapos.cookbook:kvm.frontend
 domain = $${ca-frontend:name}
 # port = $${slap-parameter:port}
-ip = $${slap-network-information:local-ipv4}
+ipv6 = $${slap-network-information:global-ipv6}
+ipv4 = $${slap-network-information:local-ipv4}
 port = $${slap-parameter:port}
 http-redirection = $${slap-parameter:http-redirection}
 ssl-key-path = $${ca-frontend:key-file}
@@ -60,10 +62,16 @@ node-binary = ${nodejs:location}/bin/node
 node-env = ${buildout:parts-directory}:${npm-modules:location}/node_modules
 shell-path = ${dash:location}/bin/dash
 
-[frontend-promise]
+[frontend-promise-ipv6]
 recipe = slapos.cookbook:check_port_listening
 path = $${basedirectory:promises}/frontend_promise
-hostname = $${frontend-instance:ip}
+hostname = $${frontend-instance:ipv6}
+port = $${frontend-instance:port}
+
+[frontend-promise-ipv4]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/frontend_promise
+hostname = $${frontend-instance:ipv4}
 port = $${frontend-instance:port}
 
 [certificate-authority]
@@ -133,6 +141,7 @@ state-file = $${rootdirectory:srv}/logrotate.status
 # Default value if no port is specified
 port = 4443
 http-redirection = 0
+slave_instance_list =
 
 # [logrotate-entry-frontend]
 # <= logrotate

software/kvm/instance-kvm.cfg.in

@@ -36,7 +36,7 @@ storage-path = $${directory:srv}/mac
 [gen-passwd]
 recipe = slapos.cookbook:generate.password
 storage-path = $${directory:srv}/passwd
-bytes = 4
+bytes = 8
 
 [kvm-instance]
 # XXX-Cedric: change "KVM" recipe to simple "create wrappers". No need for this
@@ -135,7 +135,7 @@ key-file = $${slap-connection:key-file}
 cert-file = $${slap-connection:cert-file}
 computer-id = $${slap-connection:computer-id}
 partition-id = $${slap-connection:partition-id}
-name = SlaveFrontend
+name = VNC Frontend
 software-type = $${slap-parameter:frontend-software-type}
 slave = true
 config = host port
@@ -162,7 +162,6 @@ curl_path = ${curl:location}/bin/curl
 
 [slap-parameter]
 # Default values if not specified
-frontend-instance-guid = SOFTINST-11031
 frontend-software-type = frontend
 frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg
 
@@ -175,4 +174,4 @@ ram-size = 1024
 disk-size = 10
 disk-type = virtio
 
-cpu-count = 1
\ No newline at end of file
+cpu-count = 1

software/kvm/instance-kvmplus.cfg.in

-#############################
-#
-# Instanciate kvm+
-#
-#############################
-
-# Deprecated. Just specify amount of RAM / disk you want in instance parameter.
-
-[buildout]
-extends = ${template-kvm:output}
-
-[slap-parameter]
-ram-size = 2048
-disk-size = 20
\ No newline at end of file

software/kvm/instance.cfg.in

@@ -10,7 +10,6 @@ offline = true
 recipe = slapos.cookbook:softwaretype
 default = ${template-kvm:output}
 kvm = ${template-kvm:output}
-kvm+ = ${template-kvmplus:output}
 nbd = ${template-nbd:output}
 frontend = ${template-frontend:output}
 

software/kvm/software.cfg

@@ -143,4 +143,4 @@ xml-marshaller = 0.9.7
 
 # Required by:
 # slapos.core==0.35.1
-zope.interface = 4.0.5
\ No newline at end of file
+zope.interface = 4.0.5

software/tt-rss/development.cfg

+# Exactly the same as software.cfg, but fetch the slapos.cookbook and
+# slapos.toolbox from git repository instead of fetching stable version,
+# allowing to play with bleeding edge environment.
+
+# You'll need to run buildout twice for this profile.
+
+[buildout]
+extends =
+  ../../component/git/buildout.cfg
+  software.cfg
+
+
+parts +=
+# Development parts
+  slapos.cookbook-repository
+  slapos.core-repository
+  slapos.toolbox-repository
+  check-recipe
+
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+  ${:parts-directory}/slapos.core-repository
+  ${:parts-directory}/slapos.toolbox-repository
+
+
+[slapos.toolbox-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.toolbox.git
+branch = master
+git-executable = ${git:location}/bin/git
+
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = tt-rss
+git-executable = ${git:location}/bin/git
+
+[slapos.core-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.core.git
+branch = master
+git-executable = ${git:location}/bin/git
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command =
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
+  grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link &&
+  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
+
+[versions]
+slapos.cookbook =
+slapos.toolbox =
+slapos.core =
+

software/tt-rss/instance-custom.cfg.in

@@ -13,4 +13,9 @@ mysql-database = $${apache-php:mysql-database}
 mysql-host = $${apache-php:mysql-host}
 mysql-port = $${apache-php:mysql-port}
 configureinstall-location = $${basedirectory:scripts}/configureInstall
-sql-script = ${sql-script:location}/${sql-script:filename}
\ No newline at end of file
+sql-script = ${sql-script:location}/${sql-script:filename}
+
+# Give the correct information to apache recipe to put the hostname in the
+# tt-rss config file
+[apache-php]
+application-url = $${request-frontend:connection-site_url}

software/tt-rss/software.cfg

@@ -2,10 +2,13 @@
 extends =
   ../../stack/lamp/buildout.cfg
 
+[versions]
+slapos.cookbook = 
+
 [application]
 recipe = slapos.recipe.build:download-unpacked
-url = https://github.com/gothfox/Tiny-Tiny-RSS/archive/1.7.5.tar.gz
-#md5sum = a81cea71701404cebf64c07b7ac6c948
+url = https://github.com/gothfox/Tiny-Tiny-RSS/archive/1.7.8.tar.gz
+md5sum = efd7eec1629db379896fb7e74bba400e
 strip-top-level-dir = true
 
 [application-template]

software/tt-rss/template/config.php.in

@@ -17,8 +17,7 @@
 	// *** Basic settings (important!) ***
 	// ***********************************
 
-  //FIXME set frontend URL
-	define('SELF_URL_PATH', 'http://%(ip)s:%(port)s');
+	define('SELF_URL_PATH', '%(url)s');
 	// Full URL of your tt-rss installation. This should be set to the
 	// location of tt-rss directory, e.g. http://yourserver/tt-rss/
 	// You need to set this option correctly otherwise several features

stack/erp5/buildout.cfg

@@ -64,6 +64,7 @@ extends =
   ../../component/wget/buildout.cfg
   ../../component/aspell/buildout.cfg
   ../../component/cloudooo/buildout.cfg
+  ../../component/jsl/buildout.cfg
 
 parts =
   rdiff-backup
@@ -74,6 +75,7 @@ parts =
   file
   graphviz
   haproxy
+  jsl
   varnish-3.0
   w3m
   poppler
@@ -392,6 +394,7 @@ initialization =
   sys.path[:0] = sum((
     glob.glob(os.path.join(x, 'Products', '*', 'tests'))
     for x in os.getenv('INSERT_PRODUCTS_PATH', '').split(os.pathsep)), [])
+  os.environ['PATH'] = '${jsl:location}/bin:%s' % os.environ['PATH']
   os.environ['CGI_PATH'] = '${w3-validator:location}/httpd/cgi-bin'
 
 [test_suite_runner]

stack/lamp/apache/instance-apache-php.cfg.in

@@ -187,6 +187,15 @@ recipe = slapos.cookbook:urlparse
 url = $${request-mariadb:connection-url}
 
 
+
+#----------------
+#--
+#-- Common network parameters
+[apache-network-configuration]
+listening-ip = $${slap-network-information:global-ipv6}
+listening-port = 8080
+
+
 #----------------
 #--
 #-- Deploy Apache + PHP application.
@@ -200,8 +209,8 @@ configuration = ${application-configuration:location}
 htdocs = $${directory:www}
 pid-file = $${basedirectory:run}/apache.pid
 lock-file = $${basedirectory:run}/apache.lock
-ip = $${slap-network-information:global-ipv6}
-port = 8080
+ip = $${apache-network-configuration:listening-ip}
+port = $${apache-network-configuration:listening-port}
 url = http://[$${:ip}]:$${:port}/
 error-log = $${directory:httpd-log}/error.log
 access-log = $${directory:httpd-log}/access.log
@@ -242,7 +251,7 @@ name = Frontend
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
 slave = true
 config = url custom_domain
-config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
+config-url = http://[$${apache-network-configuration:listening-ip}]:$${apache-network-configuration:listening-port}/
 return = site_url
 config-custom_domain = $${slap-parameter:domain}
 

stack/lamp/buildout.cfg

@@ -74,7 +74,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = 296ba845c8ffe75fbc6352dd0e8ce836
+md5sum = 3e2d71d3684aac3e52d2f55794df96bf
 mode = 0644
 
 [instance-apache-import]
@@ -326,7 +326,7 @@ netaddr = 0.7.10
 pycrypto = 2.6
 pytz = 2013b
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.76.0
+slapos.cookbook = 0.78.0
 slapos.recipe.build = 0.11.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
@@ -368,7 +368,7 @@ pyflakes = 0.6.1
 
 # Required by:
 # hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.76.0
+# slapos.cookbook==0.78.0
 # slapos.core==0.35.1
 # slapos.toolbox==0.34.0
 # supervisor==3.0b1