Include varnish and stunnel to the stack

software/apache/instance.cfg

@@ -11,4 +11,6 @@ httpd_binary = ${apache:location}/bin/httpd
 logrotate_binary = ${logrotate:location}/usr/sbin/logrotate
 openssl_binary = ${openssl:location}/bin/openssl
 dcrond_binary = ${dcron:location}/sbin/crond
+varnishd_binary = ${varnish-2.1:location}/sbin/varnishd
+stunnel_binary = ${stunnel:location}/bin/stunnel
 rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup

software/apache/software.cfg

@@ -20,6 +20,6 @@ module = apache
 # Default template for erp5 instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-#md5sum = 1b29b27aedcc7fa5f30f1053e8eab13f
+md5sum = dc8ba2ae93a18a4614977137c44e7c39
 output = ${buildout:directory}/template.cfg
 mode = 0644

stack/apache.cfg

@@ -11,6 +11,8 @@ find-links =
 extends =
   ../component/lxml-python/buildout.cfg
   ../component/apache/buildout.cfg
+  ../component/stunnel/buildout.cfg
+  ../component/varnish/buildout.cfg
   ../component/dcron/buildout.cfg
   ../component/logrotate/buildout.cfg
   ../component/python-2.7/buildout.cfg
@@ -22,6 +24,10 @@ versions = versions
 parts =
   apache
   apache-antiloris
+
+  stunnel
+  varnish-2.1
+
   dcron
   logrotate
   rdiff-backup