Merge branch 'erp5' into erp5-z2.13

Conflicts:
	stack/erp5/buildout.cfg

CHANGES.txt

 Changes
 =======
 
+0.73.1 (2012-02-19)
+-------------------
+
+ * softwaretype recipe: all falsy parameter values are now ignored. [Cedric de Saint Martin]
+
+0.73.0 (2013-02-18)
+-------------------
+
+ * Add mioga and apacheperl recipes. [Viktor Horvath]
+ * request.py: Properly fetch instance_guid of instance. [Cedric de Saint Martin]
+ * request.py: Only append SLA parameter to the list if the key actually exists and is not empty string. [Cedric de Saint Martin]
+
+0.72.0 (2013-02-11)
+-------------------
+
+ * librecipe: correctly handle newline and missing file in addLineToFile(). [Marco Mariani]
+ * LAMP: Copy php application even if directory exists but is empty. This handle new resilient LAMP stack. [Cedric de Saint Martin]
+ * LAMP: Don't even try to restart/reload/graceful Apache. This fix "Apache hangs" problem. [Cedric de Saint Martin]
+
+0.71.4 (2013-02-01)
+-------------------
+
+ * Enable IPv6 support in KumoFS. [Vincent Pelletier]
+ * Use new connection and get result when try to create new erp5 site. [Rafael Monnerat]
+ * Set up timezone database in mariab's mysql table so that we can use timezone conversion function. [Kazuhiko Shiozaki]
+ * Make erp5_bootstrap wait for manage_addERP5Site response [Rafael Monnerat]
+
+0.71.3 (2013-01-31)
+-------------------
+
+ * Add mysql_ip and mysql_port parameters in apachephp recipe [Cedric de Saint
+   Martin]
+ * Random password for postgres in standalone SR and lapp stack; accept
+   connections from the world. [Marco Mariani]
+
+0.71.2 (2013-01-29)
+-------------------
+
+ * revised postgres/lapp recipe. [Marco Mariani]
+
+
 0.71.1 (2013-01-04)
 -------------------
 

component/apache-perl/buildout.cfg

 [buildout]
-parts = apache-perl
+parts = apache-perl perl-Apache2-Request
 
 extends =
   ../apache/buildout.cfg
@@ -15,7 +15,16 @@ configure-command =
   ${perl:location}/bin/perl Makefile.PL
 configure-options =
   MP_AP_PREFIX=${apache-2.2:location}
+  LIBS="-L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}"
 
+# for mod_apreq2 and Apache2::Request
+[perl-Apache2-Request]
+recipe = slapos.recipe.build:cpan
+modules =
+  I/IS/ISAAC/libapreq2-2.13.tar.gz
+perl = perl
+cpan-configuration =
+  makepl_arg = ('--with-apache2-apxs=${apache-2.2:location}/bin/apxs')
 environment =
-  # CPPFLAGS=-I${libuuid:location}/include
-  MP_CCOPTS=-L${libuuid:location}/lib
+  APR_LDFLAGS = -L${libuuid:location}/lib -Wl,-R${libuuid:location}/lib -L${libexpat:location}/lib -Wl,-R${libexpat:location}/lib -L${apache-2.2:location}/lib -Wl,-R${apache-2.2:location}/lib
+  LDFLAGS=-L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib -L${apache-2.2:location}/lib -Wl,-rpath=${apache-2.2:location}/lib

component/apache/buildout.cfg

@@ -149,6 +149,7 @@ configure-options = --disable-static
                     --enable-proxy-scgi
                     --enable-dav
                     --enable-dav-fs
+                    --enable-dav-lock
                     --enable-so
                     --enable-ssl
                     --with-included-apr

component/cloud9/buildout.cfg

@@ -51,7 +51,7 @@ md5sum = 5dc8cc28447ed3747b8a53c768d872aa
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
 recipe = plone.recipe.command
 stop-on-error = true
-commit = 6b0112363dd0f9523430808394a162d3cc699550
+commit = 9158bbf9e886e3b96e91239249aca66e420aa8d1
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};

component/libtiff/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 [libtiff]
 recipe = hexagonit.recipe.cmmi
 version = 4.0.3
-url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
+url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
 md5sum = 051c1068e6a0627f461948c365290410
 configure-options =
   --disable-static

component/perl-Crypt-SSLeay/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../component/zlib/buildout.cfg
+parts =
+  perl-Crypt-SSLeay
+
+[perl-Crypt-SSLeay]
+recipe = slapos.recipe.build:cpan
+modules =
+  G/GA/GAAS/URI-1.60.tar.gz
+  N/NA/NANIS/Crypt-SSLeay-0.64.tar.gz
+cpan-configuration =
+  make_arg=('OTHERLDFLAGS="-L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${openssl:location}/lib -Wl,-R${openssl:location}/lib"')
+  makepl_arg=('INC=-I${openssl:location}/include')
+environment =
+  OPENSSL_PREFIX=${openssl:location}
+perl = perl
+

component/perl-DBD-Pg/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../postgresql/buildout.cfg
+parts =
+  perl-DBD-Pg
+
+[perl-DBD-Pg]
+recipe = slapos.recipe.build:cpan
+modules =
+  T/TU/TURNSTEP/DBD-Pg-2.19.3.tar.gz
+environment =
+  POSTGRES_HOME=${postgresql:location}
+perl = perl

component/perl-Image-Magick/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../imagemagick/buildout.cfg
+parts = perl-Image-Magick
+
+[perl-Image-Magick_MakefilePL.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 31043e2b79e725d3b251aa09b4549046
+download-only = true
+filename = ${:_buildout_section_name_}
+
+[perl-Image-Magick]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${perl:version}
+  ${imagemagick:location}
+url = http://search.cpan.org/CPAN/authors/id/J/JC/JCRISTY/PerlMagick-6.77.tar.gz
+md5sum = fa0f66fa0cabbd1b196254f94dec8e99
+patch-options = -p0
+patches =
+  ${perl-Image-Magick_MakefilePL.patch:location}/${perl-Image-Magick_MakefilePL.patch:filename}
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL LIBS="-L${imagemagick:location}/lib -Wl,-R${imagemagick:location}/lib -L${perl:location}/libs-c -Wl,-R${perl:location}/libs-c" INC="-I${imagemagick:location}/include/ImageMagick"

component/perl-Image-Magick/perl-Image-Magick_MakefilePL.patch

+--- Makefile.PL.orig	2012-10-02 14:58:25.537661734 +0200
++++ Makefile.PL	2012-10-02 15:23:32.250928745 +0200
+@@ -156,11 +156,26 @@
+ }
+ 
+ # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
+-my $INC_magick = '-I../ -I.. -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
+-my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm';
+-my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread";
+-my $LDFLAGS_magick   = "-L../magick/.libs -lMagickCore $Config{'ldflags'} -L/usr/lib";
+-my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} -L/usr/lib";
++my %paths_magick = ();
++foreach my $section ('INC', 'LIBS', 'CCFLAGS', 'LDFLAGS', 'LDDLFLAGS') {
++    $paths_magick{$section} = '';
++}
++{
++    my $i = 0;
++    while ($i <= $#ARGV) {
++        my ($key, $val) = split(/=/, $ARGV[$i], 2);
++        if (exists $paths_magick{$key}) {
++            $paths_magick{$key} = $val;       
++            delete $ARGV[$i];
++        }
++        $i++;
++    }
++}
++# Enforce standard components
++$paths_magick{LIBS}      .= ' -lMagickCore -lperl -lm';
++$paths_magick{CCFLAGS}   .= " $Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread";
++$paths_magick{LDFLAGS}   .= " -lMagickCore $Config{'ldflags'}";
++$paths_magick{LDDLFLAGS} .= " -lMagickCore $Config{'lddlflags'}";
+ 
+ if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
+   my($Ipaths, $Lpaths) = AutodetectWin32gcc();
+@@ -168,11 +183,11 @@
+   #
+   # Setup for strawberry perl.
+   #
+-  $INC_magick       = "$Ipaths";
+-  $LIBS_magick      = "-lMagickCore";
+-  $CCFLAGS_magick   = "$Config{'ccflags'}";
+-  $LDFLAGS_magick   = "$Config{'ldflags'} $Lpaths ";
+-  $LDDLFLAGS_magick = "$Config{'lddlflags'} $Lpaths ";
++  $paths_magick{INC}       = "$Ipaths";
++  $paths_magick{LIBS}      = "-lMagickCore";
++  $paths_magick{CCFLAGS}   = "$Config{'ccflags'}";
++  $paths_magick{LDFLAGS}   = "$Config{'ldflags'} $Lpaths ";
++  $paths_magick{LDDLFLAGS} = "$Config{'lddlflags'} $Lpaths ";
+ }
+ 
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+@@ -195,7 +210,7 @@
+    'DEFINE'	=> ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H',     # e.g., '-DHAVE_SOMETHING'
+ 
+    # Header search specfication and preprocessor flags
+-   'INC'	=> $INC_magick,
++   'INC'	=> $paths_magick{INC},
+ 
+    # C compiler
+    #'CC' => 'gcc -std=gnu99 -std=gnu99',
+@@ -204,22 +219,22 @@
+    # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2",
+ 
+    # C compiler flags (e.g. -O -g)
+-   'CCFLAGS' => $CCFLAGS_magick,
++   'CCFLAGS' => $paths_magick{CCFLAGS},
+ 
+    # Linker
+    #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
+ 
+    # Linker flags for building an executable
+-   'LDFLAGS' =>  $LDFLAGS_magick,
++   'LDFLAGS' =>  $paths_magick{LDFLAGS},
+ 
+    # Linker flags for building a dynamically loadable module
+-   'LDDLFLAGS' => $LDDLFLAGS_magick,
++   'LDDLFLAGS' => $paths_magick{$LDDLFLAGS},
+ 
+    # Install PerlMagick binary into ImageMagick bin directory
+    'INSTALLBIN'	=> '/usr/local/bin',
+ 
+    # Library specification
+-   'LIBS' => [ $LIBS_magick ],
++   'LIBS' => [ $paths_magick{LIBS} ],
+ 
+    # Perl binary name (if a Perl binary is built)
+    'MAP_TARGET'	=> 'PerlMagick',

component/perl-Search-Xapian/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../xapian/buildout.cfg
+parts =
+  perl-Search-Xapian
+
+[perl-Search-Xapian]
+recipe = slapos.recipe.build:cpan
+modules =
+  O/OL/OLLY/Search-Xapian-1.2.10.0.tar.gz
+environment =
+  XAPIAN_CONFIG=${xapian:location}/bin/xapian-config
+perl = perl

component/perl-Term-ReadLine-Gnu/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../readline/buildout.cfg
+parts = perl-Term-ReadLine-Gnu
+
+[perl-Term-ReadLine-Gnu.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = d4e4624e717c8da63e4d153149d57b68
+download-only = true
+filename = ${:_buildout_section_name_}
+
+[perl-Term-ReadLine-Gnu]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${perl:version}
+url = http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz
+md5sum = fa33510193b89a2ada74fcef00816322
+patch-options = -p0
+patches =
+  ${perl-Term-ReadLine-Gnu.patch:location}/${perl-Term-ReadLine-Gnu.patch:filename}
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL --libdir=${readline:location}/lib --includedir="${readline:location}/include" LIBS="-Wl,-R${readline:location}/lib -L${ncurses:location}/lib -Wl,-R${ncurses:location}/lib" INC="-I${ncurses:location}/include"

component/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.patch

+--- Makefile.PL.orig	2012-09-26 16:40:42.922821617 +0200
++++ Makefile.PL	2012-10-02 02:51:26.400659861 +0200
+@@ -22,7 +22,22 @@
+ use Config;
+ use Getopt::Long;
+ use 5.007; use 5.7.0;		# use version 1.09 for older Perl
+-my ($defs, $libs, $lddflags, $RLLIB, $RLINC);
++my ($defs, $lddflags, %config);
++
++{
++    $config{LIBS} = '';
++    $config{INC}  = '';
++
++    my $i = 0;
++    while ($i <= $#ARGV) {
++        my ($key, $val) = split(/=/, $ARGV[$i], 2);
++        $config{$key} = $val;       
++        if ($key eq 'LIBS' || $key eq 'INC') {
++            delete $ARGV[$i];
++        }
++        $i++;
++    }
++}
+ 
+ # exit 0 before creating the Makefile to be CPAN Testers friendly
+ # see http://wiki.cpantester.org/wiki/CPANAuthorNotes
+@@ -36,20 +51,23 @@
+ $defs = ($Config{strings} =~ m|/string.h$|) ? '-DHAVE_STRING_H' : '';
+ 
+ # Parse command line to specify paths for the GNU Readline Library
++# (if they have not already been included within LIBS or INC)
+ {
+     my ($prefix, $libdir, $incdir);
+     GetOptions("prefix=s" => \$prefix,
+ 	       "libdir=s" => \$libdir,
+ 	       "includedir=s" => \$incdir);
+-    $RLLIB = defined $libdir
++    my $RLLIB = defined $libdir
+ 	? "-L$libdir" : (defined $prefix ? "-L$prefix/lib" : '');
+-    $RLINC = defined $incdir
++    my $RLINC = defined $incdir
+ 	? "-I$incdir" : (defined $prefix ? "-I$prefix/include" : '');
++    $config{LIBS} .= " $RLLIB";
++    $config{INC}  .= " $RLINC";
+ }
+ 
+ if ($Config{osname} eq 'os2') {
+     # Check ftp://ftp.math.ohio-state.edu/pub/users/ilya/os2/
+-    $libs = '-lreadline_import';
++    $config{LIBS} .= ' -lreadline_import';
+     $defs .= ' -DOS2_USEDLL';
+     $lddflags = '';
+ } else {
+@@ -60,18 +78,27 @@
+     # Old Cygwin may require setting false (0).
+     my $PREFER_CURSES = $Config{osname} eq 'aix' || $Config{osname} eq 'hpux'
+ 			|| $Config{osname} eq 'cygwin';
+-    my $TERMCAP_LIB = (! $PREFER_CURSES && &search_lib('-ltermcap'))
+-	|| &search_lib('-lncurses')
+-	    || &search_lib('-lcurses');
++    my @lib_dirs = ();
++    # Turn -L<path> parameters into a list of <path>s
++    {
++        foreach my $libopt (split(' ',$config{LIBS})) {
++            if ($libopt =~ m#^-L(.*)$#) {
++                push @lib_dirs, $1;
++            }
++        }
++    }
++    my $TERMCAP_LIB = (! $PREFER_CURSES && &search_lib('-ltermcap', \@lib_dirs))
++	|| &search_lib('-lncurses', \@lib_dirs)
++	    || &search_lib('-lcurses', \@lib_dirs);
+ 
+     unless ($TERMCAP_LIB) {
+ 	warn "Could not find neither libtermcap.a, libncurses.a, or libcurses.\n";
+ 	exit $err;
+     } 
+  
+-    $libs = "-lreadline $TERMCAP_LIB";
++    $config{LIBS} .= " -lreadline $TERMCAP_LIB";
+     # Latest Perl in FreeBSD does not need this hack. (Dec.2002)
+-    $libs .= ' -lcrypt' if ($Config{osname} =~ /freebsd/i);
++    $config{LIBS} .= ' -lcrypt' if ($Config{osname} =~ /freebsd/i);
+     $lddflags = '';
+     # If you are using old Cygwin, enable the following line.
+     #$lddflags = ($Config{osname} =~ /cygwin/i) ? '-static' : '';
+@@ -80,7 +107,7 @@
+ # Check version of  GNU Readline Library (for version 4.2 and before)
+ {
+     my ($rlmajorver, $rlminorver) =
+-	check_readline_version($RLINC, $RLLIB, $defs, $lddflags, $libs);
++	check_readline_version($defs, $lddflags, \%config);
+ 
+     if ($rlmajorver < 4 || $rlmajorver == 4 && $rlminorver <= 2) {
+ 	$defs .= " -DRL_READLINE_VERSION=" .
+@@ -95,15 +122,15 @@
+     (
+      NAME	  => 'Term::ReadLine::Gnu',
+      VERSION_FROM => 'Gnu.pm',
+-     LIBS	  => [ "$RLLIB $libs" ],
+-     LDDLFLAGS	  => "$RLLIB $Config{lddlflags}",
++     LIBS	  => $config{LIBS},
++     LDDLFLAGS	  => $Config{lddlflags},
+      dynamic_lib  => { OTHERLDFLAGS => $lddflags },
+      DEFINE	  => $defs,
+      ($Config{osname} eq 'os2' ?
+       (
+        IMPORTS	  => { xfree => 'emxlibcm.401' }, # Yuck!
+       ) : () ),
+-     INC	  => $RLINC,
++     INC	  => $config{INC},
+      dist	  => { COMPRESS => 'gzip -9f', SUFFIX => 'gz' },
+      clean	  => { FILES => "rlver.c rlver$Config{_exe}" },
+ );
+@@ -122,20 +149,20 @@
+ exit(0);
+ 
+ ########################################################################
+-# Search a library '$lib' in $Config{libpth} directories, and return
++# Search a library '$lib' in the given directories (listref), and return
+ # $lib if exist or undef unless exist.
+ 
+ # ExtUtils::Liblist::ext() do similar job as this subroutine, but it
+ # warns unnecessary messages.
+ sub search_lib {
+-    my ($lib) = @_;
++    my ($lib, $lib_dirs) = @_;
+     unless ($lib =~ /^-l/) {
+ 	warn "search_lib: illegal arguments, \`$lib\'.\n";
+ 	return undef;
+     }
+     my $libbase = 'lib' . substr($lib, 2) . $Config{lib_ext};
+     my $libbase_so = 'lib' . substr($lib, 2) . "." . $Config{so};
+-    foreach (split(' ', $Config{libpth})) {
++    foreach (split(' ', $Config{libpth}), @$lib_dirs) {
+ 	if (-f $_ . '/' . $libbase) {
+ #	    print "$_/$libbase\n";
+ 	    print "Found \`$_/$libbase\'.\n";
+@@ -158,7 +185,7 @@
+ #	RL_VERSION_MINOR
+ # Someday we don't need this subroutine..
+ sub check_readline_version {
+-    my ($RLINC, $RLLIB, $defs, $lddflags, $libs) = @_;
++    my ($defs, $lddflags, $config) = @_;
+     my $frlver = 'rlver.c';
+ 
+     # make temp file
+@@ -172,7 +199,7 @@
+     close(F);
+ 
+     # compile it
+-    my $comp_cmd = "$Config{cc} $RLINC $Config{ccflags} $defs $frlver -o rlver $RLLIB $lddflags $Config{ldflags} $libs";
++    my $comp_cmd = "$Config{cc} $config->{INC} $Config{ccflags} $defs $frlver -o rlver $lddflags $Config{ldflags} $config->{LIBS}";
+     print $comp_cmd, "\n";
+     system($comp_cmd);
+     if ($?) {

component/perl-Text-Iconv/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../libiconv/buildout.cfg
+parts = perl-Text-Iconv
+
+[perl-Text-Iconv]
+recipe = slapos.recipe.build:cpan
+cpan-configuration =
+  makepl_arg='LIBS="-L${libiconv:location}/lib -Wl,-R${libiconv:location}/lib" INC="-I${libiconv:location}/include"'
+modules =
+  M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
+perl = perl

component/perl-XML-LibXSLT/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../libxslt/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../zlib/buildout.cfg
+parts = perl-XML-LibXSLT
+
+[perl-XML-LibXSLT]
+recipe = slapos.recipe.build:cpan
+cpan-configuration =
+  makepl_arg='LIBS="-L${libxslt:location}/lib -Wl,-R${libxslt:location}/lib -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libxml2:location}/lib -Wl,-R${libxml2:location}/lib" INC="-I${libxslt:location}/include -I${libxml2:location}/include/libxml2"'
+modules =
+  S/SH/SHLOMIF/XML-LibXSLT-1.78.tar.gz
+perl = perl

component/perl/buildout.cfg

@@ -12,6 +12,13 @@ md5sum = 9873a89c969bd5a478434c3b8b2d57d8
 download-only = true
 filename = ${:_buildout_section_name_}
 
+[perl-postmakehook-download]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 7fded8308c1676decf77575c6d6b325f
+download-only = true
+filename = create-libs-symlink.py
+
 [perl]
 recipe = hexagonit.recipe.cmmi
 depends =
@@ -30,6 +37,8 @@ configure-command =
     -Dcflags=-I${gdbm:location}/include \
     -Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \
     -Ui_db \
-    -Dnoextensions=ODBM_File
+    -Dnoextensions=ODBM_File \
+    -Dusethreads
 environment =
   PATH=${patch:location}/bin:%(PATH)s
+post-make-hook = ${perl-postmakehook-download:location}/${perl-postmakehook-download:filename}:post_make_hook

component/perl/create-libs-symlink.py

+
+import fnmatch
+import os
+import pprint
+
+
+def post_make_hook(options, buildout):
+  location = options['location']
+  matches = []
+  for root, dirnames, filenames in os.walk(location):
+    for filename in fnmatch.filter(filenames, 'libperl.a'):
+      matches.append(os.path.join(root, filename))
+  nr_matches = len(matches)
+  if nr_matches == 0:
+    print "ERROR - no libperl.* found!"
+    exit
+  elif nr_matches > 1:
+    print "WARNING - several libperl.a found, taking only the first one:", matches.join("\n")
+  
+  # matches[0] is a prefix of "location"
+  # For the symlink, we want the relative path.
+  rel_link = os.path.relpath(os.path.dirname(matches[0]), location)
+  os.symlink(rel_link, os.path.join(location, "libs-c"))
+  print "Created symlink \"libs-c\" to", rel_link

component/postgresql/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../readline/buildout.cfg
   ../zlib/buildout.cfg
   ../ncurses/buildout.cfg
+  ../perl/buildout.cfg
 parts = postgresql
 
 
@@ -15,10 +16,10 @@ parts = postgresql
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.postgresql.org/pub/source/v9.1.7/postgresql-9.1.7.tar.bz2
 md5sum = eaf7b67493d59d1a60767ffdfbd65ce9
-configure-options = --with-openssl
+configure-options = --with-openssl --with-perl
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib 
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c
 
 
 [postgresql92]
@@ -28,5 +29,4 @@ md5sum = 1cc388988e69bf75c6b55d59070100f6
 configure-options = --with-openssl
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib 
-
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c

component/rsync/buildout.cfg

+[buildout]
+parts =
+  rsync
+
+[rsync]
+recipe = hexagonit.recipe.cmmi
+url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz
+md5sum = 5ee72266fe2c1822333c407e1761b92b
+make-options =
+  PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}

component/slapos/buildout.cfg

@@ -114,6 +114,7 @@ scripts =
   slapgrid-supervisorctl = slapos.grid.svcbackend:supervisorctl
   slapgrid-supervisord = slapos.grid.svcbackend:supervisord
   slapproxy = slapos.proxy:main
+  slapproxy-query = slapos.proxy.query:main
   slapos = slapos.entry:main
   slapos-watchdog = slapos.grid.watchdog:main
 
@@ -129,45 +130,54 @@ scripts = py
 # Use our own buildout version
 zc.buildout = 1.6.0-dev-SlapOS-010
 
-# Generated by buildout-versions
+# Don't use beta
+lxml = 3.0.2
+
 Jinja2 = 2.6
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
 hexagonit.recipe.cmmi = 1.6
-lxml = 3.0.1
-meld3 = 0.6.9
+meld3 = 0.6.10
 netaddr = 0.7.10
-slapos.core = 0.33.1
-slapos.libnetworkcache = 0.13.2
+slapos.core = 0.35
+slapos.libnetworkcache = 0.13.3
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.35
 Flask = 0.9
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6
 
 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.35
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.33.1
-# slapos.libnetworkcache==0.13.2
+# slapos.core==0.35
+pyflakes = 0.6.1
+
+# Required by:
+# slapos.core==0.35
+# slapos.libnetworkcache==0.13.3
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.1
+# zope.interface==4.0.3
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.35
 supervisor = 3.0b1
 
 # Required by:
-# slapos.core==0.33.1
-zope.interface = 4.0.1
+# slapos.core==0.35
+unittest2 = 0.5.1
+
+# Required by:
+# slapos.core==0.35
+zope.interface = 4.0.3

component/xapian/buildout.cfg

+[buildout]
+parts =
+  xapian
+depends =
+  ../zlib/buildout.cfg
+  ../libuuid/buildout.cfg
+
+[xapian]
+recipe = hexagonit.recipe.cmmi
+url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz
+md5sum = faf33a3945edbe4c848627750856cbeb
+environment =
+  CPPFLAGS = -I${zlib:location}/include -I${libuuid:location}/include
+  LDFLAGS = -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libuuid:location}/lib -Wl,-R${libuuid:location}/lib
\ No newline at end of file

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.71.2-dev'
+version = '0.73.2-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -70,6 +70,7 @@ setup(name=name,
           'agent = slapos.recipe.agent:Recipe',
           'apache.frontend = slapos.recipe.apache_frontend:Recipe',
           'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
+          'apacheperl = slapos.recipe.apacheperl:Recipe', 
           'apachephp = slapos.recipe.apachephp:Recipe',
           'apacheproxy = slapos.recipe.apacheproxy:Recipe',
           'certificate_authority = slapos.recipe.certificate_authority:Recipe',
@@ -130,6 +131,7 @@ setup(name=name,
           'logrotate.d = slapos.recipe.logrotate:Part',
           'memcached = slapos.recipe.memcached:Recipe',
           'mkdirectory = slapos.recipe.mkdirectory:Recipe',
+          'mioga.instantiate = slapos.recipe.mioga.instantiate:Recipe',
           'mydumper = slapos.recipe.mydumper:Recipe',
           'mysql = slapos.recipe.mysql:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',

slapos/recipe/apacheperl/__init__.py

+ ##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import shutil
+import os
+import signal
+from binascii import b2a_uu as uuencode
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    # Copy application
+#    shutil.rmtree(self.options['htdocs'])
+#    shutil.copytree(self.options['source'],
+#                    self.options['htdocs'])
+
+    # Install apache
+    apache_config = dict(
+      pid_file=self.options['pid-file'],
+      lock_file=self.options['lock-file'],
+      ip=self.options['ip'],
+      port=self.options['port'],
+      error_log=self.options['error-log'],
+      access_log=self.options['access-log'],
+      document_root=self.options['htdocs'],
+    )
+    httpd_conf = self.createFile(self.options['httpd-conf'],
+      self.substituteTemplate(self.getTemplateFilename('apache.in'),
+                              apache_config)
+    )
+    path_list.append(httpd_conf)
+
+    wrapper = self.createPythonScript(self.options['wrapper'],
+        'slapos.recipe.librecipe.execute.execute',
+        [self.options['httpd-binary'], '-f', self.options['httpd-conf'],
+         '-DFOREGROUND']
+    )
+    path_list.append(wrapper)
+
+    if os.path.exists(self.options['pid-file']):
+      # Reload apache configuration
+      with open(self.options['pid-file']) as pid_file:
+        pid = int(pid_file.read().strip(), 10)
+      try:
+        os.kill(pid, signal.SIGUSR1) # Graceful restart
+      except OSError:
+        pass
+
+    return path_list

slapos/recipe/apacheperl/template/apache.in

+# Apache static configuration
+
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule perl_module modules/mod_perl.so
+LoadModule apreq_module modules/mod_apreq2.so
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+Listen [%(ip)s]:%(port)s
+ServerAdmin someone@email
+DefaultType text/plain
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+# Log configuration
+ErrorLog "%(error_log)s"
+LogLevel warn
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
+CustomLog "%(access_log)s" common
+
+<Perl>
+  use strict;
+  use warnings;
+  package mytest;
+
+  use Apache2::Const -compile => qw(OK);
+  use Apache2::RequestIO ();
+  use Apache2::RequestRec ();
+
+  use Apache2::Request;
+  use Date::Calc ();
+  use Image::Magick;
+
+  sub test_handler {
+    my ($r) = @_;
+    $r->content_type('text/plain');
+    {
+      my $date = localtime();
+      $r->print("Hello world! Current time: $date\n");
+    }
+    {
+      my $year = (localtime())[5] + 1900;
+      $r->print("Testing Date::Calc: English ordinal for current year is "
+        . Date::Calc::English_Ordinal($year) . "\n");
+    }
+    {
+      my $apreq = new Apache2::Request($r);
+      my $hello = $apreq->param('hello');
+      $r->print("Testing Apache2::Request: The parameter 'hello' is '$hello'\n");
+    }
+    {
+      my $im = new Image::Magick;
+      $r->print("Testing Image::Magick: PerlMagick success: "
+                . Image::Magick->Success . "\n");
+    }
+    return Apache2::Const::OK;
+  }
+</Perl>
+
+<Location />
+  SetHandler perl-script
+  PerlHandler mytest::test_handler
+</Location>
+
+DocumentRoot %(document_root)s
+DirectoryIndex index.html

slapos/recipe/apachephp/__init__.py

@@ -24,26 +24,26 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-
 import shutil
 import os
 import signal
-import subprocess
-
 from binascii import b2a_uu as uuencode
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
-
 class Recipe(GenericBaseRecipe):
 
   def install(self):
     path_list = []
 
-    # Copy application
-    if not os.path.exists(self.options['htdocs']):
-      shutil.copytree(self.options['source'],
-                      self.options['htdocs'])
+    # Copy application if not already existing
+    htdocs_location = self.options['htdocs']
+    if not (os.path.exists(htdocs_location) and os.listdir(htdocs_location)):
+      try:
+        os.rmdir(htdocs_location)
+      except:
+        pass
+      shutil.copytree(self.options['source'], htdocs_location)
 
     # Install php.ini
     php_ini = self.createFile(os.path.join(self.options['php-ini-dir'],
@@ -98,6 +98,8 @@ class Recipe(GenericBaseRecipe):
                               mysql_password=self.options['mysql-password'],
                               mysql_host='%s:%s' % (self.options['mysql-host'],
                                                     self.options['mysql-port']),
+                              mysql_ip=self.options['mysql-host'],
+                              mysql_port=self.options['mysql-port'],
                               secret_key=secret_key,
                              )
 
@@ -116,16 +118,12 @@ class Recipe(GenericBaseRecipe):
         self.substituteTemplate(self.options['template'], application_conf))
       path_list.append(config)
 
-    # Reload apache configuration.
-    # notez-bien: a graceful restart or a SIGUSR1 can somehow hang the apache threads.
-
-    subprocess.call([
-                        self.options['httpd-binary'],
-                        '-f',
-                        self.options['httpd-conf'],
-                        '-k',
-                        'graceful'
-                    ])
-
+    #if os.path.exists(self.options['pid-file']):
+    #  # Reload apache configuration
+    #  with open(self.options['pid-file']) as pid_file:
+    #    pid = int(pid_file.read().strip(), 10)
+    #  try:
+    #    os.kill(pid, signal.SIGUSR1) # Graceful restart
+    #  except OSError:
+    #    pass
     return path_list
-

slapos/recipe/generatepassword.py

+# vim: set et sts=2:
 ##############################################################################
 #
 # Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
@@ -24,12 +25,13 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-import random
-import os
+
 import binascii
+import os
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
+
 class Recipe(GenericBaseRecipe):
 
   def __init__(self, buildout, name, options):
@@ -44,7 +46,7 @@ class Recipe(GenericBaseRecipe):
     return GenericBaseRecipe.__init__(self, buildout, name, options)
 
   def install(self):
-    open_file = open(self.options['storage-path'], 'w')
-    open_file.write(self.options['passwd'])
-    open_file.close()
+    with open(self.options['storage-path'], 'w') as fout:
+      fout.write(self.options['passwd'])
     return [self.options['storage-path']]
+

slapos/recipe/librecipe/generic.py

@@ -98,9 +98,9 @@ class GenericBaseRecipe(object):
 
     line must be unicode."""
 
-    try:
-      lines = io.open(filepath, 'r', encoding=encoding).readlines()
-    except IOError:
+    if os.path.exists(filepath):
+      lines = [l.rstrip('\n') for l in io.open(filepath, 'r', encoding=encoding)]
+    else:
       lines = []
 
     if not line in lines:

slapos/recipe/mioga/instantiate.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+import pprint
+import re
+import shutil
+import signal
+import stat
+import subprocess
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  """\
+  Configure a Mioga instance:
+
+  - copy over /var and /buildinst directories
+  - call "make install-all"
+  """
+
+  def removeIfExisting(self, filepath):
+    if os.path.isfile(filepath):
+      os.remove(filepath)
+
+  def rsync_dir(self, src, target):
+    if os.path.isdir(src) and not src.endswith('/'):
+      src += '/'
+    cmd = subprocess.Popen(self.options['rsync_bin'] + '/rsync -a --specials '
+                           + src + ' ' + target, 
+                           env=os.environ, shell=True)
+    cmd.communicate()
+    
+
+  # Even if there is a dedicated update(), this is still called sometimes.
+  # So better not trust that and decide for ourselves.
+  def install(self):
+    self.options['admin_password'] = 'test_for_programmatic_setting'
+    # Copy the build/ and var/lib/Mioga2 folders into the instance
+    mioga_location = self.options['mioga_location']
+
+    var_dir = self.options['var_directory']
+    self.rsync_dir(os.path.join(mioga_location, 'var'), var_dir)
+    
+    buildinst_dir = self.options['buildinst_directory']
+    self.rsync_dir(self.options['mioga_buildinst'], buildinst_dir)
+    
+    former_directory = os.getcwd()
+    os.chdir(buildinst_dir)
+
+    vardir = self.options['var_directory']
+    mioga_base = os.path.join(vardir, 'lib', 'Mioga2')
+    fm = FileModifier('conf/Config.xml')
+    fm.modifyParameter('init_sql', 'no') # force_init_sql is set manually everywhere
+    fm.modifyParameter('install_dir', mioga_base)
+    fm.modifyParameter('tmp_dir', os.path.join(mioga_base, 'tmp'))
+    fm.modifyParameter('search_tmp_dir', os.path.join(mioga_base, 'mioga_search'))
+    fm.modifyParameter('maildir', os.path.join(vardir, 'spool', 'mioga', 'maildir'))
+    fm.modifyParameter('maildirerror', os.path.join(vardir, 'spool', 'mioga', 'error'))
+    fm.modifyParameter('mailfifo', os.path.join(vardir, 'spool', 'mioga', 'fifo'))
+    notifier_fifo = os.path.join(vardir, 'spool', 'mioga', 'notifier')
+    fm.modifyParameter('notifierfifo', notifier_fifo)
+    searchengine_fifo = os.path.join(vardir, 'spool', 'mioga', 'searchengine')
+    fm.modifyParameter('searchenginefifo', searchengine_fifo)
+    fm.modifyParameter('dbi_passwd', self.options['db_password'])
+    fm.modifyParameter('db_host', self.options['db_host'])
+    fm.modifyParameter('db_port', self.options['db_port'])
+    fm.modifyParameter('dav_host', self.options['public_ipv6'])
+    fm.modifyParameter('dav_port', self.options['public_ipv6_port'])
+    fm.modifyParameter('bin_dir', self.options['bin_dir'])
+    # db_name, dbi_login are standard
+    fm.save()
+    # Ensure no old data is kept
+    self.removeIfExisting('config.mk')
+    # if os.path.isdir('web/conf/apache'):
+    #   shutil.rmtree('web/conf/apache')
+
+    environ = os.environ
+    environ['PATH'] = ':'.join([self.options['perl_bin'],           # priority!
+                                # Mioga scripts in Makefiles and shell scripts
+                                self.options['bin_dir'],            
+                                self.options['libxslt_bin'],
+                                self.options['libxml2_bin'],
+                                self.options['postgres_bin'],
+                                self.options['rsync_bin'],
+                                environ['PATH'] ])
+    environ['MIOGA_SITEPERL'] = self.options['mioga_siteperl']
+    
+    # Write the Postgres password file
+    pgpassfilepath = os.path.join(self.options['instance_root'], '.pgpass')
+    pgpassfile = open(pgpassfilepath, 'w')
+    pgpassfile.write(':'.join([re.sub(r':', r'\:', self.options['db_host']),
+                               self.options['db_port'],
+                               '*', # could be self.options['db_dbname'] or 'postgres'
+                               self.options['db_username'],
+                               self.options['db_password'] ]) + "\n")
+    pgpassfile.close()
+    os.chmod(pgpassfilepath, stat.S_IRUSR | stat.S_IWUSR)
+    environ['PGPASSFILE'] = pgpassfilepath
+    
+    # We must call "make" in the SAME environment that
+    # "perl Makefile.PL" left!
+
+    cmd = subprocess.Popen(self.options['perl_bin'] + '/perl Makefile.PL disable_check'
+                           + ' && make slapos-instantiation',
+                           env=environ, shell=True)
+    cmd.communicate()
+
+    # Apache configuration!
+    # Take the files that Mioga has prepared, and wrap some standard configuration around it.
+    # TODO: can't we squeeze this somehow into the generic apacheperl recipe?
+    apache_config_mioga = '''
+LoadModule alias_module modules/mod_alias.so
+LoadModule apreq_module modules/mod_apreq2.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule authz_default_module modules/mod_authz_default.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule dav_lock_module modules/mod_dav_lock.so
+LoadModule deflate_module modules/mod_deflate.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule env_module modules/mod_env.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule perl_module modules/mod_perl.so
+
+# Basic server configuration
+PidFile REPL_PID
+Listen [REPL_IPV6HOST]:REPL_IPV6PORT
+Listen REPL_IPV4HOST:REPL_IPV6PORT
+# Listen [REPL_IPV6]:443 # what about mod_ssl and all that stuff?
+# ServerAdmin someone@email
+
+# Log configuration
+ErrorLog REPL_ERRORLOG
+LogLevel debug
+LogFormat "%h %{REMOTE_USER}i %l %u %t \\"%r\\" %>s %b \\"%{Referer}i\\" \\"%{User-Agent}i\\"" combined
+LogFormat "%h %{REMOTE_USER}i %l %u %t \\"%r\\" %>s %b" common
+CustomLog REPL_ACCESSLOG common
+DocumentRoot REPL_DOCROOT
+DirectoryIndex index.html
+DavLockDB REPL_DAVLOCK
+
+Include conf/extra/httpd-autoindex.conf
+'''
+    apache_config_mioga = (apache_config_mioga
+     .replace('REPL_PID', self.options['pid_file'])
+     .replace('REPL_IPV6HOST', self.options['public_ipv6'])
+     .replace('REPL_IPV4HOST', self.options['private_ipv4'])
+     .replace('REPL_IPV6PORT', self.options['public_ipv6_port'])
+     .replace('REPL_ERRORLOG', self.options['error_log'])
+     .replace('REPL_ACCESSLOG', self.options['access_log'])
+     .replace('REPL_DOCROOT', self.options['htdocs'])
+     .replace('REPL_STATIC', os.path.join(mioga_base, 'static')) 
+     .replace('REPL_DAVLOCK', self.options['dav_locks']) )
+
+    mioga_prepared_apache_config_dir = os.path.join(mioga_base, 'conf', 'apache')
+    for filepath in os.listdir(mioga_prepared_apache_config_dir):
+      apache_config_mioga += ("# Read in from "+filepath+"\n" + 
+        open(os.path.join(mioga_prepared_apache_config_dir, filepath)).read() + "\n" )
+    # Internal DAV only accepts its own addresses
+    apache_config_mioga = re.sub(
+      'Allow from localhost', 
+      "Allow from "+self.options['private_ipv4']+"\n\tAllow from "+self.options['public_ipv6'],
+      apache_config_mioga)
+    
+    path_list = []
+    open(self.options['httpd_conf'], 'w').write(apache_config_mioga)
+    # TODO: if that all works fine, put it into a proper template
+    # httpd_conf = self.createFile(self.options['httpd_conf'],
+    #   self.substituteTemplate(self.getTemplateFilename('apache.in'),
+    #                           apache_config)
+    # )
+    path_list.append(os.path.abspath(self.options['httpd_conf']))
+
+    services_dir = self.options['services_dir']
+
+    httpd_wrapper = self.createPythonScript(
+      os.path.join(services_dir, 'httpd_wrapper'),
+      'slapos.recipe.librecipe.execute.execute',
+      [self.options['httpd_binary'], '-f', self.options['httpd_conf'],
+       '-DFOREGROUND']
+    )
+    path_list.append(httpd_wrapper)
+
+    for fifo in [notifier_fifo, searchengine_fifo]:
+      if os.path.exists(fifo):
+        if not stat.S_ISFIFO(os.stat(fifo).st_mode):
+          raise Exception("The file "+fifo+" exists but is not a FIFO.")
+      else:
+        os.mkfifo(fifo, 0600)
+
+    site_perl_bin = os.path.join(self.options['site_perl'], 'bin')
+    mioga_conf_path = os.path.join(mioga_base, 'conf', 'Mioga.conf')
+    notifier_wrapper = self.createPythonScript(
+      os.path.join(services_dir, 'notifier'),
+      'slapos.recipe.librecipe.execute.execute',
+      [ os.path.join(site_perl_bin, 'notifier.pl'),
+        mioga_conf_path ]
+    )
+    path_list.append(notifier_wrapper)
+
+    searchengine_wrapper = self.createPythonScript(
+      os.path.join(services_dir, 'searchengine'),
+      'slapos.recipe.librecipe.execute.execute',
+      [ os.path.join(site_perl_bin, 'searchengine.pl'),
+        mioga_conf_path ]
+    )
+    path_list.append(searchengine_wrapper)
+
+    crawl_fm = FileModifier( os.path.join('bin', 'search', 'crawl_sample.sh') )
+    # TODO: The crawl script will still call the shell command "date"
+    crawl_fm.modify(r'/var/tmp/crawl', self.options['log_dir'] + '/crawl')
+    crawl_fm.modify(r'/var/lib/Mioga2/conf', mioga_base + '/conf')
+    crawl_fm.modify(r'/usr/local/bin/(mioga2_(?:info|crawl|index).pl)', 
+                    site_perl_bin + r"/\g<1>")
+    crawl_path = os.path.join(self.options['bin_dir'], 'crawl.sh')
+    crawl_fm.save(crawl_path)
+    os.chmod(crawl_path, stat.S_IRWXU)
+
+    if os.path.exists(self.options['pid_file']):
+      # Reload apache configuration
+      with open(self.options['pid_file']) as pid_file:
+        pid = int(pid_file.read().strip(), 10)
+      try:
+        os.kill(pid, signal.SIGUSR1) # Graceful restart
+      except OSError:
+        pass
+
+    os.chdir(former_directory)
+    print "Mioga instantiate.py::install finished!"
+    return path_list
+
+
+
+# Copied and adapted from mioga-hooks.py - how to reuse code?
+class FileModifier:
+  def __init__(self, filename):
+    self.filename = filename
+    f = open(filename, 'rb')
+    self.content = f.read()
+    f.close()
+  
+  def modifyParameter(self, key, value):
+    (self.content, count) = re.subn(
+      r'(<parameter[^>]*\sname\s*=\s*"' + re.escape(key) + r'"[^>]*\sdefault\s*=\s*")[^"]*',
+      r"\g<1>" + value,
+      self.content)
+    return count
+
+  def modify(self, pattern, replacement):
+    (self.content, count) = re.subn(pattern, replacement, self.content)
+    return count
+      
+  def save(self, output=""):
+    if output == "":
+      output = self.filename
+    f = open(output, 'w')
+    f.write(self.content)
+    f.close()

slapos/recipe/postgres/__init__.py

@@ -70,8 +70,7 @@ class Recipe(GenericBaseRecipe):
     """
 
     def _options(self, options):
-        options['password'] = self.generatePassword()
-        options['url'] = 'postgresql://%(superuser)s:%(password)s@[%(ipv6_random)s]:%(port)s/%(dbname)s' % options
+        options['url'] = 'postgresql://%(superuser)s:%(password)s@[%(ipv6-random)s]:%(port)s/%(dbname)s' % options
 
 
     def install(self):
@@ -160,11 +159,13 @@ class Recipe(GenericBaseRecipe):
                 'host    all             all             ::1/128                 md5',
             ]
 
+            ipv4_netmask_bits = self.options.get('ipv4-netmask-bits', '32')
             for ip in ipv4:
-                cfg_lines.append('host    all             all             %s/32                   md5' % ip)
+                cfg_lines.append('host    all             all             %s/%s                   md5' % (ip, ipv4_netmask_bits))
 
+            ipv6_netmask_bits = self.options.get('ipv6-netmask-bits', '128')
             for ip in ipv6:
-                cfg_lines.append('host    all             all             %s/128                   md5' % ip)
+                cfg_lines.append('host    all             all             %s/%s                   md5' % (ip, ipv6_netmask_bits))
 
             cfg.write('\n'.join(cfg_lines))
 

slapos/recipe/request.py

@@ -98,6 +98,7 @@ class Recipe(object):
     software_type = options.get('software-type', DEFAULT_SOFTWARE_TYPE)
     filter_kw = dict(
       (x, options['sla-' + x]) for x in options.get('sla', '').split()
+      if options['sla-' + x]
     )
     partition_parameter_kw = self._filterForStorage(dict(
       (x, options['config-' + x])
@@ -124,7 +125,8 @@ class Recipe(object):
           filter_kw=filter_kw, shared=slave)
       return_parameter_dict = self._getReturnParameterDict(self.instance,
           return_parameters)
-      # XXX what is the right way to get a global id?
+      if not slave:
+        # XXX: convention: should be instance-guid
         options['instance_guid'] = self.instance.getId()
     except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
       self._raise_request_exception = exc

slapos/recipe/slapconfiguration.py

@@ -65,9 +65,9 @@ class Recipe(object):
       Set of IPv4 addresses.
     ipv6
       Set of IPv6 addresses.
-    ipv4_random
+    ipv4-random
       One of the IPv4 addresses.
-    ipv6_random
+    ipv6-random
       One of the IPv6 addresses.
     tap
       Set of TAP interfaces.
@@ -129,9 +129,9 @@ class Recipe(object):
 
       # also export single ip values for those recipes that don't support sets.
       if ipv4_set:
-          options['ipv4_random'] = list(ipv4_set)[0]
+          options['ipv4-random'] = list(ipv4_set)[0]
       if ipv6_set:
-          options['ipv6_random'] = list(ipv6_set)[0]
+          options['ipv6-random'] = list(ipv6_set)[0]
 
       options['tap'] = tap_set
       parameter_dict = self._expandParameterDict(options, parameter_dict)

slapos/recipe/softwaretype.py

@@ -114,6 +114,10 @@ class Recipe:
     if not buildout.has_section('slap-parameter'):
       buildout.add_section('slap-parameter')
     for parameter, value in self.parameter_dict.items():
+      # All parameters evaluating to False are... False, and shouldn't
+      # convey any information.
+      # Here, all those parameters are set to empty string.
+      if value:
         if isinstance(value, str):
           buildout.set('slap-parameter', parameter, value)
         else:

software/cloudooo/software.cfg

@@ -54,7 +54,7 @@ context =
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = ea305baf481766227752e08d287c0bf8
+md5sum = 694205787e78c5d615d72d7b4b26d174
 extra-context =
     key buildout_bin_directory buildout:bin-directory
     key dcron_location dcron:location
@@ -83,7 +83,7 @@ extra-context =
 [template-cloudooo]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
-md5sum = fd5964a038613ea3e0b54f87564fe248
+md5sum = 4c8608f9525be0f01a09d60b240315a9
 mode = 640
 
 

software/drupal/software.cfg

@@ -9,8 +9,8 @@ parts +=
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
-url = http://ftp.drupal.org/files/projects/drupal-7.16.tar.gz
-md5sum = 352497b2df94b5308e31cb8da020b631
+url = http://ftp.drupal.org/files/projects/drupal-7.19.tar.gz
+md5sum = c1dd3960f1555df208c80ef612e0c53a
 
 [download-patch-hide-dbsetup]
 recipe = hexagonit.recipe.download

software/lamp-template/template/phpmyadmin.inc.php.in

@@ -5,13 +5,11 @@ $i = 1;
 /* Server parameters */
 $cfg['Servers'][$i]['host'] = 'Put here mysql host template key';
 $cfg['Servers'][$i]['port'] = 'Put here mysql port template key';
+$cfg['Servers'][$i]['only_db'] = 'Put here mysql database template key';
+
 /* Authentication type */
 $cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
+$cfg['Servers'][$i]['extension'] = 'mysqli';
 $cfg['Servers'][$i]['AllowNoPassword'] = false;
 
 /* rajk - for blobstreaming */

software/maarch/instance-custom.cfg.in

@@ -13,3 +13,7 @@ php_ini = $${directory:php-ini-dir}/php.ini
 root_docservers = $${buildout:directory}/srv/docservers
 dependency = $${apache-php:recipe}
 
+[publish-connection-informations]
+# XXX login should not be hardcoded
+login = superadmin
+password = $${maarch-configuration:db_password}

software/maarch/software.cfg

@@ -12,19 +12,16 @@ develop =
 
 # += since we need rdiff-backup and friends
 parts +=
-  slapos-cookbook
   apache-php-postgres
   pear-modules
   eggs
   instance
   instance-apache-php
-  slapos.cookbook-repository
   slapos.recipe.maarch-repository
   check-recipe
 
 
 [versions]
-slapos.cookbook =
 slapos.recipe.maarch = 
 
 
@@ -34,18 +31,12 @@ repository = http://git.erp5.org/repos/slapos.recipe.maarch.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 = lapp-resilient3
-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.recipe.maarch.egg-link
 
 
@@ -72,7 +63,7 @@ part-list = maarch-configuration
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-custom.cfg.in
 output = ${buildout:directory}/instance-custom.cfg
-md5sum = 22d8e4d8bb1a5b1c42c6cfb42ee490a0
+md5sum = d1b02a8c571886a225f2f1c8da06286c
 mode = 0644
 
 

software/mariadb/instance-mariadb.cfg

@@ -18,7 +18,7 @@ offline = true
 
 [url]
 recipe = slapos.cookbook:publishurl
-url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-address}]:$${stunnel:remote-port}/$${mariadb:database}
+url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-host}]:$${stunnel:remote-port}/$${mariadb:database}
 
 [mariadb]
 recipe = slapos.cookbook:mysql
@@ -92,10 +92,11 @@ key-file = $${ca-stunnel:key-file}
 cert-file = $${ca-stunnel:cert-file}
 pid-file = $${basedirectory:run}/stunnel.pid
 local-port = $${mariadb:port}
-local-address = $${mariadb:ip}
-remote-address = $${slap-network-information:global-ipv6}
+local-host = $${mariadb:ip}
+remote-host = $${slap-network-information:global-ipv6}
 remote-port = 6446
 client = false
+post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
 
 [logrotate]
 recipe = slapos.cookbook:logrotate
@@ -128,13 +129,13 @@ dcrond-binary = ${dcron:location}/sbin/crond
 cron-entries = $${directory:cron-entries}
 crontabs = $${directory:crontabs}
 cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:binary}
+catcher = $${cron-simplelogger:wrapper}
 binary = $${basedirectory:services}/crond
 
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
-binary = $${rootdirectory:bin}/cron_simplelogger
-output = $${directory:cronoutput}
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/crond.log
 
 [cron-entry-logrotate]
 <= cron

software/mariadb/software.cfg

@@ -12,7 +12,6 @@ extends =
 
 parts =
 # Create instance template
-#TODO : list here all parts.
   template
   instance-remotebackuped
   instance-mariadb
@@ -49,14 +48,14 @@ mode = 0644
 [instance-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
-md5sum = 135ad8e59a45e053f3aaf75deb35c5b0
+md5sum = d160bb15d8d3a3913706a4ed29c49388
 output = ${buildout:directory}/template-mariadb.cfg
 mode = 0644
 
 [instance-remotebackuped]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-remotebackuped.cfg
-md5sum = bf9e5aa9d63bda9c4aa87d9527fec3e8
+md5sum = 1bfe1b564def00726b6db46d27534210
 output = ${buildout:directory}/template-backuped.cfg
 mode = 0644
 
@@ -83,3 +82,71 @@ signature-certificate-list =
   5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
   x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
   -----END CERTIFICATE-----
+
+[versions]
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.6
+hexagonit.recipe.download = 1.6
+meld3 = 0.6.10
+slapos.cookbook = 0.72.0
+slapos.recipe.build = 0.11.5
+slapos.recipe.template = 2.4.2
+
+# Required by:
+# slapos.core==0.35
+Flask = 0.9
+
+# Required by:
+# slapos.cookbook==0.72.0
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.72.0
+# slapos.core==0.35
+# xml-marshaller==0.9.7
+lxml = 3.1.0
+
+# Required by:
+# slapos.cookbook==0.72.0
+netaddr = 0.7.10
+
+# Required by:
+# slapos.core==0.35
+netifaces = 0.8
+
+# Required by:
+# slapos.core==0.35
+pyflakes = 0.6.1
+
+# Required by:
+# slapos.cookbook==0.72.0
+pytz = 2012j
+
+# Required by:
+# slapos.cookbook==0.72.0
+# slapos.core==0.35
+# zc.buildout==1.6.0-dev-SlapOS-010
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.72.0
+slapos.core = 0.35
+
+# Required by:
+# slapos.core==0.35
+supervisor = 3.0b1
+
+# Required by:
+# slapos.core==0.35
+unittest2 = 0.5.1
+
+# Required by:
+# slapos.cookbook==0.72.0
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.core==0.35
+zope.interface = 4.0.3

stack/lamp/apache/instance-apache-backup.cfg.in → software/mioga/instance-apacheperl.cfg

 [buildout]
-
 parts =
-  urls
-  apache-proxy
-  logrotate
-  logrotate-entry-apache
-  cron
-  cron-entry-logrotate
-  sshkeys-authority
+  postgres-urlparse
+#  apacheperl-promise
+  mioga-instance
+  cron-entry-crawler
   sshkeys-dropbear
-  dropbear-server
-  dropbear-server-pbs-authorized-key
+  dropbear-server-add-authorized-key
+  sshkeys-authority
+  publish-connection-information
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-
-#----------------
-#--
-#-- Creation of all needed directories.
-
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
+bin = $${buildout:directory}/bin
 etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
 srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-tmp = $${buildout:directory}/tmp
+log = $${buildout:directory}/log
+var = $${buildout:directory}/var
+buildinst = $${buildout:directory}/buildinst
 
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
 services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
 promises = $${rootdirectory:etc}/promise
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-htdocs = $${rootdirectory:srv}/www
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-logrotate-backup = $${basedirectory:backup}/logrotate
-cronstamps = $${rootdirectory:etc}/cronstamps
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-ssh = $${rootdirectory:etc}/ssh
+htdocs = $${rootdirectory:srv}/htdocs
+cronstamps = $${rootdirectory:etc}/cronstamps/
+cron-entries = $${rootdirectory:etc}/cron.d/
+crontabs = $${rootdirectory:etc}/crontabs/
 sshkeys = $${rootdirectory:srv}/sshkeys
-httpd-log = $${basedirectory:log}/apache
-
+ssh = $${rootdirectory:etc}/ssh
 
-#----------------
-#--
-#-- Deploy cron.
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${rootdirectory:log}/crond.log
 
 [cron]
 recipe = slapos.cookbook:cron
 dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
+cronstamps = $${basedirectory:cronstamps}
+cron-entries = $${basedirectory:cron-entries}
+crontabs = $${basedirectory:crontabs}
 catcher = $${cron-simplelogger:wrapper}
 binary = $${basedirectory:services}/crond
 
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/crond.log
-
-
-#----------------
-#--
-#-- Deploy logrotate.
-
-[cron-entry-logrotate]
+[cron-entry-crawler]
 <= cron
 recipe = slapos.cookbook:cron.d
 name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-
-#----------------
-#--
-#-- sshkeys
+frequency = 23 50 * * *
+command = $${mioga-instance:bin_dir}/crawl.sh
+
+[apacheperl-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/httpd_promise
+hostname = $${apacheperl-instance:ip}
+port = $${apacheperl-instance:port}
+
+[publish-connection-information]
+recipe = slapos.cookbook:publish
+direct_url = $${mioga-url:direct_url}
+ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
+url = $${request-frontend:connection-site_url}
+
+# Request POSTGRES INSTANCE and parse its URL
+
+[request-postgres]
+<= slap-connection
+recipe = slapos.cookbook:request
+name = Postgres
+software-url = $${slap-connection:software-release-url}
+software-type = postgres
+return = url
+sla = computer_guid
+sla-computer_guid = $${slap-connection:computer-id}
+
+[postgres-urlparse]
+recipe = slapos.cookbook:urlparse
+url = $${request-postgres:connection-url}
+
+[symlinks]
+recipe = cns.recipe.symlink
+symlink_target = $${rootdirectory:bin}
+symlink_base = ${postgresql:location}/bin
+
+# SSH SERVER
 
 [sshkeys-directory]
 recipe = slapos.cookbook:mkdirectory
-requests = $${directory:sshkeys}/requests
-keys = $${directory:sshkeys}/keys
+requests = $${basedirectory:sshkeys}/requests/
+keys = $${basedirectory:sshkeys}/keys/
 
 [sshkeys-authority]
 recipe = slapos.cookbook:sshkeys_authority
@@ -110,6 +101,16 @@ keys-directory = $${sshkeys-directory:keys}
 wrapper = $${basedirectory:services}/sshkeys_authority
 keygen-binary = ${dropbear:location}/bin/dropbearkey
 
+[dropbear-server]
+recipe = slapos.cookbook:dropbear
+host = $${slap-network-information:global-ipv6}
+port = 2222
+home = $${basedirectory:ssh}
+wrapper = $${rootdirectory:bin}/raw_sshd
+shell = /bin/bash
+rsa-keyfile = $${basedirectory:ssh}/server_key.rsa
+dropbear-binary = ${dropbear:location}/sbin/dropbear
+
 [sshkeys-dropbear]
 <= sshkeys-authority
 recipe = slapos.cookbook:sshkeys_authority.request
@@ -120,78 +121,67 @@ public-key = $${dropbear-server:rsa-keyfile}.pub
 private-key = $${dropbear-server:rsa-keyfile}
 wrapper = $${basedirectory:services}/sshd
 
-
-#----------------
-#--
-#-- Dropbear.
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = $${slap-network-information:global-ipv6}
-port = 2222
-home = $${directory:ssh}
-wrapper = $${rootdirectory:bin}/raw_sshd
-shell = $${rdiff-backup-server:wrapper}
-rsa-keyfile = $${directory:ssh}/server_key.rsa
-dropbear-binary = ${dropbear:location}/sbin/dropbear
-
-[dropbear-server-pbs-authorized-key]
+[dropbear-server-add-authorized-key]
 <= dropbear-server
 recipe = slapos.cookbook:dropbear.add_authorized_key
 key = $${slap-parameter:authorized-key}
 
-
-#----------------
-#--
-#-- rdiff
-
-[rdiff-backup-server]
-recipe = slapos.cookbook:pbs
-client = false
-path = $${directory:htdocs}
-wrapper = $${rootdirectory:bin}/rdiffbackup-server
-rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
-
-
-#----------------
-#--
-#-- Apache Proxy.
-
-[apache-proxy]
-recipe = slapos.cookbook:apacheproxy
-url = $${slap-parameter:proxy-url}
-pid-file = $${basedirectory:run}/apache.pid
-lock-file = $${basedirectory:run}/apache.lock
-ip = $${slap-network-information:global-ipv6}
-port = 8080
-error-log = $${directory:httpd-log}/error.log
-access-log = $${directory:httpd-log}/access.log
-httpd-conf = $${rootdirectory:etc}/apache.conf
-wrapper = $${basedirectory:services}/apache
-
-promise = $${basedirectory:promises}/apache
-
-httpd-binary = ${apache:location}/bin/httpd
-
-[logrotate-entry-apache]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = apache
-log = $${apache-proxy:error-log} $${apache-proxy:access-log}
-frequency = daily
-rotate-num = 30
-sharedscripts = true
-notifempty = true
-create = true
-
-
-#----------------
-#--
-#-- Publish instance parameters.
-
-[urls]
-recipe = slapos.cookbook:publish
-url = http://[$${apache-proxy:ip}]:$${apache-proxy:port}/
-ssh-public-key = $${sshkeys-dropbear:public-key-value}
-ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
-
+[slap-parameter]
+# Default value if no ssh key is specified
+authorized-key =
+
+# IPv4 AND PORT 80 FRONTEND
+
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+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 = $${mioga-url:direct_url}
+return = site_url
+
+# MIOGA INSTANCE
+
+[mioga-instance]
+recipe = slapos.cookbook:mioga.instantiate
+# mioga_compile_dir = ${template-apacheperl:compile-directory}
+# Pity that the following line does not work. Or does it?
+# mioga_compile_env = ${mioga:environment}
+mioga_location = ${mioga:location}
+mioga_buildinst = ${mioga:buildinst}
+libxslt_bin = ${libxslt:location}/bin
+libxml2_bin = ${libxml2:location}/bin
+rsync_bin = ${rsync:location}/bin
+var_directory = $${rootdirectory:var}
+buildinst_directory = $${rootdirectory:buildinst}
+instance_root = $${buildout:directory}
+perl_bin = ${perl:location}/bin
+postgres_bin = ${postgresql:location}/bin
+htdocs = $${apacheperl-instance:htdocs}
+db_host = $${postgres-urlparse:host}
+db_port = $${postgres-urlparse:port}
+db_dbname = $${postgres-urlparse:path}
+db_username = $${postgres-urlparse:username}
+db_password = $${postgres-urlparse:password}
+public_ipv6 = $${slap-network-information:global-ipv6}
+public_ipv6_port = 8080
+private_ipv4 = $${slap-network-information:local-ipv4}
+httpd_binary = ${apache-2.2:location}/bin/httpd
+path = $${basedirectory:services}/apacheperl
+htdocs = $${basedirectory:htdocs}
+httpd_conf = $${rootdirectory:etc}/httpd.conf
+pid_file = $${basedirectory:services}/apache.pid
+lock_file = $${basedirectory:services}/apache.lock
+dav_locks = $${buildout:directory}/var/dav_locks
+services_dir = $${basedirectory:services}
+error_log = $${rootdirectory:log}/error.log
+access_log = $${rootdirectory:log}/access.log
+bin_dir = $${rootdirectory:bin}
+log_dir = $${rootdirectory:log}
+site_perl = ${perl:siteprefix}
+
+[mioga-url]
+direct_url = http://[$${slap-network-information:global-ipv6}]:$${mioga-instance:public_ipv6_port}
\ No newline at end of file

software/mioga/instance-postgres.cfg

+[buildout]
+parts =
+  symlinks
+  publish
+  postgres-instance
+  postgres-promise
+
+
+# Define egg directories to be the one from Software Release
+# (/opt/slapgrid/...)
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+
+[instance-parameters]
+# Fetches parameters defined in SlapOS Master for this instance
+recipe = slapos.cookbook:slapconfiguration
+computer = $${slap-connection:computer-id}
+partition = $${slap-connection:partition-id}
+url = $${slap-connection:server-url}
+key = $${slap-connection:key-file}
+cert = $${slap-connection:cert-file}
+
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+bin = $${buildout:directory}/bin
+etc = $${buildout:directory}/etc
+services = $${rootdirectory:etc}/run/
+promises = $${rootdirectory:etc}/promise/
+var = $${buildout:directory}/var
+
+
+[symlinks]
+recipe = cns.recipe.symlink
+symlink_target = $${rootdirectory:bin}
+symlink_base = ${postgresql:location}/bin
+
+[postgres-instance]
+# create cluster, configuration files and a database
+recipe = slapos.cookbook:postgres
+
+# Options
+ipv6_host = $${slap-network-information:global-ipv6}
+user = mioga
+port = 5432
+dbname = mioga2
+# pgdata_directory is created by initdb, and should not exist beforehand.
+pgdata-directory = $${rootdirectory:var}/data
+services = $${rootdirectory:services}
+bin = $${rootdirectory:bin}
+
+
+# Deploy promises scripts
+[postgres-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${rootdirectory:promises}/postgres
+hostname = $${slap-network-information:global-ipv6}
+port = $${postgres-instance:port}
+
+
+[publish]
+recipe = slapos.cookbook:publishurl
+url = $${postgres-instance:url}

software/mioga/instance.cfg

 [buildout]
+parts =
+  switch-softwaretype
+
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
 
-parts = instance
-
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-apacheperl:output}
+postgres = ${template-postgres:output}
 
-httpd_binary = ${apache:location}/bin/httpd
-mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
-mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld

software/mioga/mioga-hooks.py

+
+import fnmatch
+import grp
+import os
+import pprint
+import pwd
+import re
+import shutil
+import sys
+
+class FileModifier:
+  def __init__(self, filename):
+    self.filename = filename
+    f = open(filename, 'rb')
+    self.content = f.read()
+    f.close()
+  
+  def modify(self, key, value):
+    (self.content, count) = re.subn(
+      r'(<parameter[^>]*\sname\s*=\s*"' + re.escape(key) + r'"[^>]*\sdefault\s*=\s*")[^"]*',
+      r"\g<1>" + value,
+      self.content)
+    return count
+      
+  def save(self):
+    f = open(self.filename, 'w')
+    f.write(self.content)
+    f.close()
+
+
+def pre_configure_hook(options, bo, env):
+  location = options['location']
+
+  # TODO: double-check which one of these values must be set
+  # at instantiation time!
+
+  fm = FileModifier('conf/Config.xml')
+  fm.modify('apache_user',  pwd.getpwuid(os.getuid())[0])
+  fm.modify('apache_group', grp.getgrgid(os.getgid())[0])
+  mioga_base = os.path.join(location, 'var', 'lib', 'Mioga2')
+  fm.modify('install_dir', mioga_base)
+  fm.modify('tmp_dir', os.path.join(mioga_base, 'tmp'))
+  fm.modify('search_tmp_dir', os.path.join(mioga_base, 'mioga_search'))
+  fm.modify('maildir', os.path.join(location, 'var', 'spool', 'mioga', 'maildir'))
+  fm.modify('maildirerror', os.path.join(location, 'var', 'spool', 'mioga', 'error'))
+  fm.modify('mailfifo', os.path.join(location, 'var', 'spool', 'mioga', 'fifo'))
+  fm.save()
+
+  # TODO: mail settings are certainly wrong, what is the domain name?
+
+  # Correct shebangs to the right Perl
+  for root, dirnames, filenames in os.walk('.'):
+    for filename in fnmatch.filter(filenames, '*.pl'):
+      with open(os.path.join(root, filename), "r+") as f:
+        lines = f.readlines()
+        (lines[0], count) = re.subn(r'^#!/usr/bin/perl',
+                                    '#!' + options['perl-binary'],
+                                    lines[0], 1)
+        if count > 0:
+          f.seek(0)
+          f.writelines(lines)
+          print "Corrected interpreter for script "+filename
+
+
+
+# def post_make_hook(options, buildout):
+#   location = options['location']
+#   print "Mioga - postmakehook"
+#   print "We are currently in", os.getcwd()
+#   shutil.move("var", location)
+#   return None

software/mioga/mioga-patch

+diff --git a/INSTALL b/INSTALL
+index ef0f369..b275a48 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -382,6 +382,8 @@ A default init script is provided in file web/conf/mioga2.init.d. This script wo
+ Additional configuration for the Search engine
+ ----------------------------------------------
+ 
++The default init script starts the search engine daemon.
++
+ You must edit the crawl_sample.sh to specify default location for configuration files and rename it to crawl.sh.
+ This script must be run by cron in a day basis with apache user (www-data for Debian)
+ 
+diff --git a/Makefile.PL b/Makefile.PL
+index 3582d20..c24e217 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -20,8 +20,10 @@
+ # ============================================================================
+ 
+ 
++use Cwd;
+ use ExtUtils::MakeMaker;
+ use ExtUtils::MakeMaker::Config;
++use File::Find;
+ 
+ # ****************************************************************************
+ # 
+@@ -67,6 +69,7 @@ sub CheckPreDepends {
+ 
+ my $disable_check = grep {lc($_) eq 'disable_check'} @ARGV;
+ 
++if (! $disable_check) {
+ CheckPreDepends({ # 'Data::Dumper' => '2.101',
+ 		  # 'DBI'          => '1.13',
+ 		  # 'DBD::Pg'      => '1.01',
+@@ -75,7 +78,8 @@ CheckPreDepends({ # 'Data::Dumper' => '2.101',
+ 		  'Error'        => '0.15',
+ 		  # 'Net::LDAP'    => '0.25',
+ 		  # 'Unicode::String' => '2.06',
+-	      });
++          })
++}
+     
+ require MiogaConf;
+     
+@@ -115,7 +119,7 @@ my $docsubdirs = "docs";
+ # ----------------------------------------------------------------------------
+ sub MY::processPL {
+ return '
+-# Not realy in the good section, but at a good place:
++# Not really in the good section, but at a good place:
+ # between "all" and next "tardist"
+ 
+ include config.mk
+@@ -124,10 +128,7 @@ tardist: doc
+ dist: doc
+ install ::
+ 	if test -e $(TMP_DIR) ; then \
+-            if test -d $(TMP_DIR) ; then \
+-                ( su - $(APACHE_USER) -c "id" -s /bin/sh || \
+-                    ( echo "===> Problem with \"$(APACHE_USER)\" user" ; exit 1 ) ) \
+-            else \
++            if ! test -d $(TMP_DIR) ; then \
+                 echo "===> File $(TMP_DIR) exists but is not a directory ..." ; \
+                 exit 1 ; \
+             fi \
+@@ -156,6 +157,31 @@ install-all ::
+ 
+ 	(cd web && $(MAKE) setperms) || exit 1;
+ 
++slapos-compilation :: install
++	for i in bin locales web ; \
++	do \
++		(cd $$i && $(MAKE) install) || exit 1;\
++	done
++	# Create symlinks for static content that can be shared among all SlapOS instances	
++	for i in var/lib/Mioga2/static var/lib/Mioga2/conf/themes/default var/lib/Mioga2/conf/xsl; do \
++		mkdir -p `dirname "$(MIOGA_STATIC)/$$i"` && \
++		mv "$(MIOGA_BASE)/$$i" "$(MIOGA_STATIC)/$$i" && \
++		ln -s "$(MIOGA_STATIC)/$$i" "$(MIOGA_BASE)/$$i"; \
++	done
++	# copy a minimal build system into mioga/build
++	mkdir -p "$(MIOGA_BUILDINST)"
++	cp -R --parents \
++		Makefile.PL sql web/conf web/skel conf bin/search/crawl_sample.sh \
++		"$(MIOGA_BUILDINST)"
++
++slapos-instantiation ::
++	rm -Rf web/conf/apache; (cd web/conf && $(MAKE) apache)
++
++	for i in web/conf conf web/skel sql ; \
++	do \
++		(cd $$i && $(MAKE) install) || exit 1;\
++	done
++
+ doc:
+ 	for i in ' . $docsubdirs . ' ; \
+ 	do \
+@@ -176,9 +202,18 @@ installall: install install-all
+ # 
+ # ----------------------------------------------------------------------------
+ 
++my $Mioga2_pm = 'lib/Mioga2.pm';
++if ((not -e $Mioga2_pm) and exists($ENV{MIOGA_SITEPERL})) {
++    my $findfile = sub {
++        if ($_ eq 'Mioga2.pm') {
++            $Mioga2_pm = $File::Find::name;
++        }
++    };
++    find($findfile, $ENV{MIOGA_SITEPERL});
++}; 
+ WriteMakefile(
+    'NAME'  => 'Mioga',
+    'DIR'   => ['bin', 'web',  'locales', 'docs', 'sql'],
+-   'VERSION_FROM' => 'lib/Mioga2.pm',
++   'VERSION_FROM' => $Mioga2_pm,
+ );
+ 
+diff --git a/bin/mailinglist/miogamailinglist.pl b/bin/mailinglist/miogamailinglist.pl
+index 80668e2..fa1603a 100755
+--- a/bin/mailinglist/miogamailinglist.pl
++++ b/bin/mailinglist/miogamailinglist.pl
+@@ -205,11 +205,11 @@ sub MsgSendStock
+ sub CheckUTF8 {
+     my ($str) = @_;
+     
+-    my $conv    = Text::Iconv->new('utf8', 'utf8');
++    my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+     my $tmp_str = $conv->convert($str);
+     unless ($tmp_str) {
+         my $charset = detect($str) || 'iso-8859-15'; # defaults to latin9
+-        $conv = Text::Iconv->new($charset, "utf8");
++        $conv = Text::Iconv->new($charset, "UTF-8");
+         $str  = $conv->convert($str);
+     }
+     return $str;
+diff --git a/bin/notifier/searchengine.pl b/bin/notifier/searchengine.pl
+index efd1ca2..fc5ba67 100755
+--- a/bin/notifier/searchengine.pl
++++ b/bin/notifier/searchengine.pl
+@@ -39,8 +39,7 @@ if (!open(FIFO, "+>$fifo")) {
+     syslog('err', "Can't open fifo: $!. Exiting...");
+ }
+ my $flags   = fcntl(FIFO, F_GETFL, 0);
+-
+-
++my $crawler = $config->GetBinariesDir()."/crawl.sh";
+ # MAIN LOOP
+ 
+ my %instances;
+@@ -53,7 +52,7 @@ while (1) {
+ 		$instances{$line} += 1;
+     }
+ 	foreach my $inst (keys(%instances)) {
+-		system("/usr/local/bin/crawl.sh $inst");
++		system("$crawler $inst");
+ 	}
+     fcntl(FIFO, F_SETFL, $flags);
+ }
+diff --git a/conf/Config.xml b/conf/Config.xml
+index e614cda..3a9b7e3 100644
+--- a/conf/Config.xml
++++ b/conf/Config.xml
+@@ -3,6 +3,9 @@
+   <version module="Mioga2"/>
+ 
+   <config>
++    <parameter name="init_sql" question="Initialize database ?"
++	       type="bool" default="no" xpath="/init_sql"/>
++
+     <parameter name="instance_ident" question="First Mioga instance Identifier ?"
+                type="text" default="Mioga"
+                xpath="/instance_ident"/>
+@@ -35,8 +38,18 @@
+     <parameter name="authentication" question="Authentification method ?" 
+                type="enum" default="Mioga2" values="Mioga2"
+                xpath="/authentication"/>
+-    
++
++    <parameter name="bin_dir" question="Directory for helper scripts and binaries ?" 
++               type="text" default="/usr/local/bin"
++               xpath="/bin_dir"/>
++
+     <parameter name="Database settings" type="submenu">
++      <parameter name="db_host" question=" Mioga database server name or address ?" 
++                 type="text" default="localhost"
++                 xpath="/database/DBhost"/>              
++      <parameter name="db_port" question=" Mioga database server port ?" 
++                 type="text" default="5432"
++                 xpath="/database/DBport"/>              
+       <parameter name="db_name" question=" Name of Mioga database ?" 
+                  type="text" default="mioga2"
+                  xpath="/database/DBname"/>              
+@@ -462,7 +475,6 @@
+ 	<app ident="Portal" package="Mioga2::Portal"/>
+   	<app ident="Search" package="Mioga2::Search"/>
+     <app ident="Magellan" package="Mioga2::Magellan"/>
+-    <app ident="Mermoz" package="Mioga2::Mermoz"/>
+     <app ident="RSS" package="Mioga2::RSS"/>
+     <app ident="Narkissos" package="Mioga2::Narkissos"/>
+     <app ident="Colbert" package="Mioga2::Colbert"/>
+@@ -476,7 +488,7 @@
+   	<mioglet ident="Workspace" package="Mioga2::Portal::WSMioglet"/>
+   	<mioglet ident="Organizer" package="Mioga2::Portal::OrgMioglet"/>
+   	<mioglet ident="News" package="Mioga2::Portal::NewsMioglet"/>
+-  	<mioglet ident="File" package="Mioga2::Portal::FileMioglet"/>
++  	<mioglet ident="File" package="Miorouga2::Portal::FileMioglet"/>
+   	<mioglet ident="Articles" package="Mioga2::Portal::ArticlesMioglet"/>
+     <mioglet ident="Poll" package="Mioga2::Portal::PollMioglet"/>
+ 	<mioglet ident="Search" package="Mioga2::Portal::SearchMioglet"/>
+diff --git a/lib/Mioga2/Bottin.pm b/lib/Mioga2/Bottin.pm
+index ba4cd8d..0db5651 100644
+--- a/lib/Mioga2/Bottin.pm
++++ b/lib/Mioga2/Bottin.pm
+@@ -1742,11 +1742,11 @@ sub InitSuperAdminMode {
+ sub CheckUTF8 {
+     my ($str) = @_;
+     
+-    my $conv    = Text::Iconv->new('utf8', 'utf8');
++    my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+     my $tmp_str = $conv->convert($str);
+     unless ($tmp_str) {
+-        my $charset = detect($str) || 'iso-8859-15'; # defaults to latin9
+-        $conv = Text::Iconv->new($charset, "utf8");
++        my $charset = detect($str) || 'ISO-8859-15'; # defaults to latin9
++        $conv = Text::Iconv->new($charset, "UTF-8");
+         $str  = $conv->convert($str);
+     }
+     return $str;
+diff --git a/lib/Mioga2/Classes/URI.pm b/lib/Mioga2/Classes/URI.pm
+index 8678b33..bf97e71 100644
+--- a/lib/Mioga2/Classes/URI.pm
++++ b/lib/Mioga2/Classes/URI.pm
+@@ -75,15 +75,16 @@ sub new {
+   
+   # convert uri to UTF-8
+   my $uri     = uri_unescape($options{uri});
++    
+   
+   # attempt to see if uri is utf8 to avoid detection
+-  my $conv    = Text::Iconv->new('utf8', 'utf8');
++  my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+   my $tmp_uri = $conv->convert($uri);
+-  
++
+   unless ($tmp_uri) {
+-    my $charset = detect($uri) || 'iso-8859-15'; # defaults to latin9
++    my $charset = detect($uri) || 'ISO-8859-15'; # defaults to latin9
+     warn "charset = '$charset' for uri = '$uri'" if $debug;
+-    $conv = Text::Iconv->new($charset, "utf8");
++    $conv = Text::Iconv->new($charset, "UTF-8");
+     $uri  = $conv->convert($uri);
+     warn "==> converted uri = '$uri'" if $debug;
+   }
+diff --git a/lib/Mioga2/Config.pm b/lib/Mioga2/Config.pm
+index b088823..4edac62 100644
+--- a/lib/Mioga2/Config.pm
++++ b/lib/Mioga2/Config.pm
+@@ -28,7 +28,7 @@ Config.pm: Access class to the current Mioga instance configuration.
+ This module permits to access to the current Mioga instance
+ configuration parameters.
+ 
+-=head1 METHODS DESRIPTION
++=head1 METHODS DESCRIPTION
+ 
+ =cut
+ 
+diff --git a/lib/Mioga2/DAVFS.pm b/lib/Mioga2/DAVFS.pm
+index b56c4ad..7810f82 100644
+--- a/lib/Mioga2/DAVFS.pm
++++ b/lib/Mioga2/DAVFS.pm
+@@ -141,10 +141,11 @@ use Mioga2::tools::APIAuthz;
+ use Mioga2::tools::database;
+ use Mioga2::tools::string_utils;
+ use Mioga2::tools::Convert;
++use Net::INET6Glue::INET_is_INET6;
+ use XML::LibXML ();
+ use Mioga2::Constants;
+ 
+-my $debug = 0;
++my $debug = 5;
+ 
+ my $MULTI_STATUS	= 207;	# code DAV for the Multi-status response
+ 
+@@ -756,13 +757,17 @@ sub make_request {
+ 	my $host = $self->{host};
+ 	my $port = $self->{port};
+ 
++    my $hostport = $host;
++    $hostport = '['.$hostport.']' if $host =~ /:.*:/;
++    $hostport .= ':'.$port;
++
+ 	my $dav_uri   = $config->GetDAVBasePath;
+ 	my $mioga_uri = $config->GetBasePath;
+ 
+ 	my $orig_uri = Mioga2::Classes::URI->new( uri => $callbacks->{uri}->() );
+ 	my $uri      = $orig_uri->as_string;
+ 	$uri =~ s/^$mioga_uri/$dav_uri/;
+-	$uri = Mioga2::Classes::URI->new( uri => "$protocol://$host:$port$uri" )
++	$uri = Mioga2::Classes::URI->new( uri => "$protocol://$hostport$uri" )
+ 	  ->as_string;
+ 	print STDERR "[Mioga2::DAVFS::make_request] uri = $uri\n" if $debug;
+ 
+@@ -774,7 +779,7 @@ sub make_request {
+ 
+ 		# process headers
+ 		if ( $header =~ /^destination/i && $value !~ $dav_uri ) {
+-			$value =~ s!(//)[^/]+$mioga_uri!$1$host$dav_uri!;
++			$value =~ s!(//)[^/]+$mioga_uri!$1$hostport$dav_uri!; # was only $host before!
+ 			$value = Mioga2::Classes::URI->new( uri => $value )->as_string;
+ 			$value = $self->escapeSpecialChars($value);
+ 		}
+diff --git a/lib/Mioga2/Database.pm b/lib/Mioga2/Database.pm
+index 4afa54b..ca8368c 100644
+--- a/lib/Mioga2/Database.pm
++++ b/lib/Mioga2/Database.pm
+@@ -61,7 +61,7 @@ sub new {
+ 	my $self = { };
+ 	bless($self, $class);
+ 
+-	for my $attr (qw/DBIlogin DBIpasswd DBIdriver DBname/) {
++	for my $attr (qw/DBhost DBport DBIlogin DBIpasswd DBIdriver DBname/) {
+ 		if (!defined ($attributes{$attr})) {
+ 			throw Mioga2::Exception::DB ("[Mioga2::Database::new]", "Cannot connect to database: " . $DBI::errstr);
+ 		}
+@@ -72,8 +72,10 @@ sub new {
+ 	my $dbiPassword = $self->{database}->{DBIpasswd};
+ 	my $dbDriver = $self->{database}->{DBIdriver};
+ 	my $dbName = $self->{database}->{DBname};
++    my $dbHost = $self->{database}->{DBhost};
++    my $dbPort = $self->{database}->{DBport};
+ 
+-	my $datasource = "dbi:$dbDriver:dbname=$dbName";
++	my $datasource = "dbi:$dbDriver:dbname=$dbName;host=$dbHost;port=$dbPort";
+ 
+ 	$self->{dbh} = DBI->connect($datasource, $dbiUser, $dbiPassword);
+ 
+diff --git a/lib/Mioga2/Exception/DB.pm b/lib/Mioga2/Exception/DB.pm
+index 7ce5020..dd29d83 100644
+--- a/lib/Mioga2/Exception/DB.pm
++++ b/lib/Mioga2/Exception/DB.pm
+@@ -1,3 +1,4 @@
++
+ # ============================================================================
+ # Mioga2 Project (C) 2003-2007 The Mioga2 Project
+ #
+@@ -53,6 +54,7 @@ sub new {
+     my($class, $function, $errDB, $errStr, $sql) = @_;
+ 	my $self = $class->SUPER::new(-text => "$errStr : $errDB");
+ 	$self->{errDB} = $errDB;
++    $self->{errStr} =  $errStr;
+ 	$self->{sql} = $sql;
+ 	$self->{function} = $function;
+ 	return $self;
+@@ -76,6 +78,27 @@ sub as_string
+ 	return $string;
+ }
+ 
++# ----------------------------------------------------------------------------
++=head2 getDBerr ()
++Return the error code as sent by the database connector.
++=cut 
++# ----------------------------------------------------------------------------
++sub getDBerr {
++    my ($self) = @_;
++    return $self->{errDB};
++}
++
++# ----------------------------------------------------------------------------
++=head2 getDBerrstr ()
++Return the error string as sent by the database connector.
++=cut 
++# ----------------------------------------------------------------------------
++sub getDBerrstr {
++    my ($self) = @_;
++    return $self->{errStr};
++}
++
++
+ # ============================================================================
+ 
+ =head1 PRIVATE METHODS DESCRIPTION
+diff --git a/lib/Mioga2/InstanceList.pm b/lib/Mioga2/InstanceList.pm
+index 3e2cf7a..a676a1b 100644
+--- a/lib/Mioga2/InstanceList.pm
++++ b/lib/Mioga2/InstanceList.pm
+@@ -423,7 +423,9 @@ sub Store {
+ 		$conf->RunHooks($self->{config}->{miogaconf});
+ 
+ 		# Run crawl.sh to initialize search engine database
+-		my $crawlcmd = $self->{config}->{miogaconf}->GetMiogaPrefix () . "/bin/mioga2_index.pl --conf=" . $self->{config}->GetMiogaConfPath () . ' --search_conf=' . $self->{config}->GetInstallPath . "/conf/search_conf.xml" . ' ' . $self->Get ('ident');
++		my $crawlcmd = $self->{config}->{miogaconf}->GetMiogaPrefix () . "/bin/mioga2_index.pl --conf=" . $self->{config}->GetMiogaConfPath () 
++			. ' --search_conf=' . $self->{config}->{miogaconf}->GetInstallDir()."/conf/search_conf.xml" 
++                	. ' '. $self->Get ('ident');
+ 		system ("$crawlcmd");
+ 	}
+ 	elsif (scalar (keys (%{$self->{update}}))) {
+diff --git a/lib/Mioga2/Magellan.pm b/lib/Mioga2/Magellan.pm
+index 86e2e42..4b3814a 100644
+--- a/lib/Mioga2/Magellan.pm
++++ b/lib/Mioga2/Magellan.pm
+@@ -327,10 +327,13 @@ sub GetNodes {
+ 			$mygroup = $group;
+ 		}
+ 
++        my $host = $config->GetMiogaConf()->GetDAVHost();
++        $host = "[${host}]" if $host =~ /:.*?:/;
++
+         my $resources = Mioga2::Magellan::DAV::GetCollection(
+             $context,
+             $context->GetSessionToken,
+-            $config->GetMiogaConf ()->GetDAVProtocol () . "://" . $config->GetMiogaConf ()->GetDAVHost () . ":" . $config->GetMiogaConf ()->GetDAVPort (), $node
++            $config->GetMiogaConf ()->GetDAVProtocol () . "://" . $host . ":" . $config->GetMiogaConf ()->GetDAVPort (), $node
+         );
+ 
+ 		$inconsistent = pop (@$resources);
+@@ -853,7 +856,7 @@ sub GetResource {
+ 			);
+ 			print STDERR "mime = $mime\n content= $content\n" if ($debug);
+ 			if ($mime) {
+-				#my $conv = Text::Iconv->new( 'utf8', 'utf8' );
++				#my $conv = Text::Iconv->new( 'UTF-8', 'UTF-8' );
+ 				#my $encoding = $conv->convert($content);
+ 				#if ($encoding) {
+ 				if ($mime =~ /(application\/xml)|(text\/)|(application\/xsl)/)
+diff --git a/lib/Mioga2/Magellan/Archive.pm b/lib/Mioga2/Magellan/Archive.pm
+index 842ae90..3b9e7f7 100644
+--- a/lib/Mioga2/Magellan/Archive.pm
++++ b/lib/Mioga2/Magellan/Archive.pm
+@@ -163,7 +163,7 @@ sub Content
+         return undef;
+     }
+ 
+-    my $conv  = Text::Iconv->new('utf8', 'utf8');
++    my $conv  = Text::Iconv->new('UTF-8', 'UTF-8');
+     my %folders;
+     while(my $file = <PRG>) {
+       chomp($file);
+diff --git a/lib/Mioga2/Magellan/DAV.pm b/lib/Mioga2/Magellan/DAV.pm
+index cdf77f1..116ebf4 100644
+--- a/lib/Mioga2/Magellan/DAV.pm
++++ b/lib/Mioga2/Magellan/DAV.pm
+@@ -106,7 +106,7 @@ sub ExecuteRequest
+ 	}
+ 
+ 	if ($response->code >= 500) {
+-		warn "Mioga2::Magellan::ExecuteRequest Failed: " . $response->content;
++		warn "Mioga2::Magellan::DAV::ExecuteRequest Failed: " . $response->content;
+ 	}
+ 
+ 	return  $response;
+diff --git a/lib/Mioga2/MailingList.pm b/lib/Mioga2/MailingList.pm
+index c7d631c..3a92466 100644
+--- a/lib/Mioga2/MailingList.pm
++++ b/lib/Mioga2/MailingList.pm
+@@ -749,11 +749,11 @@ sub MailDeleteMsg
+ sub CheckUTF8 {
+     my ($str) = @_;
+     
+-    my $conv    = Text::Iconv->new('utf8', 'utf8');
++    my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+     my $tmp_str = $conv->convert($str);
+     unless ($tmp_str) {
+-        my $charset = detect($str) || 'iso-8859-15'; # defaults to latin9
+-        $conv = Text::Iconv->new($charset, "utf8");
++        my $charset = detect($str) || 'ISO-8859-15'; # defaults to latin9
++        $conv = Text::Iconv->new($charset, "UTF-8");
+         $str  = $conv->convert($str);
+     }
+     return $str;
+diff --git a/lib/Mioga2/MiogaConf.pm b/lib/Mioga2/MiogaConf.pm
+index 5b74a96..a46e27c 100644
+--- a/lib/Mioga2/MiogaConf.pm
++++ b/lib/Mioga2/MiogaConf.pm
+@@ -258,7 +258,7 @@ sub GetFilenameEncoding {
+ sub GetBinariesDir {
+ 	my ($self) = @_;
+ 
+-	return $self->{binaries_dir};
++	return $self->{bin_dir};
+ }
+ 
+ # ============================================================================
+diff --git a/lib/Mioga2/Search.pm b/lib/Mioga2/Search.pm
+index 2c20259..292f864 100644
+--- a/lib/Mioga2/Search.pm
++++ b/lib/Mioga2/Search.pm
+@@ -447,13 +447,13 @@ sub CheckArgs
+ 	elsif (exists($context->{args}->{query})) {
+ 		$query_string = $context->{args}->{query};
+ 	}
+-	my $conv    = Text::Iconv->new('utf8', 'utf8');
++	my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+  	my $tmp_query = $conv->convert($query_string);
+   
+ 	unless ($tmp_query) {
+-		my $charset = detect($query_string) || 'iso-8859-15'; # defaults to latin9
++		my $charset = detect($query_string) || 'ISO-8859-15'; # defaults to latin9
+ 		warn "charset = '$charset' for query_string = '$query_string'" if $debug;
+-		$conv = Text::Iconv->new($charset, "utf8");
++		$conv = Text::Iconv->new($charset, "UTF-8");
+ 		$query_string  = $conv->convert($query_string);
+ 		warn "==> converted query_string = '$query_string'" if $debug;
+ 	}
+diff --git a/lib/Mioga2/tools/string_utils.pm b/lib/Mioga2/tools/string_utils.pm
+index c56cc3b..36bfa5a 100644
+--- a/lib/Mioga2/tools/string_utils.pm
++++ b/lib/Mioga2/tools/string_utils.pm
+@@ -46,6 +46,7 @@ use Mioga2::Content::XSLT;
+ use Mioga2::XML::Simple;
+ use Exporter;
+ use Text::Iconv;
++use Encode;
+ use Encode::Detect::Detector;
+ use Data::Dumper;
+ use HTML::TokeParser::Simple;
+@@ -715,11 +716,11 @@ Check if string is UTF8 and convert it if needed
+ sub st_CheckUTF8 {
+     my ($str) = @_;
+     
+-    my $conv    = Text::Iconv->new('utf8', 'utf8');
++    my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+     my $tmp_str = $conv->convert($str);
+     unless ($tmp_str) {
+-        my $charset = detect($str) || 'iso-8859-15'; # defaults to latin9
+-        $conv = Text::Iconv->new($charset, "utf8");
++        my $charset = detect($str) || 'ISO-8859-15'; # defaults to latin9
++        $conv = Text::Iconv->new($charset, "UTF-8");
+         $str  = $conv->convert($str);
+ 		utf8::decode ($str);
+     }
+diff --git a/lib/MiogaConf.pm b/lib/MiogaConf.pm
+index 0870174..bbcc80a 100644
+--- a/lib/MiogaConf.pm
++++ b/lib/MiogaConf.pm
+@@ -836,6 +836,10 @@ sub CheckDepends
+ 	my @missing;
+ 	my @missing_clib;
+ 
++	# Some modules rewrite $ENV{PATH} without hesitation when "require"d,      
++	# we need to put the old one back in place.                                
++	my $oldpath = $ENV{PATH}; 
++
+ 	foreach my $dep (@{$self->{CONFIG}->{dependencies}->[0]->{dep}}) {
+ 		my $version;
+ 		if(exists $dep->{version}) {
+@@ -858,6 +862,7 @@ sub CheckDepends
+ 		}
+ 	}
+ 	
++	$ENV{PATH} = $oldpath;
+ 
+ 	foreach my $dep (@{$self->{CONFIG}->{dependencies}->[0]->{clib}}) {
+ 		my $version;
+diff --git a/sql/Makefile b/sql/Makefile
+index 07b26f5..3d79b1b 100644
+--- a/sql/Makefile
++++ b/sql/Makefile
+@@ -15,19 +15,21 @@ install:
+ 	cp upgradeMiogletDesc.pl $(DESTDIR)$(INSTALL_DIR)/conf/Config.hook.d
+ 	chmod a+x $(DESTDIR)$(INSTALL_DIR)/conf/Config.hook.d/upgradeMiogletDesc.pl
+ 
+-	if [ $(INIT_SQL) = 'yes' ] ; \
++	DB_STATE=`perl -w testdb.pl`; \
++	if [ "$$DB_STATE" = "nodb" -o "$$DB_STATE" = "empty" ] ; \
+ 	then \
+ 		echo "Initialize database"; \
+-		su - $(POSTGRES_USER) -c "dropdb $(DB_NAME)" ; \
+-		su - $(POSTGRES_USER) -c "createdb --encoding UTF8 $(DB_NAME)" && \
+-		su $(POSTGRES_USER) -c "psql $(DB_NAME) < create_lang.sql" && \
+-		perl -w -I../lib initdb.pl ; \
+-	elif [ $(INIT_SQL) != 'noupdate' ]; then \
++        dropdb -h $(DB_HOST) -p $(DB_PORT) -U $(DBI_LOGIN) $(DB_NAME) ; \
++		createdb --encoding UTF8 -h $(DB_HOST) -p $(DB_PORT) -U $(DBI_LOGIN) $(DB_NAME) && \
++		psql -h $(DB_HOST) -p $(DB_PORT) -U $(DBI_LOGIN) $(DB_NAME) < create_lang.sql && \
++		perl -w -I../lib initdb.pl force_init_sql=1; \
++	elif [ "$$DB_STATE" = "present" ]; then \
+ 		echo "Update database"; \
+ 		perl -w -I../lib updatedb.pl configxml=$(DESTDIR)$(INSTALL_DIR)/conf/Config.xml; \
++	elif [ "$$DB_STATE" = "noserver" ]; then \
++		echo "ERROR: Cannot connect to the database server!"; \
+ 	fi
+ 
+-
+ clean:
+ 	rm -f *~
+ 
+diff --git a/sql/schema_base.sql b/sql/schema_base.sql
+index b7d8cc2..88d5e2d 100644
+--- a/sql/schema_base.sql
++++ b/sql/schema_base.sql
+@@ -429,10 +429,6 @@ CREATE OR REPLACE FUNCTION check_group_base_default_profile_id () RETURNS trigge
+     END;
+ ' LANGUAGE 'plpgsql';
+ 
+-CREATE TRIGGER m_group_base_default_profile_id_check
+-     BEFORE DELETE ON m_profile FOR EACH ROW
+-     EXECUTE PROCEDURE check_group_base_default_profile_id ();
+-
+ 
+ CREATE OR REPLACE FUNCTION check_group_base_mioga_id () RETURNS trigger AS '
+     DECLARE
+@@ -839,6 +835,10 @@ create table m_profile (
+ );
+ create unique index m_profile_ident_group_index on m_profile (ident, group_id);
+ 
++CREATE TRIGGER m_group_base_default_profile_id_check
++     BEFORE DELETE ON m_profile FOR EACH ROW
++     EXECUTE PROCEDURE check_group_base_default_profile_id ();
++
+ 
+ --
+ -- Add referencial integrity on default_profile_id in m_group_base
+diff --git a/sql/testdb.pl b/sql/testdb.pl
+new file mode 100755
+index 0000000..1952891
+--- /dev/null
++++ b/sql/testdb.pl
+@@ -0,0 +1,64 @@
++#!/usr/bin/perl -w
++
++# Tests the availability of the Mioga2 database.
++# Returns on stdout one of:
++# 'present'  - The Mioga2 database has been found and contains data.
++# 'empty'    - The Mioga2 database exists but the table "m_mioga" is empty or nonexistent.
++# 'nodb'     - There is no Mioga2 database but the database server is working fine
++#              (i.e. one can try to create the database)
++# 'noserver' - Connection to the database server failed.
++
++# This has been written for Mioga2/SlapOS, to avoid overwriting the database
++# when re-instantiating the Apache/mod_perl partition.
++
++use strict;
++use lib "../lib";
++
++use Data::Dumper;
++use DBI;
++use Error qw(:try);
++use Mioga2::Exception::DB;
++use Mioga2::MiogaConf;
++
++# TODO: get this through a parameter?
++# my $configxml = "../conf/Config.xml";
++my $miogaconf = "../web/conf/Mioga.conf";
++
++my $result = 'undefined';
++try {
++    my $config = new Mioga2::MiogaConf($miogaconf);
++    my $dbh = $config->GetDBH();
++    my $sql = 'SELECT COUNT(*) FROM m_mioga';
++    my $sth = $dbh->prepare($sql);
++    my $exec_result = $sth->execute();
++    if (not defined($exec_result)) {
++        throw Mioga2::Exception::DB("testdb.pl 0", $sth->err, $sth->errstr, $sql);
++    }
++    my $res = $sth->fetchrow_arrayref();
++    if (not defined($res)) {
++        throw Mioga2::Exception::DB("testdb.pl 1", $sth->err, $sth->errstr, $sql);
++    }
++    my $count = $res->[0];
++    if (not defined($count)) {
++        throw Mioga2::Exception::DB("testdb.pl 2", $sth->err, $sth->errstr, $sql);
++    } elsif ($count == 0) {
++        $result = 'empty';
++    } else {
++        $result = 'present';
++    }   
++} catch Mioga2::Exception::DB with {
++    my $err = shift;
++    my $errstr = $err->getDBerrstr();
++    if ($errstr =~ m#database "mioga2" does not exist#) {
++        $result = 'nodb';
++    } elsif ($errstr =~ m#relation "m_mioga" does not exist#) {
++        $result = 'empty';
++    } else {
++        $result = 'noserver';
++    }
++} otherwise {
++    my $err = shift;
++    $result = 'noserver';
++};
++
++print $result;
+diff --git a/sql/updatedb.pl b/sql/updatedb.pl
+index 67921e7..bb4db1a 100644
+--- a/sql/updatedb.pl
++++ b/sql/updatedb.pl
+@@ -25,7 +25,7 @@ foreach my $var qw(configxml miogaconf timezonexml dir) {
+ 
+ my $config = new Mioga2::MiogaConf($miogaconf);
+ 
+-my $conf = new MiogaConf( dir => $dir, config => $configxml);
++my $conf = new MiogaConf( dir => $dir, config => $configxml, force_init_sql => 0);
+ $conf->Install($config);
+ 
+ 
+diff --git a/web/Makefile b/web/Makefile
+index 66af45f..9649a02 100644
+--- a/web/Makefile
++++ b/web/Makefile
+@@ -16,11 +16,11 @@ all ::
+ 
+ 
+ install ::
+-	if [ $(INIT_SQL) = 'yes' -a -d $(INSTALL_DIR) ] ; \
+-	then \
+-	     su - $(POSTGRES_USER) -c "pg_dump -b -Ft --column-inserts $(DB_NAME) | gzip" > ${INSTALL_DIR}/db_dump.tar.gz ; \
+-	     mv $(INSTALL_DIR) $(BACKUP_DIR) ; \
+-        fi
++#	if [ $(INIT_SQL) = 'yes' -a -d $(INSTALL_DIR) ] ; \
++#	then \
++#	     su - $(POSTGRES_USER) -c "pg_dump -b -Ft --column-inserts $(DB_NAME) | gzip" > ${INSTALL_DIR}/db_dump.tar.gz ; \
++#	     mv $(INSTALL_DIR) $(BACKUP_DIR) ; \
++#       fi
+ 
+ 	mkdir -p $(TMP_DIR)
+ 	mkdir -p $(DESTDIR)$(INSTALL_DIR)/$(INSTANCE_IDENT)/$(MIOGA_FILES)
+diff --git a/web/conf/Makefile b/web/conf/Makefile
+index 1573e5c..189f2fd 100644
+--- a/web/conf/Makefile
++++ b/web/conf/Makefile
+@@ -14,5 +14,6 @@ install:
+ # is done in ../Makefile
+ 
+ clean:
++	echo "VHH DEBUG: web/conf make clean, deleting apache/ !"
+ 	rm -Rf apache Mioga.conf .memdump
+ 
+diff --git a/web/conf/startup.pl b/web/conf/startup.pl
+index a9dc968..6558061 100644
+--- a/web/conf/startup.pl
++++ b/web/conf/startup.pl
+@@ -29,6 +29,7 @@ use MIME::Entity ();
+ use MIME::Parser ();
+ use MIME::QuotedPrint ();
+ use MiogaConf ();
++use Net::INET6Glue::INET_is_INET6;
+ use Net::LDAP ();
+ use Parse::Yapp::Driver ();
+ use Storable ();
+diff --git a/web/skel/Makefile b/web/skel/Makefile
+index e604e7d..fbaad2d 100644
+--- a/web/skel/Makefile
++++ b/web/skel/Makefile
+@@ -33,7 +33,7 @@ fr_FR : $(SRC_FR_FILES)
+ install:
+ 	rsync $(RSYNC_OPTS) $(SUBDIRS) $(DESTDIR)$(INSTALL_DIR)/conf/skel/
+ 	# Update instance default skeletons
+-	for i in `mioga2_info.pl --conf=$(DESTDIR)$(INSTALL_DIR)/conf/Mioga.conf instances`; do if [ ! -d /var/lib/Mioga2/$$i/MiogaFiles/skel/ ]; then mkdir $(DESTDIR)$(INSTALL_DIR)/$$i/MiogaFiles/skel/; fi; cp -R $(DESTDIR)$(INSTALL_DIR)/conf/skel/* $(DESTDIR)$(INSTALL_DIR)/$$i/MiogaFiles/skel/; done
++#	for i in `mioga2_info.pl --conf=$(DESTDIR)$(INSTALL_DIR)/conf/Mioga.conf instances`; do if [ ! -d /var/lib/Mioga2/$$i/MiogaFiles/skel/ ]; then mkdir $(DESTDIR)$(INSTALL_DIR)/$$i/MiogaFiles/skel/; fi; cp -R $(DESTDIR)$(INSTALL_DIR)/conf/skel/* $(DESTDIR)$(INSTALL_DIR)/$$i/MiogaFiles/skel/; done
+ 
+ clean:
+ 	rm -rf $(SUBDIRS)
+diff --git a/web/skel/src/en_US/group/50-standard.xml b/web/skel/src/en_US/group/50-standard.xml
+index 6cf89e5..e1ef140 100644
+--- a/web/skel/src/en_US/group/50-standard.xml
++++ b/web/skel/src/en_US/group/50-standard.xml
+@@ -12,7 +12,6 @@
+ 	<applications>
+ 		<application ident="AnimGroup" active="1"/>
+ 		<application ident="Magellan" active="1"/>
+-		<application ident="Mermoz" active="1"/>
+ 		<application ident="Organizer"/>
+ 		<application ident="Contact"/>
+ 		<application ident="Tasks"/>
+@@ -38,9 +37,6 @@
+ 			<application ident="Magellan">
+ 				<all_functions/>
+ 			</application>
+-			<application ident="Mermoz">
+-				<all_functions/>
+-			</application>
+ 			<application ident="Portal">
+ 				<all_functions/>
+ 			</application>
+@@ -53,10 +49,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-				<function>Standard</function>
+-			</application>
+ 			<application ident="Portal">
+ 				<function>Portal</function>
+ 			</application>
+@@ -69,9 +61,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-			</application>
+ 			<application ident="Portal">
+ 				<function>Portal</function>
+ 			</application>
+diff --git a/web/skel/src/en_US/group/60-admin.xml b/web/skel/src/en_US/group/60-admin.xml
+index c73b700..d3f368b 100644
+--- a/web/skel/src/en_US/group/60-admin.xml
++++ b/web/skel/src/en_US/group/60-admin.xml
+@@ -12,7 +12,6 @@
+ 	<applications>
+ 		<application ident="AnimGroup" active="1"/>
+ 		<application ident="Magellan" active="1"/>
+-		<application ident="Mermoz" active="1"/>
+ 		<application ident="Colbert" active="1"/>
+ 		<application ident="Organizer"/>
+ 		<application ident="Contact"/>
+@@ -39,9 +38,6 @@
+ 			<application ident="Magellan">
+ 				<all_functions/>
+ 			</application>
+-			<application ident="Mermoz">
+-				<all_functions/>
+-			</application>
+ 			<application ident="Colbert">
+ 				<all_functions/>
+ 			</application>
+@@ -57,10 +53,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-				<function>Standard</function>
+-			</application>
+ 			<application ident="Colbert">
+ 				<function>UsersWrite</function>
+ 				<function>GroupsWrite</function>
+@@ -79,9 +71,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-			</application>
+ 			<application ident="Colbert">
+ 				<function>UsersRead</function>
+ 				<function>GroupsRead</function>
+diff --git a/web/skel/src/en_US/instance/50-standard.xml b/web/skel/src/en_US/instance/50-standard.xml
+index cdb1e88..82a125b 100644
+--- a/web/skel/src/en_US/instance/50-standard.xml
++++ b/web/skel/src/en_US/instance/50-standard.xml
+@@ -102,10 +102,6 @@
+ 		</application>
+ 		<application ident="MailingList">
+ 		</application>
+-		<application ident="Mermoz">
+-			<all_users/>
+-			<all_groups/>
+-		</application>
+ 		<application ident="Narkissos">
+ 			<all_users/>
+ 		</application>
+diff --git a/web/skel/src/en_US/user/50-standard.xml b/web/skel/src/en_US/user/50-standard.xml
+index c8983bb..256400d 100644
+--- a/web/skel/src/en_US/user/50-standard.xml
++++ b/web/skel/src/en_US/user/50-standard.xml
+@@ -92,7 +92,6 @@
+ 		<application ident="FileBrowser"/>
+ 		<application ident="Portal"/>
+ 		<application ident="Search" active="1"/>
+-		<application ident="Mermoz"/>
+ 		<application ident="RSS" active="1"/>
+ 	</applications>
+ 
+diff --git a/web/skel/src/en_US/user/60-admin.xml b/web/skel/src/en_US/user/60-admin.xml
+index 9083b6f..e246d19 100644
+--- a/web/skel/src/en_US/user/60-admin.xml
++++ b/web/skel/src/en_US/user/60-admin.xml
+@@ -101,7 +101,6 @@
+ 		<application ident="FileBrowser"/>
+ 		<application ident="Portal"/>
+ 		<application ident="Search" active="1"/>
+-		<application ident="Mermoz"/>
+ 		<application ident="RSS" active="1"/>
+ 	</applications>
+ 
+diff --git a/web/skel/src/fr_FR/group/50-standard.xml b/web/skel/src/fr_FR/group/50-standard.xml
+index 954f71d..dfc79b1 100644
+--- a/web/skel/src/fr_FR/group/50-standard.xml
++++ b/web/skel/src/fr_FR/group/50-standard.xml
+@@ -35,9 +35,6 @@
+ 		<!-- Le navigateur de fichiers est accessible et actif. -->
+ 		<application ident="Magellan" active="1"/>
+ 
+-		<!-- L'application de rédaction d'e-mails est accessible et active. -->
+-		<application ident="Mermoz" active="1"/>
+-
+ 		<!-- Le portail est accessible et actif. -->
+ 		<application ident="Portal" active="1"/>
+ 
+@@ -77,11 +74,6 @@
+ 				<all_functions/>
+ 			</application>
+ 
+-			<!-- Le profil "Animation" donne accès à toutes les fonctions de l'application Mermoz d'envoi d'e-mail. -->
+-			<application ident="Mermoz">
+-				<all_functions/>
+-			</application>
+-
+ 			<!-- Le profil "Animation" donne accès à toutes les fonctions du portail de groupe. -->
+ 			<application ident="Portal">
+ 				<all_functions/>
+@@ -102,12 +94,6 @@
+ 				<function>Read</function>
+ 			</application>
+ 
+-			<!-- Le profil "Membre" donne accès uniquement à l'envoi d'e-mail au groupe ou indépendamment aux différentes équipes du groupe via l'application d'envoi d'e-mail Mermoz. -->
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-				<function>Standard</function>
+-			</application>
+-
+ 			<!-- Le profil "Membre" donne accès uniquement à la consultation du portail de groupe. -->
+ 			<application ident="Portal">
+ 				<function>Portal</function>
+@@ -128,11 +114,6 @@
+ 				<function>Read</function>
+ 			</application>
+ 
+-			<!-- Le profil "Invité" donne accès uniquement à l'envoi d'e-mail au groupe via l'application d'envoi d'e-mail Mermoz. -->
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-			</application>
+-
+ 			<!-- Le profil "Invité" donne accès uniquement à la consultation du portail de groupe. -->
+ 			<application ident="Portal">
+ 				<function>Portal</function>
+@@ -151,6 +132,7 @@
+ 		<space type="private">
+ 			
+ 			<!-- La balise "acls" contient les définitions de droits d'accès à la racine de l'espace privé du groupe. -->
++
+ 			<acls>
+ 
+ 				<!-- Les profils "Animation" et "Membre" ont accès en lecture et écriture. -->
+diff --git a/web/skel/src/fr_FR/group/60-admin.xml b/web/skel/src/fr_FR/group/60-admin.xml
+index d9bd724..1c97ca5 100644
+--- a/web/skel/src/fr_FR/group/60-admin.xml
++++ b/web/skel/src/fr_FR/group/60-admin.xml
+@@ -12,7 +12,6 @@
+ 	<applications>
+ 		<application ident="AnimGroup" active="1"/>
+ 		<application ident="Magellan" active="1"/>
+-		<application ident="Mermoz" active="1"/>
+ 		<application ident="Colbert" active="1"/>
+ 		<application ident="Organizer"/>
+ 		<application ident="Contact"/>
+@@ -39,9 +38,6 @@
+ 			<application ident="Magellan">
+ 				<all_functions/>
+ 			</application>
+-			<application ident="Mermoz">
+-				<all_functions/>
+-			</application>
+ 			<application ident="Colbert">
+ 				<all_functions/>
+ 			</application>
+@@ -57,10 +53,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-				<function>Standard</function>
+-			</application>
+ 			<application ident="Colbert">
+ 				<function>UsersWrite</function>
+ 				<function>GroupsWrite</function>
+@@ -79,9 +71,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-			</application>
+ 			<application ident="Colbert">
+ 				<function>UsersRead</function>
+ 				<function>GroupsRead</function>
+diff --git a/web/skel/src/fr_FR/instance/50-standard.xml b/web/skel/src/fr_FR/instance/50-standard.xml
+index 34a8536..f7d1eb1 100644
+--- a/web/skel/src/fr_FR/instance/50-standard.xml
++++ b/web/skel/src/fr_FR/instance/50-standard.xml
+@@ -215,12 +215,6 @@
+ 		<application ident="MailingList">
+ 		</application>
+ 
+-		<!-- L'application d'envoi d'e-mail est accessible à tous les utilisateurs et à tous les groupes. -->
+-		<application ident="Mermoz">
+-			<all_users/>
+-			<all_groups/>
+-		</application>
+-
+ 		<!-- L'application de gestion des données personnelles est accessible à tous les utilisateurs. -->
+ 		<application ident="Narkissos">
+ 			<all_users/>
+diff --git a/web/skel/src/fr_FR/user/50-standard.xml b/web/skel/src/fr_FR/user/50-standard.xml
+index c7da5e8..d07b180 100644
+--- a/web/skel/src/fr_FR/user/50-standard.xml
++++ b/web/skel/src/fr_FR/user/50-standard.xml
+@@ -138,7 +138,6 @@
+ 		<!-- L'afficheur de fichiers, le portail utilisateur et l'application d'envoi d'e-mails Mermoz sont accessible mais ne sont pas actives. L'utilisateur pourra les activer s'il le souhaite. -->
+ 		<application ident="FileBrowser"/>
+ 		<application ident="Portal"/>
+-		<application ident="Mermoz"/>
+ 
+ 	</applications>
+ 
+diff --git a/web/skel/src/fr_FR/user/60-admin.xml b/web/skel/src/fr_FR/user/60-admin.xml
+index afff18d..4d4df04 100644
+--- a/web/skel/src/fr_FR/user/60-admin.xml
++++ b/web/skel/src/fr_FR/user/60-admin.xml
+@@ -101,7 +101,6 @@
+ 		<application ident="FileBrowser"/>
+ 		<application ident="Portal"/>
+ 		<application ident="Search" active="1"/>
+-		<application ident="Mermoz"/>
+ 		<application ident="RSS" active="1"/>
+ 	</applications>
+ 

software/mioga/software.cfg

 [buildout]
+develop =
+  /srv/slapgrid/slappart9/srv/runner/project/slapos
+  /opt/slapdev_build
+
 extends =
-  ../../component/postgresql/buildout.cfg
+  ../../component/rsync/buildout.cfg
   ../../component/apache-perl/buildout.cfg
+  ../../component/perl-Crypt-SSLeay/buildout.cfg
+  ../../component/perl-XML-Parser/buildout.cfg
+  ../../component/perl-XML-LibXML/buildout.cfg
+  ../../component/perl-XML-LibXSLT/buildout.cfg
+  ../../component/perl-Term-ReadLine-Gnu/buildout.cfg
+  ../../component/perl-Text-Iconv/buildout.cfg
+  ../../component/perl-Image-Magick/buildout.cfg
+  ../../component/postgresql/buildout.cfg
+  ../../component/perl-DBD-Pg/buildout.cfg
+  ../../component/perl-Search-Xapian/buildout.cfg
+  ../../component/libxslt/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/dropbear/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
   ../../stack/slapos.cfg
 
+parts = 
+  eggs
+  apache-perl
+  perl-Apache2-Request
+  perl-Crypt-SSLeay
+  perl-DBD-Pg
+  perl-XML-Parser
+  perl-XML-LibXML
+  perl-XML-LibXSLT
+  perl-Term-ReadLine-Gnu
+  perl-Text-Iconv
+  perl-Image-Magick
+  perl-String-Checker-mioga
+  perl-Search-Xapian
+  cpan-simple-modules
+  rsync
+  mioga
+  template
+  template-apacheperl
+  template-postgres
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+  cns.recipe.symlink
+
+# override perl here to keep using 5.14.x.
+[perl]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${gdbm:version}
+version = 5.14.2
+url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
+md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
+siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
+patch-options = -p1
+patches =
+  ${perl-keep-linker-flags-in-ldflags.patch:location}/${perl-keep-linker-flags-in-ldflags.patch:filename}
+# Viktor has adapted the following commands for AMD64 compilation
+# TODO: find out how we can write a generic code that suits all architectures
+configure-command =
+  sh Configure -des \
+    -A ccflags=-fPIC \
+    -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
+    -Dsiteprefix=${:siteprefix} \
+    -Dcflags=-I${gdbm:location}/include \
+    -Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \
+    -Ui_db \
+    -Dnoextensions=ODBM_File \
+    -Dusethreads
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
+  CFLAGS='-m64 -mtune=nocona'
+post-make-hook = ${perl-postmakehook-download:location}/${perl-postmakehook-download:filename}:post_make_hook
+
+[cpan-simple-modules]
+recipe = slapos.recipe.build:cpan
+modules =
+  S/ST/STBEY/Date-Calc-6.3.tar.gz
+  D/DC/DCOPPIT/Benchmark-Timer-0.7102.tar.gz
+  R/RB/RBOW/Date-ICal-2.678.tar.gz
+  S/SB/SBECK/Date-Manip-6.37.tar.gz
+  G/GB/GBARR/TimeDate-1.20.tar.gz
+  S/SH/SHLOMIF/Error-0.17018.tar.gz
+  P/PA/PARDUS/File-MimeInfo/File-MimeInfo-0.16.tar.gz
+  O/OV/OVID/HTML-TokeParser-Simple-3.15.tar.gz
+  D/DS/DSKOLL/MIME-tools-5.503.tar.gz
+  D/DS/DSKOLL/IO-stringy-2.110.tar.gz
+  C/CO/COSIMO/HTTP-DAV-0.47.tar.gz
+  M/MA/MARSCHAP/perl-ldap-0.48.tar.gz
+  F/FD/FDESAR/Parse-Yapp-1.05.tar.gz
+  S/SN/SNOWHARE/Unicode-MapUTF8-1.11.tar.gz
+  G/GA/GAAS/Unicode-String-2.09.tar.gz
+  T/TY/TYEMQ/Algorithm-Diff-1.1902.tar.gz
+  J/JG/JGMYERS/Encode-Detect-1.01.tar.gz
+  G/GU/GUIDO/libintl-perl-1.20.tar.gz
+  K/KE/KEN/XML-XML2JSON-0.06.tar.gz
+  A/AR/ARISTOTLE/XML-Atom-SimpleFeed-0.86.tar.gz
+  P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz
+  G/GR/GRANTM/XML-Simple-2.20.tar.gz
+  A/AD/ADAMK/Archive-Zip-1.30.tar.gz
+  D/DU/DURIST/Proc-ProcessTable-0.45.tar.gz
+  S/SU/SULLR/Net-INET6Glue-0.5.tar.gz
+perl = perl
+cpan-configuration =
+  makepl_arg=''
+  make_arg=''
+
+[perl-String-Checker-mioga]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${perl:version}
+url = http://packages.alixen.org/contribs/String-Checker-0.03.tar.gz
+md5sum = c750a33505609544f95eace7a2896c84
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL
+
+[mioga]
+recipe = hexagonit.recipe.cmmi
+version = 2.4.16
+# No use re-using "version", the whole URL will change for the next one
+url = http://www.alixen.org/attachments/download/89/Mioga2-2.4.16.tar.gz
+md5sum = 1d2e76c798ee6d5f233011997200e125
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+buildinst = ${mioga:location}/buildinst
+static = ${mioga:location}/static
+environment =
+  MIOGA_BASE=${mioga:location}
+  MIOGA_BUILDINST=${mioga:buildinst}
+  MIOGA_STATIC=${mioga:static}
+  MIOGA_SITEPERL=${perl:siteprefix}
+  PATH=${libxslt:location}/bin:${libxml2:location}/bin:${perl:location}/bin:${perl:siteprefix}/bin:${rsync:location}/bin:%(PATH)s
+patch-options = -p1
+patches =
+  ${mioga-patch:location}/${mioga-patch:filename}
+# post-make-hook = ${mioga-postmakehook:location}/${mioga-postmakehook:filename}:post_make_hook
+pre-configure-hook = ${mioga-hooks:location}/${mioga-hooks:filename}:pre_configure_hook
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL
+make-targets =
+  slapos-compilation
+keep-compile-dir = true
+perl-binary = ${perl:location}/bin/perl
+
+[mioga-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+# md5sum = b836ad89902d1ea68b091a5b9800edd8
+download-only = true
+filename = ${:_buildout_section_name_}
+
+[mioga-hooks]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+# md5sum = c7ceec7788749238cb5fbe09beb647b1
+download-only = true
+filename = mioga-hooks.py
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+# md5sum = 
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[template-apacheperl]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-apacheperl.cfg
+# md5sum = 
+output = ${buildout:directory}/template-apacheperl.cfg
+mode = 0644
+compile-directory = ${mioga:compile-directory}/Mioga2-${mioga:version}
+
+
+[template-postgres]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-postgres.cfg
+# md5sum = 
+output = ${buildout:directory}/template-postgres.cfg
+mode = 0644
+
 [networkcache]
 # Cedric de Saint Martin signature certificate
 # Test agent

software/postgres/instance.cfg.in

@@ -16,6 +16,7 @@ offline = true
 recipe = slapos.cookbook:mkdirectory
 bin = $${buildout:directory}/bin
 etc = $${buildout:directory}/etc
+srv = $${buildout:directory}/srv
 services = $${directories:etc}/service
 promises = $${directories:etc}/promise
 var = $${buildout:directory}/var
@@ -30,9 +31,14 @@ recipe = slapos.cookbook:postgres
 
 # Options
 ipv6 = $${instance-parameters:ipv6}
+# listen to connections from anywhere
+ipv6-netmask-bits = 0
 ipv4 = $${instance-parameters:ipv4}
-ipv6_random = $${instance-parameters:ipv6_random}
+# listen to connections from anywhere
+ipv4-netmask-bits = 0
+ipv6-random = $${instance-parameters:ipv6-random}
 superuser = postgres
+password = $${gen-passwd:passwd}
 port = 5432
 dbname = db
 # pgdata_directory is created by initdb, and should not exist beforehand.
@@ -41,6 +47,16 @@ bin = ${postgresql:location}/bin
 services = $${directories:services}
 
 
+#----------------
+#--
+#-- Generates a random password and stores it in the filesystem
+
+[gen-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${directories:srv}/postgres_passwd
+bytes = 16
+
+
 #----------------
 #--
 #-- Deploy promise scripts.
@@ -48,7 +64,7 @@ services = $${directories:services}
 [postgres-promise]
 recipe = slapos.cookbook:check_port_listening
 path = $${directories:promises}/postgres
-hostname = $${instance-parameters:ipv6_random}
+hostname = $${instance-parameters:ipv6-random}
 port = $${postgres-instance:port}
 
 

software/postgres/software.cfg

@@ -17,7 +17,7 @@ parts =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
-md5sum = dfba09a7cccefc5d92d455aaed2c1835
+md5sum = d8b833a2054b82b6031a9420008b58fd
 mode = 0644
 
 
@@ -25,18 +25,19 @@ mode = 0644
 Jinja2 = 2.6
 Werkzeug = 0.8.3
 buildout-versions = 1.7
-cns.recipe.symlink = 0.2.3
 hexagonit.recipe.cmmi = 1.6
 inotifyx = 0.2.0
 lxml = 3.1beta1
 meld3 = 0.6.10
 netaddr = 0.7.10
 pytz = 2012j
+slapos.cookbook = 0.71.2
+slapos.core = 0.34
 slapos.recipe.template = 2.4.2
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.34
 Flask = 0.9
 
 # Required by:
@@ -44,21 +45,30 @@ Flask = 0.9
 hexagonit.recipe.download = 1.6
 
 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.34
 netifaces = 0.8
 
 # Required by:
-# cns.recipe.symlink==0.2.3
+# slapos.core==0.34
+pyflakes = 0.6.0
+
+# Required by:
+# slapos.cookbook==0.71.2
+# slapos.core==0.34
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
 # zope.interface==4.0.3
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.34
 supervisor = 3.0b1
 
 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.34
+unittest2 = 0.5.1
+
+# Required by:
+# slapos.core==0.34
 zope.interface = 4.0.3
 

software/slapos-testing/software.cfg

@@ -65,6 +65,38 @@ md5sum = 47f5a8cf4d134a35b7f36a7442e5798a
 output =  ${buildout:directory}/template.cfg
 mode = 640
 
+[networkcache]
+# signature certificates of the following uploaders.
+#   Cedric de Saint Martin
+#   Test Agent
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----
+
 [versions]
 Jinja2 = 2.6
 Werkzeug = 0.8.3

software/slaprunner/README.txt

@@ -21,3 +21,10 @@ Example of parameter XML::
   <instance>
   <parameter id="authorized-key">ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdNp7qZMVAzNc07opHshiIFDmJpYXQpetfcSgUj39a409d42PpsJElp7WsAE/x0nN6gUIoWIl7UiAlMzf6bKEJGJVSOZEPTmiJVlgK1Gp+kE0x9yNcncYg7p38Jny0daVA/NkkpAFyRsAm5kLGzyLtaCcktSvy0cJuy7WSSHU05pd1f8Y8thofE9g5t+/JA2VZvipxPkRfkFAG3aOAGLULlTImTSDFSDFGSDFG5F6mMnl7yvY2d6vEHVBu+K+aKmAwZVfCUwtSpa/tq3i2Lppjrw3UfrxbQSFHZCkzefr+u+l4YYe+tJrX7rYJYXD7LIfZfdSeFTlHFaN/yI1 user@host.local</parameter>
   </instance>
+
+instance-amount
+~~~~~~~~~~~~~~~
+
+Optional parameter.
+
+Default: 10

software/slaprunner/software.cfg

@@ -55,32 +55,32 @@ meld3 = 0.6.10
 netaddr = 0.7.10
 plone.recipe.command = 1.1
 pycrypto = 2.6
-pytz = 2012h
-slapos.cookbook = 0.70
-slapos.core = 0.33.1
+pytz = 2012j
+slapos.cookbook = 0.71.1
+slapos.core = 0.34
 slapos.libnetworkcache = 0.13.3
 slapos.recipe.build = 0.11.5
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.32
+slapos.toolbox = 0.33.1
 smmap = 0.8.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==0.33.1
-# slapos.toolbox==0.32
+# slapos.core==0.34
+# slapos.toolbox==0.33.1
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.32
+# slapos.toolbox==0.33.1
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.32
+# slapos.toolbox==0.33.1
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.32
+# slapos.toolbox==0.33.1
 feedparser = 5.1.3
 
 # Required by:
@@ -88,32 +88,40 @@ feedparser = 5.1.3
 hexagonit.recipe.download = 1.6
 
 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.34
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.32
+# slapos.toolbox==0.33.1
 paramiko = 1.9.0
 
 # Required by:
-# slapos.toolbox==0.32
+# slapos.toolbox==0.33.1
 psutil = 0.6.1
 
+# Required by:
+# slapos.core==0.34
+pyflakes = 0.5.0
+
 # Required by:
 # cns.recipe.symlink==0.2.3
-# slapos.cookbook==0.70
-# slapos.core==0.33.1
+# slapos.cookbook==0.71.1
+# slapos.core==0.34
 # slapos.libnetworkcache==0.13.3
-# slapos.toolbox==0.32
+# slapos.toolbox==0.33.1
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.2
+# zope.interface==4.0.3
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.34
 supervisor = 3.0b1
 
 # Required by:
-# slapos.core==0.33.1
-zope.interface = 4.0.2
+# slapos.core==0.34
+unittest2 = 0.5.1
+
+# Required by:
+# slapos.core==0.34
+zope.interface = 4.0.3

software/wordpress/software.cfg

@@ -3,8 +3,8 @@ extends =
   ../../stack/lamp/buildout.cfg
 
 [application]
-url = http://wordpress.org/wordpress-3.5.tar.gz
-md5sum = 105b5baff67344528bb5d8b71c050b0d
+url = http://wordpress.org/wordpress-3.5.1.tar.gz
+md5sum = 409889c98b13cbdbb9fd121df859ae3e
 
 [application-template]
 recipe = slapos.recipe.download

stack/erp5/buildout.cfg

@@ -544,13 +544,12 @@ Products.CMFDefault = 2.2.2
 Products.CMFTopic = 2.2.1
 Products.CMFUid = 2.2.1
 
-# Unpined locally developed egg
 slapos.cookbook =
 
 # Pinned versions
 Flask = 0.9
 GitPython = 0.3.2.RC1
-MySQL-python = 1.2.3
+MySQL-python = 1.2.4
 PIL = 1.1.7
 Paste = 1.7.5.1
 PasteDeploy = 1.5.0
@@ -558,76 +557,80 @@ PasteScript = 1.7.5
 Products.CMFActionIcons = 2.1.3
 Products.DCWorkflowGraph = 0.4.1
 Products.ExternalEditor = 1.1.0
-Products.GenericSetup = 1.7.2
-Products.MimetypesRegistry = 2.0.3
-Products.PluggableAuthService = 1.8.0
+Products.GenericSetup = 1.7.3
+Products.LongRequestLogger = 1.1.0
+Products.MimetypesRegistry = 2.0.4
+Products.PluggableAuthService = 1.9.0
 Products.PluginRegistry = 1.3
 Products.TIDStorage = 5.4.8
 Products.Zelenium = 1.0.3
 StructuredText = 2.11.1
 WSGIUtils = 0.7
+WebOb = 1.2.3
 Werkzeug = 0.8.3
-apache-libcloud = 0.11.1
+apache-libcloud = 0.11.4
 argparse = 1.2.1
 async = 0.6.1
 atomize = 0.1.1
 buildout-versions = 1.7
 cElementTree = 1.0.5-20051216
-chardet = 1.1
-coverage = 3.5.2
+chardet = 2.1.1
+cloudooo = 1.2.5-dev
+coverage = 3.6
 csp-eventlet = 0.7.0
 elementtree = 1.2.7-20070827-preview
 erp5.recipe.cmmiforcei686 = 0.1.3
 erp5.util = 0.4.22
 erp5diff = 0.8.1.5
-eventlet = 0.9.17
-feedparser = 5.1.2
+eventlet = 0.12.1
+feedparser = 5.1.3
 five.localsitemanager = 2.0.5
 fpconst = 0.7.2
 gitdb = 0.5.4
 greenlet = 0.4.0
 hexagonit.recipe.cmmi = 1.6
-http-parser = 0.7.8
+http-parser = 0.7.12
 huBarcode = 0.63
 inotifyx = 0.2.0
 ipdb = 0.7
-ipython = 0.13
+ipython = 0.13.1
 lxml = 2.3.6
-meld3 = 0.6.8
-netaddr = 0.7.9
+meld3 = 0.6.10
+mr.developer = 1.21
+netaddr = 0.7.10
 netifaces = 0.8
+nose = 1.2.1
 ordereddict = 1.1
-paramiko = 1.7.7.2
+paramiko = 1.9.0
 plone.recipe.command = 1.1
 ply = 3.4
-polib = 1.0.0
+polib = 1.0.2
 psutil = 0.6.1
+pyflakes = 0.6.1
 python-ldap = 2.4.10
 python-magic = 0.4.3
-python-memcached = 1.47
+python-memcached = 1.47-ipv6-1
+qrcode = 2.4.2
+requests = 1.1.0
 restkit = 4.2.0
 rtjp-eventlet = 0.3.2
 setuptools = 0.6c12dev-r88846
-slapos.core = 0.28
+slapos.core = 0.34
 slapos.libnetworkcache = 0.13.2
 slapos.recipe.build = 0.11.6
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.29
+slapos.toolbox = 0.33
 smmap = 0.8.2
 socketpool = 0.5.2
-supervisor = 3.0a12
+spyne = 2.9.3
+supervisor = 3.0b1
 threadframe = 0.2
 timerserver = 2.0.2
 urlnorm = 1.1.2
 uuid = 1.30
-validictory = 0.8.3
+validictory = 0.9.0
 xml-marshaller = 0.9.7
 xupdate-processor = 0.4
-mr.developer = 1.21
-qrcode = 2.4.1
-spyne = 2.9.3
-requests = 0.13.2
-cloudooo = 1.2.5-dev
-zope.app.testing = 3.8.1 ; BBB
-zope.app.publication = 3.14.0
 zope.app.appsetup = 3.16.0
+zope.app.publication = 3.14.0
+zope.app.testing = 3.8.1 ; BBB

stack/lamp/apache/instance-apache-export.cfg.jinja2

+# This file is responsible of three things:
+# 1/ Act as "Apache exporter"
+# 2/ Act as "Mariadb backup infrastructure requester"
+# 3/ Act as "Apache" instance
+
+{% import 'parts' as parts %}
+{% import 'replicated' as replicated %}
+
+[buildout]
+extends = {{templateapache}}
+          {{templatepbsreadyexport}}
+
+parts +=
+    {{ parts.replicate("mariadb", "3") }}
+
+# Repeating parts from instance-apache-php.
+# XXX-Cedric: how to simplify this?
+    certificate-authority
+    ca-stunnel
+    logrotate
+    logrotate-entry-apache
+    logrotate-entry-stunnel
+    cron
+    cron-entry-logrotate
+    promise
+    slapmonitor
+    slapmonitor-xml
+    
+    frontend-promise
+    content-promise
+    publish-connection-informations
+
+{{ replicated.replicate("mariadb", "3", "mariadb-export", "mariadb-import") }}
+
+# Nothing to do for the exporter. Just dummy part that does nothing.
+# For httpd instance, PBS will directly pull data from srv/www.
+# XXX-Cedric: write a real backup system.
+[exporter]
+wrapper = /bin/true
+
+# State that we want to backup srv/www directory, not srv/backup.
+# XXX-Cedric: works well, but doesn't work with big data.
+[rdiff-backup-server]
+path = ${directory:www}
+
+# Add "exporter" parameters to list of published connection parameters
+[publish-connection-informations]
+# XXX-Cedric: Long term goal: could be a recipe that requests an instance and
+# bubbles ALL
+# parameters of the requested instance. Requirement: aggregated publish.
+<= resilient-publish-connection-parameter
+
+# XXX-Cedric: resilient overwrites what's returned from request-mariadb
+# XXX-Cedric: change the request method to return everything from
+#             getConnectionParameterDict()
+[request-mariadb]
+return = ssh-public-key ssh-url notification-id ip url

stack/lamp/apache/instance-apache-import.cfg

-[buildout]
-extends = ${instance-apache-php:output}
-          ${pbsready-export:output}
-
-parts =
-  apache-proxy
-  logrotate
-  logrotate-entry-apache
-  cron
-  cron-entry-logrotate
-  sshkeys-authority
-  sshkeys-dropbear
-  dropbear-server
-  dropbear-server-pbs-authorized-key
-
-
-[apache-proxy]
-recipe = slapos.cookbook:apacheproxy
-url = $${slap-parameter:proxy-url}
-pid-file = $${basedirectory:run}/apache.pid
-lock-file = $${basedirectory:run}/apache.lock
-ip = $${slap-network-information:global-ipv6}
-port = 8080
-error-log = $${directory:httpd-log}/error.log
-access-log = $${directory:httpd-log}/access.log
-httpd-conf = $${rootdirectory:etc}/apache.conf
-wrapper = $${basedirectory:services}/apache
-
-promise = $${basedirectory:promises}/apache
-
-httpd-binary = ${apache:location}/bin/httpd
-
-
-#----------------
-#--
-#-- Creation of all needed directories.
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-tmp = $${buildout:directory}/tmp
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-promises = $${rootdirectory:etc}/promise
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-htdocs = $${rootdirectory:srv}/www
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-logrotate-backup = $${basedirectory:backup}/logrotate
-cronstamps = $${rootdirectory:etc}/cronstamps
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-ssh = $${rootdirectory:etc}/ssh
-sshkeys = $${rootdirectory:srv}/sshkeys
-httpd-log = $${basedirectory:log}/apache
-
-
-#----------------
-#--
-#-- Deploy cron.
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/crond.log
-
-
-#----------------
-#--
-#-- Deploy logrotate.
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-[logrotate-entry-apache]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = apache
-log = $${apache-proxy:error-log} $${apache-proxy:access-log}
-frequency = daily
-rotate-num = 30
-sharedscripts = true
-notifempty = true
-create = true
-
-
-#----------------
-#--
-#-- sshkeys
-
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:sshkeys}/requests
-keys = $${directory:sshkeys}/keys
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = $${sshkeys-directory:requests}
-keys-directory = $${sshkeys-directory:keys}
-wrapper = $${basedirectory:services}/sshkeys_authority
-keygen-binary = ${dropbear:location}/bin/dropbearkey
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = $${dropbear-server:wrapper}
-public-key = $${dropbear-server:rsa-keyfile}.pub
-private-key = $${dropbear-server:rsa-keyfile}
-wrapper = $${basedirectory:services}/sshd
-
-
-#----------------
-#--
-#-- Dropbear.
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = $${slap-network-information:global-ipv6}
-port = 2222
-home = $${directory:ssh}
-wrapper = $${rootdirectory:bin}/raw_sshd
-shell = $${rdiff-backup-server:wrapper}
-rsa-keyfile = $${directory:ssh}/server_key.rsa
-dropbear-binary = ${dropbear:location}/sbin/dropbear
-
-[dropbear-server-pbs-authorized-key]
-<= dropbear-server
-recipe = slapos.cookbook:dropbear.add_authorized_key
-key = $${slap-parameter:authorized-key}
-
-
-#----------------
-#--
-#-- rdiff
-
-[rdiff-backup-server]
-recipe = slapos.cookbook:pbs
-client = false
-path = $${directory:htdocs}
-wrapper = $${rootdirectory:bin}/rdiffbackup-server
-rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
-

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

+[buildout]
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+extends = ${pbsready-import:output}
+
+[directory]
+srv = $${buildout:directory}/srv
+www = $${:srv}/www/
+
+# Nothing to do for the import. Just dummy part that does nothing.
+# For httpd instance, PBS will directly push data to srv/www.
+# XXX-Cedric: write a real backup system.
+[importer]
+wrapper = /bin/true
+
+# State that we want to push to srv/www directory, not srv/backup.
+[rdiff-backup-server]
+path = $${directory:www}

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

@@ -55,6 +55,7 @@ logrotate-backup = $${basedirectory:backup}/logrotate
 report = $${rootdirectory:etc}/report
 stunnel-conf = $${rootdirectory:etc}/stunnel
 xml-report = $${rootdirectory:var}/xml_report
+www = $${rootdirectory:srv}/www/
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -194,7 +195,7 @@ source = ${application:location}
 template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
-htdocs = $${rootdirectory:srv}/www/
+htdocs = $${directory:www}
 pid-file = $${basedirectory:run}/apache.pid
 lock-file = $${basedirectory:run}/apache.lock
 ip = $${slap-network-information:global-ipv6}

stack/lamp/buildout.cfg

@@ -20,32 +20,35 @@ parts =
   instance-mariadb-import
   instance-mariadb-export
 
-  instance-default-root
+#Contains the importer and exporter recipes for apache
+  instance-apache-import
+  instance-apache-export
 
 
 extends =
-  ../resilient/buildout.cfg
-  ../../component/mariadb/buildout.cfg
-  ../../component/apache/buildout.cfg
   ../../component/apache-php/buildout.cfg
+  ../../component/apache/buildout.cfg
+  ../../component/curl/buildout.cfg
+  ../../component/dash/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
+  ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/glib/buildout.cfg
+  ../../component/gzip/buildout.cfg
   ../../component/logrotate/buildout.cfg
-  ../../component/perl/buildout.cfg
-  ../../component/sqlite3/buildout.cfg
   ../../component/lxml-python/buildout.cfg
-  ../../component/zlib/buildout.cfg
-  ../../component/rdiff-backup/buildout.cfg
-  ../../component/gzip/buildout.cfg
-  ../../component/stunnel/buildout.cfg
+  ../../component/mariadb/buildout.cfg
   ../../component/mydumper/buildout.cfg
   ../../component/mysql-python/buildout.cfg
-  ../../component/dropbear/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../component/sqlite3/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/zlib/buildout.cfg
+  ../resilient/buildout.cfg
   ../slapos.cfg
-  ../../component/dash/buildout.cfg
-  ../../component/curl/buildout.cfg
+
 
 [mariadb]
 # Compile dir is for plugins, there's no plugin in LAMP
@@ -64,66 +67,71 @@ strip-top-level-dir = true
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
-md5sum = 38bdcf0a8263d4a19bd6a35c0cd00340
+md5sum = 650cd2527158734fd6ccd9ec374b5e69
 mode = 0644
 
 [instance-apache-php]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = bf3219cd7d318e02e39c462fbb530715
+md5sum = 0538b05d27d8a64e89f898c09eb57716
 mode = 0644
 
-[instance-apache-backup]
+[instance-apache-import]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/apache/instance-apache-backup.cfg.in
-output = ${buildout:directory}/instance-apache-backup.cfg
-md5sum = 48f969d82319a9d145570f5f0fd27672
+url = ${:_profile_base_location_}/apache/instance-apache-import.cfg.in
+output = ${buildout:directory}/instance-apache-import.cfg
+md5sum = f1dc2a71d362b5d2d36481ffefdd2293
 mode = 0644
 
-[template-resilient-lamp]
+[instance-apache-export]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/template-resilient.cfg.in
-rendered = ${buildout:directory}/instance-resilient.cfg
+template = ${:_profile_base_location_}/apache/instance-apache-export.cfg.jinja2
+rendered = ${buildout:directory}/instance-apache-export.cfg
 
 context = key templateapache instance-apache-php:output
-          key dropbear dropbear:location
-          key buildout buildout:bin-directory
+          key templatepbsreadyexport pbsready-export:output
 
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = 5605ad8896c2718854bf26148c4ae940
+md5sum = 2dc6134621b8a12817d43a979b84089a
 mode = 0644
 
+[instance-resilient]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
+rendered = ${buildout:directory}/instance-resilient.cfg
+
+context = key buildout buildout:bin-directory
+          key develop_eggs_directory buildout:develop-eggs-directory
+          key eggs_directory buildout:eggs-directory
+
+import-list = file parts template-parts:destination
+              file replicated template-replicated:destination
+
+md5sum = f6dc9290194ad1fbe1ced553f5668922
+mode = 0644
 
 [instance-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
 output = ${buildout:directory}/instance-mariadb.cfg
-md5sum = fafb873323c0084c522360f94ebe1df7
+md5sum = b214f56ede1a9d10f243c245c804d3a5
 mode = 0644
 
 [instance-mariadb-import]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in
 output = ${buildout:directory}/instance-mariadb-import.cfg
-md5sum = 8009627bb669d1fee0df030daa8d3bdc
+md5sum = faf5826f4b27e362f34ad17db54b8c9a
 mode = 0644
 
 [instance-mariadb-export]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
 output = ${buildout:directory}/instance-mariadb-export.cfg
-md5sum = 0513bf25fbb20cccd57f285c40d96498
-mode = 0644
-
-
-[instance-default-root]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-default-root.cfg.in
-output = ${buildout:directory}/instance-default-root.cfg
-md5sum = 53c9020f7a0b5203f976e069e455787b
+md5sum = 0352896921ca1766b64f0b54f0f8c27e
 mode = 0644
 
 
@@ -279,6 +287,9 @@ signature-certificate-list =
 
 
 [versions]
+# Fetch stable version of lxml, not beta
+lxml = 3.0.2
+
 Jinja2 = 2.6
 Werkzeug = 0.8.3
 apache-libcloud = 0.11.4
@@ -287,32 +298,33 @@ buildout-versions = 1.7
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
 inotifyx = 0.2.0
-lxml = 3.0.2
 meld3 = 0.6.10
 netaddr = 0.7.10
 pycrypto = 2.6
-pytz = 2012h
+pytz = 2012j
 rdiff-backup = 1.0.5
+slapos.cookbook = 0.73.1
 slapos.recipe.build = 0.11.5
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.33
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.33.2-dev
-# slapos.toolbox==0.32.1-dev
+# slapos.core==0.35.1
+# slapos.toolbox==0.33
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33
 feedparser = 5.1.3
 
 # Required by:
@@ -320,39 +332,56 @@ feedparser = 5.1.3
 hexagonit.recipe.download = 1.6
 
 # Required by:
-# slapos.core==0.33.2-dev
+# slapos.core==0.35.1
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33
 paramiko = 1.9.0
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33
 psutil = 0.6.1
 
 # Required by:
-# slapos.core==0.33.2-dev
-pyflakes = 0.5.0
+# slapos.core==0.35.1
+pyflakes = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.70.1-dev
-# slapos.core==0.33.2-dev
-# slapos.toolbox==0.32.1-dev
+# slapos.cookbook==0.73.1
+# slapos.core==0.35.1
+# slapos.toolbox==0.33
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.2
+# zope.interface==4.0.3
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.33.2-dev
+# slapos.toolbox==0.33
+slapos.core = 0.35.1
+
+# Required by:
+# slapos.core==0.35.1
 supervisor = 3.0b1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.core==0.35.1
+unittest2 = 0.5.1
+
+# Required by:
+# slapos.toolbox==0.33
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==0.33.2-dev
-zope.interface = 4.0.2
+# slapos.core==0.35.1
+zope.interface = 4.0.3
+
+cp.recipe.cmd = 0.4
+
+# Required by:
+# zope.testing==4.1.1
+zope.exceptions = 4.0.5
 
+# Required by:
+# cp.recipe.cmd==0.4
+zope.testing = 4.1.1

stack/lamp/instance-default-root.cfg.in

-[buildout]
-parts = request-apache
-
-[request-apache]
-<= slap-connection
-recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
-software-type = apache
-name = Apache
-

stack/lamp/instance-resilient.cfg.jinja2

+# vim: set ft=cfg:
+
+{% import 'parts' as parts %}
+{% import 'replicated' as replicated %}
+
+[buildout]
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
+parts +=
+  {{ parts.replicate("apache", "3") }}
+  publish-connection-informations
+
+{{ replicated.replicate("apache", "3", "apache-export", "apache-import") }}
+
+# Bubble up the parameters
+[request-apache]
+return = url ssh-public-key ssh-url notification-id ip url backend_url
+# XXX: hardcoded values
+config = domain number authorized-key notify ip-list namebase mariadb1-computer-guid pbs-mariadb1-computer-guid mariadb2-computer-guid pbs-mariadb2-computer-guid mariadb3-computer-guid pbs-mariadb3-computer-guid
+config-mariadb1-computer-guid = ${slap-parameter:mariadb1-computer-guid}
+config-pbs-mariadb1-computer-guid = ${slap-parameter:pbs-mariadb1-computer-guid}
+config-mariadb2-computer-guid = ${slap-parameter:mariadb2-computer-guid}
+config-pbs-mariadb2-computer-guid = ${slap-parameter:pbs-mariadb2-computer-guid}
+config-mariadb3-computer-guid = ${slap-parameter:mariadb3-computer-guid}
+config-pbs-mariadb3-computer-guid = ${slap-parameter:pbs-mariadb3-computer-guid}
+config-domain = ${slap-parameter:domain}
+
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+backend_url = ${request-apache:connection-backend_url}
+url = ${request-apache:connection-url}
+
+[slap-parameter]
+# Default parameters for distributed deployment
+# I.e state "backup1 of maria should go there, ..."
+# XXX-Cedric: Hardcoded number of backups. Should be dynamically generated.
+mariadb1-computer-guid =
+pbs-mariadb1-computer-guid =
+mariadb2-computer-guid =
+pbs-mariadb2-computer-guid =
+mariadb3-computer-guid =
+pbs-mariadb3-computer-guid =
+# XXX-Cedric: Hardcoded parameters. Should be dynamically generated.
+domain =

stack/lamp/instance.cfg.in

@@ -10,15 +10,12 @@ offline = true
 [switch_softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = ${instance-apache-php:output}
-resilient = ${template-resilient-lamp:rendered}
+resilient = ${instance-resilient:rendered}
 mariadb = ${instance-mariadb:output}
 mariadb-import = ${instance-mariadb-import:output}
 mariadb-export = ${instance-mariadb-export:output}
-apache-backup = ${instance-apache-backup:output}
-
-# To prepend an empty root instance:
-#default = ${instance-default-root:output}
-#apache = ${instance-apache-php:output}
+apache-import = ${instance-apache-import:output}
+apache-export = ${instance-apache-export:rendered}
 
 #frozen creates a syntax error, meaning it can keep its data.
 #It's dirty as hell, it needs to be replaced.

stack/lamp/mariadb/instance-mariadb-export.cfg.in

@@ -2,14 +2,23 @@
 extends = ${instance-mariadb:output}
           ${pbsready-export:output}
 
-
+# Repeating parts from instance-mariadb.
 parts +=
+  urls
   mariadb
+  stunnel
+  certificate-authority
+  ca-stunnel
+  logrotate
+  logrotate-entry-mariadb
+  logrotate-entry-stunnel
+  logrotate-entry-cron
+  cron
+  cron-entry-logrotate
+  slapmonitor
+  slapmonitor-xml
 
-# have to repeat the next one, as it's not inherited from pbsready-export
-    cron-entry-backup
-
-
+# Define exporter strategy
 [exporter]
 recipe = slapos.cookbook:mydumper
 wrapper = $${rootdirectory:bin}/$${slap-parameter:namebase}-exporter
@@ -19,3 +28,7 @@ user = root
 mydumper-binary = ${mydumper:location}/bin/mydumper
 database = $${mariadb:database}
 import = false
+
+# Extends publish section with resilient parameters
+[urls]
+<= resilient-publish-connection-parameter
\ No newline at end of file

stack/lamp/mariadb/instance-mariadb-import.cfg.in

@@ -2,13 +2,6 @@
 extends = ${instance-mariadb:output}
           ${pbsready-import:output}
 
-
-parts +=
-    mariadb
-
-# have to repeat the next one, as it's not inherited from pbsready-import
-    import-on-notification
-
 [importer]
 recipe = slapos.cookbook:mydumper
 wrapper = $${rootdirectory:bin}/myloader

stack/lamp/mariadb/instance-mariadb.cfg.in

@@ -14,8 +14,6 @@ parts =
   slapmonitor
   slapmonitor-xml
 
-gzip-binary = ${gzip:location}/bin/gzip
-
 # Define egg directories to be the one from Software Release
 # (/opt/slapgrid/...)
 eggs-directory = ${buildout:eggs-directory}
@@ -91,7 +89,7 @@ command = $${logrotate:wrapper}
 recipe = slapos.cookbook:logrotate
 # Binaries
 logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = $${buildout:gzip-binary}
+gzip-binary = ${gzip:location}/bin/gzip
 gunzip-binary = ${gzip:location}/bin/gunzip
 # Directories
 wrapper = $${rootdirectory:bin}/logrotate

stack/lamp/template-resilient.cfg.in

-{% import 'parts' as parts %}
-{% import 'replicated' as replicated %}
-
-[buildout]
-
-extends =
-   {{templateapache}}
-
-# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
-parts +=
-  {{ parts.replicate("mariadb","3") }}
-  request-apache-backup-1
-  request-apache-backup-2
-
-  request-pull-backup-server-apache-1
-  request-pull-backup-server-apache-backup-1
-
-  request-pull-backup-server-apache-2
-  request-pull-backup-server-apache-backup-2
-
-  publish-connection-informations
-  apache-php
-  stunnel
-  certificate-authority
-  ca-stunnel
-  logrotate
-  logrotate-entry-apache
-  logrotate-entry-stunnel
-  cron
-  cron-entry-logrotate
-  dropbear-server
-  sshkeys-authority
-  dropbear-server-pbs-authorized-key
-
-  request-pull-backup-server
-
-{{ replicated.replicate("mariadb", "3", "mariadb-export", "mariadb-import") }}
-
-
-[request-pull-backup-server]
-<= request-pbs-common
-name = PBS (Pull Backup Server)
-return = ssh-key notification-url feeds-url
-slave = false
-
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = ${directory:sshkeys}/requests
-keys = ${directory:sshkeys}/keys
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = ${sshkeys-directory:requests}
-keys-directory = ${sshkeys-directory:keys}
-wrapper = ${basedirectory:services}/sshkeys_authority
-keygen-binary = {{dropbear}}/bin/dropbearkey
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = ${dropbear-server:wrapper}
-public-key = ${dropbear-server:rsa-keyfile}.pub
-private-key = ${dropbear-server:rsa-keyfile}
-wrapper = ${basedirectory:services}/sshd
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = ${slap-network-information:global-ipv6}
-port = 2222
-home = ${directory:ssh}
-wrapper = ${rootdirectory:bin}/raw_sshd
-shell = ${rdiff-backup-server:wrapper}
-rsa-keyfile = ${directory:ssh}/server_key.rsa
-dropbear-binary = {{dropbear}}/sbin/dropbear
-
-[dropbear-server-pbs-authorized-key]
-<= dropbear-server
-recipe = slapos.cookbook:dropbear.add_authorized_key
-key = ${request-pull-backup-server:connection-ssh-key}
-
-[rdiff-backup-server]
-<= apache-php
-recipe = slapos.cookbook:pbs
-client = false
-path = ${apache-php:htdocs}
-wrapper = ${rootdirectory:bin}/rdiffbackup-server
-rdiffbackup-binary = {{buildout}}/rdiff-backup
-
-[request-apache-backup-1]
-<= slap-connection
-recipe = slapos.cookbook:request
-name = Apache Backup 1
-software-url = ${slap-connection:software-release-url}
-software-type = apache-backup
-return = url ssh-url ssh-public-key
-config = authorized-key proxy-url
-config-authorized-key = ${request-pull-backup-server:connection-ssh-key}
-config-proxy-url = ${publish-connection-informations:url}
-
-[request-apache-backup-2]
-<= slap-connection
-recipe = slapos.cookbook:request
-name = Apache Backup 2
-software-url = ${slap-connection:software-release-url}
-software-type = apache-backup
-return = url ssh-url ssh-public-key
-config = authorized-key proxy-url
-config-authorized-key = ${request-pull-backup-server:connection-ssh-key}
-config-proxy-url = ${publish-connection-informations:url}
-
-[request-pull-backup-server-apache-1]
-<= request-pbs-common
-name = PBS pulling from Apache 1
-config = url name type server-key notify notification-id frequency
-config-url = ssh://nobody@[${dropbear-server:host}]:${dropbear-server:port}/${rdiff-backup-server:path}
-config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache
-config-type = pull
-config-server-key = ${sshkeys-dropbear:public-key-value}
-config-notify = ${request-pull-backup-server:connection-notification-url}
-config-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache-pull
-config-frequency = 30 * * * *
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-[request-pull-backup-server-apache-2]
-<= request-pbs-common
-name = PBS pulling from Apache 2
-config = url name type server-key notify notification-id frequency
-config-url = ssh://nobody@[${dropbear-server:host}]:${dropbear-server:port}/${rdiff-backup-server:path}
-config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache
-config-type = pull
-config-server-key = ${sshkeys-dropbear:public-key-value}
-config-notify = ${request-pull-backup-server:connection-notification-url}
-config-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache-pull
-config-frequency = 30 * * * *
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-
-[request-pull-backup-server-apache-backup-1]
-<= request-pbs-common
-name = PBS pushing to ${request-apache-backup-1:name}
-config = url name type server-key on-notification
-config-url = ${request-apache-backup-1:connection-ssh-url}
-config-name = ${request-pull-backup-server-apache-1:config-name}
-config-type = push
-config-server-key = ${request-apache-backup-1:connection-ssh-public-key}
-config-on-notification = ${request-pull-backup-server:connection-feeds-url}${request-pull-backup-server-apache-1:config-notification-id}
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-[request-pull-backup-server-apache-backup-2]
-<= request-pbs-common
-name = PBS pushing to ${request-apache-backup-2:name}
-config = url name type server-key on-notification
-config-url = ${request-apache-backup-2:connection-ssh-url}
-config-name = ${request-pull-backup-server-apache-2:config-name}
-config-type = push
-config-server-key = ${request-apache-backup-2:connection-ssh-public-key}
-config-on-notification = ${request-pull-backup-server:connection-feeds-url}${request-pull-backup-server-apache-2:config-notification-id}
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-
-[directory]
-ssh = ${rootdirectory:etc}/ssh
-sshkeys = ${rootdirectory:srv}/sshkeys

stack/lapp/buildout.cfg

@@ -15,8 +15,6 @@ parts =
   instance-postgres-import
   instance-postgres-export
 
-  instance-default-root
-
 
 extends =
   ../resilient/buildout.cfg
@@ -50,7 +48,7 @@ strip-top-level-dir = true
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
-md5sum = 1aaf3ea7b14e09e66904bdb80e3cfe2f
+md5sum = a482fa0e72839b4bd75b169ac1460d64
 mode = 0644
 
 [instance-apache-php]
@@ -67,9 +65,9 @@ output = ${buildout:directory}/instance-apache-backup.cfg
 md5sum = db879141c0b6a77ef8b3b7e699f5583a
 mode = 0644
 
-[template-resilient-lapp]
+[instance-resilient]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/template-resilient.cfg.in
+template = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
 rendered = ${buildout:directory}/instance-resilient.cfg
 
 context = key templateapache instance-apache-php:output
@@ -79,7 +77,7 @@ context = key templateapache instance-apache-php:output
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = 525f50e60d0a96557a552de6afa4ab88
+md5sum = 46c7d8f691bd37d84e0bd03b83e51d14
 mode = 0644
  
 
@@ -87,7 +85,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/postgres/instance-postgres.cfg.in
 output = ${buildout:directory}/instance-postgres.cfg
-md5sum = 6e9e587ddb52fb9a3817fda7d77e4cab
+md5sum = a2370d9a23e436166b20203f66412608
 mode = 0644
 
 [instance-postgres-import]
@@ -124,12 +122,6 @@ library-dirs =
 rpath = 
     ${postgresql:location}/lib
 
-[instance-default-root]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-default-root.cfg.in
-output = ${buildout:directory}/instance-default-root.cfg
-md5sum = 53c9020f7a0b5203f976e069e455787b
-mode = 0644
 
 #----------------
 #--
@@ -164,6 +156,139 @@ eggs =
   slapos.toolbox
 
 
+[networkcache]
+# Romain Courteaud + Sebastien Robin + Alain Takoudjou
+# + Cedric de Saint Martin signature certificate
+# List of signatures of uploaders we trust:
+#   Romain Courteaud
+#   Sebastien Robin
+#   Kazuhiko Shiozaki
+#   Cedric de Saint Martin
+#   Yingjie Xu
+#   Gabriel Monnerat
+#   Łukasz Nowak
+#   Test Agent Signature
+#   Alain Takoudjou
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
+  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
+  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
+  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
+  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
+  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
+  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
+  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
+  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
+  QUUGLQ==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
+  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
+  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
+  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
+  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
+  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
+  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
+  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
+  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
+  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
+  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
+  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
+  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
+  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
+  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
+  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
+  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
+  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
+  vaZhjNYKWQf79l6zXfOvphzJ
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
+  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
+  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
+  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
+  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
+  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
+  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
+  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
+  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
+  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
+  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
+  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
+  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
+  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
+  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
+  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
+  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
+  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
+  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
+  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
+  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
+  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
+  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
+  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER
+  MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR
+  T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5
+  psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN
+  NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW
+  BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk
+  C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke
+  LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss
+  dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
+  n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
+  -----END CERTIFICATE-----
+
+
 [versions]
 Jinja2 = 2.6
 Werkzeug = 0.8.3
@@ -180,6 +305,7 @@ psycopg2 = 2.4.6
 pycrypto = 2.6
 pytz = 2012h
 rdiff-backup = 1.0.5
+slapos.cookbook = 0.72.0
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 smmap = 0.8.2
@@ -242,3 +368,24 @@ xml-marshaller = 0.9.7
 # slapos.core==0.33.2-dev
 zope.interface = 4.0.2
 
+cp.recipe.cmd = 0.4
+plone.recipe.command = 1.1
+slapos.recipe.build = 0.11.5
+slapos.toolbox = 0.33
+
+# Required by:
+# slapos.toolbox==0.33
+slapos.core = 0.35
+
+# Required by:
+# slapos.core==0.35
+unittest2 = 0.5.1
+
+# Required by:
+# zope.testing==4.1.1
+zope.exceptions = 4.0.5
+
+# Required by:
+# cp.recipe.cmd==0.4
+zope.testing = 4.1.1
+

stack/lapp/instance-default-root.cfg.in

-[buildout]
-parts = request-apache
-
-[request-apache]
-<= slap-connection
-recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
-software-type = apache
-name = Apache
-

stack/lapp/template-resilient.cfg.in → stack/lapp/instance-resilient.cfg.jinja2

+# vim: set ft=cfg:
+
 {% import 'parts' as parts %}
 {% import 'replicated' as replicated %}
 

stack/lapp/instance.cfg.in

@@ -9,9 +9,8 @@ offline = true
 
 [switch_softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${instance-default-root:output}
-apache = ${instance-apache-php:output}
-resilient = ${template-resilient-lapp:rendered}
+default = ${instance-apache-php:output}
+resilient = ${instance-resilient:rendered}
 postgres = ${instance-postgres:output}
 postgres-import = ${instance-postgres-import:output}
 postgres-export = ${instance-postgres-export:output}

stack/lapp/postgres/instance-postgres.cfg.in

@@ -134,9 +134,9 @@ config-file = $${directory:stunnel-conf}/stunnel.conf
 key-file = $${directory:stunnel-conf}/stunnel.key
 cert-file = $${directory:stunnel-conf}/stunnel.crt
 pid-file = $${basedirectory:run}/stunnel.pid
-local-host = $${instance-parameters:ipv4_random}
+local-host = $${instance-parameters:ipv4-random}
 local-port = $${postgres-instance:port}
-remote-host = $${instance-parameters:ipv6_random}
+remote-host = $${instance-parameters:ipv6-random}
 remote-port = 6446
 client = false
 post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
@@ -173,9 +173,14 @@ crl = $${directory:ca-dir}/crl/
 [postgres-instance]
 recipe = slapos.cookbook:postgres
 ipv6 = $${instance-parameters:ipv6}
+# listen to connections from anywhere
+ipv6-netmask-bits = 0
 ipv4 = $${instance-parameters:ipv4}
-ipv6_random = $${instance-parameters:ipv6_random}
+# listen to connections from anywhere
+ipv4-netmask-bits = 0
+ipv6-random = $${instance-parameters:ipv6-random}
 superuser = postgres
+password = $${postgres-passwd:passwd}
 port = 5432
 dbname = db
 # pgdata_directory is created by initdb, and should not exist beforehand.
@@ -193,6 +198,16 @@ key-file = $${stunnel:key-file}
 cert-file = $${stunnel:cert-file}
 
 
+#----------------
+#--
+#-- Generates a random password and stores it in the filesystem
+
+[postgres-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${rootdirectory:srv}/postgres_passwd
+bytes = 16
+
+
 #----------------
 #--
 #-- Deploy slapmonitor.
@@ -218,7 +233,7 @@ path = $${directory:report}/slapmonitor-xml
 [postgres-promise]
 recipe = slapos.cookbook:check_port_listening
 path = $${basedirectory:promises}/postgres
-hostname = $${instance-parameters:ipv6_random}
+hostname = $${instance-parameters:ipv6-random}
 port = $${postgres-instance:port}
 
 
@@ -229,7 +244,7 @@ port = $${postgres-instance:port}
 [urls]
 recipe = slapos.cookbook:publish
 url = $${postgres-instance:url}
-ip = $${instance-parameters:ipv6_random}
+ip = $${instance-parameters:ipv6-random}
 
 
 #----------------

stack/resilient/buildout.cfg

@@ -22,7 +22,7 @@ parts =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/pbsready.cfg.in
 output = ${buildout:directory}/pbsready.cfg
-md5sum = e602f6746cbe5a1da82b90097719c4a1
+md5sum = 9f4212a79f10bee8f6d75061943110e2
 mode = 0644
 
 [pbsready-import]
@@ -31,7 +31,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/pbsready-import.cfg.in
 output = ${buildout:directory}/pbsready-import.cfg
-md5sum = eda0c1574d8991f4f9e08e3707c2b04b
+md5sum = 1b1308fd39476d48b5ca13db48ea6dc9
 mode = 0644
 
 [pbsready-export]
@@ -40,7 +40,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/pbsready-export.cfg.in
 output = ${buildout:directory}/pbsready-export.cfg
-md5sum = dd56f9c74e580475a17a9afb1d220390
+md5sum = 5d9e20c436fd307e8e4ab224a9a65792
 mode = 0644
 
 [template-pull-backup]
@@ -53,7 +53,7 @@ mode = 0644
 [template-replicated]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/template-replicated.cfg.in
-md5sum = 63b5649f3cf1c9a77315382793d9593f
+md5sum = 9e20f283bf709c63c9c6692d5e1f8972
 mode = 0644
 destination = ${buildout:directory}/template-replicated.cfg.in
 

stack/resilient/pbsready-export.cfg.in

@@ -2,9 +2,10 @@
 
 extends = ${pbsready:output}
 
-parts += cron-entry-backup
+parts +=
+  cron-entry-backup
 
-[urls]
+[resilient-publish-connection-parameter]
 notification-id = http://[$${notifier:host}]:$${notifier:port}/get/$${notifier-exporter:name}
 
 [notifier-exporter]

stack/resilient/pbsready-import.cfg.in

@@ -2,9 +2,11 @@
 
 extends = ${pbsready:output}
 
-parts += import-on-notification
+parts +=
+  import-on-notification
+  resilient-publish-connection-parameter
 
-[urls]
+[resilient-publish-connection-parameter]
 notification-url = http://[$${notifier:host}]:$${notifier:port}/notify
 
 [import-on-notification]

stack/resilient/pbsready.cfg.in

 [buildout]
 
-parts +=
+parts =
   resiliency
-  urls
-  stunnel
-  certificate-authority
-  ca-stunnel
   logrotate
-  logrotate-entry-stunnel
   logrotate-entry-cron
   logrotate-entry-equeue
   cron
@@ -23,17 +18,110 @@ parts +=
 #--
 #-- Creation of all needed directories.
 
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+var = $${buildout:directory}/var
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
+
 [basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log
+services = $${rootdirectory:etc}/service
+run = $${rootdirectory:var}/run
+script = $${rootdirectory:etc}/script
+backup = $${rootdirectory:srv}/backup
+promises = $${rootdirectory:etc}/promise
 services = $${rootdirectory:etc}/service
 cache = $${rootdirectory:var}/cache
 notifier = $${rootdirectory:etc}/notifier
 
 [directory]
+recipe = slapos.cookbook:mkdirectory
 backup = $${basedirectory:backup}/$${slap-parameter:namebase}
 ssh = $${rootdirectory:etc}/ssh/
 sshkeys = $${rootdirectory:srv}/sshkeys
 notifier-feeds = $${basedirectory:notifier}/feeds
 notifier-callbacks = $${basedirectory:notifier}/callbacks
+cron-entries = $${rootdirectory:etc}/cron.d
+crontabs = $${rootdirectory:etc}/crontabs
+cronstamps = $${rootdirectory:etc}/cronstamps
+logrotate-entries = $${rootdirectory:etc}/logrotate.d
+logrotate-backup = $${basedirectory:backup}/logrotate
+
+#----------------
+#--
+#-- Deploy cron.
+
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = ${dcron:location}/sbin/crond
+cron-entries = $${directory:cron-entries}
+crontabs = $${directory:crontabs}
+cronstamps = $${directory:cronstamps}
+catcher = $${cron-simplelogger:wrapper}
+binary = $${basedirectory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/crond.log
+
+
+#----------------
+#--
+#-- Deploy logrotate.
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = $${logrotate:wrapper}
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
+gzip-binary = ${gzip:location}/bin/gzip
+gunzip-binary = ${gzip:location}/bin/gunzip
+# Directories
+wrapper = $${rootdirectory:bin}/logrotate
+conf = $${rootdirectory:etc}/logrotate.conf
+logrotate-entries = $${directory:logrotate-entries}
+backup = $${directory:logrotate-backup}
+state-file = $${rootdirectory:srv}/logrotate.status
+
+[logrotate-entry-mariadb]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = mariadb
+log = $${mariadb:error-log}
+frequency = daily
+rotate-num = 30
+post = $${mariadb:logrotate-post}
+sharedscripts = true
+notifempty = true
+create = true
+
+[logrotate-entry-cron]
+<= logrotate
+recipe =slapos.cookbook:logrotate.d
+name = crond
+log = $${cron-simplelogger:log}
+frequency = daily
+rotate-num = 30
+notifempty = true
+create = true
+
+[logrotate-entry-equeue]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = equeue
+log = $${equeue:log}
+frequency = daily
+rotate-num = 30
 
 
 #----------------
@@ -56,10 +144,6 @@ etc = $${rootdirectory:etc}
 #--
 #-- Sets up an rdiff-backup server (with a dropbear server for ssh)
 
-[urls]
-ssh-public-key = $${sshkeys-dropbear:public-key-value}
-ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
-
 [rdiff-backup-server]
 recipe = slapos.cookbook:pbs
 client = false
@@ -89,19 +173,11 @@ callbacks = $${directory:notifier-callbacks}
 id-file = $${rootdirectory:etc}/notifier.id
 equeue-socket = $${equeue:socket}
 host = $${slap-network-information:global-ipv6}
-port = 8080
+port = 65534
 wrapper = $${basedirectory:services}/notifier
 server-binary = ${buildout:bin-directory}/pubsubserver
 notifier-binary = ${buildout:bin-directory}/pubsubnotifier
 
-[logrotate-entry-equeue]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = equeue
-log = $${equeue:log}
-frequency = daily
-rotate-num = 30
-
 
 #----------------
 #--
@@ -150,4 +226,12 @@ recipe = slapos.cookbook:dropbear.add_authorized_key
 key = $${slap-parameter:authorized-key}
 
 
-
+#----------------
+#--
+#-- Conncetion informations to re-use.
+# XXX-Cedric: when "aggregation" system is done in libslap, directly publish.
+[resilient-publish-connection-parameter]
+recipe = slapos.cookbook:publish
+ssh-public-key = $${sshkeys-dropbear:public-key-value}
+ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
+ip = $${slap-network-information:global-ipv6}

stack/resilient/template-replicated.cfg.in

@@ -2,16 +2,21 @@
 
 ## Tells the Backupable recipe that we want a backup
 [resilient]
+recipe = slapos.cookbook:request
 config-namebase = {{namebase}}
+software-url = ${slap-connection:software-release-url}
 
 ## Every request is double to provide the 3 IPs.
+## First, we request with ip-list parameter hardcoded.
+## Then, we request the same thing without this.
+## XXX-Cedric: is it useful?
 [request-{{namebase}}]
 <= resilient
    slap-connection
    {{heriteLeader}}
 software-type = {{typeexport}}
 name = {{namebase}}0
-return = url ssh-public-key ssh-url notification-id ip
+return = ssh-public-key ssh-url notification-id ip
 
 config = number authorized-key notify ip-list namebase
 config-number = 0
@@ -19,6 +24,7 @@ config-authorized-key = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{na
 config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-notification-url}{% endfor %}
 config-ip-list =
 
+
 {% for id in range(1,nbbackup|int) %}
 
 [request-{{namebase}}-pseudo-replicating-{{id}}]
@@ -30,7 +36,7 @@ name = {{namebase}}{{id}}
 
 software-url = ${slap-connection:software-release-url}
 software-type = {{typeimport}}
-return = url ssh-public-key ssh-url notification-url ip
+return = ssh-public-key ssh-url notification-url ip
 
 pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-push
 
@@ -40,49 +46,23 @@ config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}
 config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${:pbs-notification-id}
 config-ip-list =
 
+sla = computer_guid
+sla-computer_guid = ${slap-parameter:{{namebase}}{{id}}-computer-guid}
+
+
 {% endfor %}
 
 [iplist]
 config-ip-list = ${request-{{namebase}}:connection-ip}{% for j in range(1,nbbackup|int) %} ${request-{{namebase}}-pseudo-replicating-{{j}}:connection-ip}{% endfor %}
 
 [request-{{namebase}}-2]
-<= resilient
-   slap-connection
+<= request-{{namebase}}
    iplist
-   {{heriteLeader}}
-
-recipe = slapos.cookbook:request
-name = {{namebase}}0
-
-software-url = ${slap-connection:software-release-url}
-software-type = {{typeexport}}
-return = url ssh-public-key ssh-url notification-id ip
-
-config = number authorized-key notify ip-list namebase
-config-number = 0
-config-authorized-key = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}{% endfor %}
-config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-notification-url}{% endfor %}
 
 {% for id in range(1,nbbackup|int) %}
 [request-{{namebase}}-pseudo-replicating-{{id}}-2]
-<= slap-connection
-   resilient
+<= request-{{namebase}}-pseudo-replicating-{{id}}
    iplist
-   {{heriteBackup}}
-
-recipe = slapos.cookbook:request
-name = {{namebase}}{{id}}
-
-software-url = ${slap-connection:software-release-url}
-software-type = {{typeimport}}
-return = url ssh-public-key ssh-url notification-url
-
-pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-push
-
-config = number authorized-key on-notification ip-list namebase
-config-number = {{id}}
-config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}
-config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${:pbs-notification-id}
 
 {% endfor %}
 
@@ -110,6 +90,8 @@ software-type = pull-backup
 name = PBS ({{namebase}} / {{id}})
 return = ssh-key notification-url feeds-url
 slave = false
+sla = computer_guid
+sla-computer_guid = ${slap-parameter:pbs-{{namebase}}{{id}}-computer-guid}
 
 [request-pull-backup-server-{{namebase}}-{{id}}]
 <= request-pbs-common
@@ -144,4 +126,12 @@ sla = instance_guid
 sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
 {% endfor %}
 
+[slap-parameter]
+# Default parameters for distributed deployment
+# I.e state "backup1 of maria should go there, ..."
+{% for id in range(1,nbbackup|int) %}
+{{namebase}}{{id}}-computer-guid =
+pbs-{{namebase}}{{id}}-computer-guid =
+{% endfor %}
+
 {% endmacro %}