Commit 3c2254a5 authored by Alain Takoudjou's avatar Alain Takoudjou

Merge branch 'master' into trac

parents 57316ba5 e40afbc5
Changes Changes
======= =======
0.77.1 (2013-04-18)
-------------------
* Re-release of 0.77.0.
0.77.0 (2013-04-18)
-------------------
* Allow to pass extra parameters when creating simple wrapper. [Sebastien Robin]
* Apache frontend: Append all rewrite module options to http as well. [Cedric de Saint Martin]
* Apache frontend: Add https-only support. [Cedric de Saint Martin]
* Apache frontend: make logrotate work by using "generic" component. [Cedric de Saint Martin]
0.76.0 (2013-04-03) 0.76.0 (2013-04-03)
------------------- -------------------
......
...@@ -8,7 +8,7 @@ extends = ...@@ -8,7 +8,7 @@ extends =
../automake/buildout.cfg ../automake/buildout.cfg
[6tunnel] [6tunnel]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz url = http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz
md5sum = 74e02d4f0704b3083a01feda66033449 md5sum = 74e02d4f0704b3083a01feda66033449
configure-command = configure-command =
......
...@@ -4,7 +4,7 @@ parts = ...@@ -4,7 +4,7 @@ parts =
[alsa] [alsa]
# Contains libasound # Contains libasound
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.24.1.tar.bz2 url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.24.1.tar.bz2
md5sum = 7cc05f25e1d5b65da8fb3fdcd540f226 md5sum = 7cc05f25e1d5b65da8fb3fdcd540f226
configure-options = configure-options =
......
...@@ -8,7 +8,7 @@ extends = ...@@ -8,7 +8,7 @@ extends =
[apache-perl] [apache-perl]
# Note: Shall react on each build of apache and reinstall itself # Note: Shall react on each build of apache and reinstall itself
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://perl.apache.org/dist/mod_perl-2.0.5.tar.gz url = http://perl.apache.org/dist/mod_perl-2.0.5.tar.gz
md5sum = 03d01d135a122bd8cebd0cd5b185d674 md5sum = 03d01d135a122bd8cebd0cd5b185d674
configure-command = configure-command =
......
...@@ -20,7 +20,7 @@ extends = ...@@ -20,7 +20,7 @@ extends =
[apache-php] [apache-php]
# Note: Shall react on each build of apache and reinstall itself # Note: Shall react on each build of apache and reinstall itself
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${mariadb:version} ${mariadb:version}
url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
...@@ -68,7 +68,7 @@ environment = ...@@ -68,7 +68,7 @@ environment =
[apache-php-postgres] [apache-php-postgres]
# Note: Shall react on each build of apache and reinstall itself # Note: Shall react on each build of apache and reinstall itself
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${postgresql:url} ${postgresql:url}
url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
...@@ -113,11 +113,11 @@ environment = ...@@ -113,11 +113,11 @@ environment =
[libmcrypt] [libmcrypt]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2/download url = http://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2/download
md5sum = c4f491dd411a09e9de3b8702ea6f73eb md5sum = c4f491dd411a09e9de3b8702ea6f73eb
[xml-rpc] [xml-rpc]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz
md5sum = 59a644c636c6d98267d0c99b406ae9e8 md5sum = 59a644c636c6d98267d0c99b406ae9e8
...@@ -27,7 +27,7 @@ md5sum = 9c1db8606e520f201c451ec9a0b095f6 ...@@ -27,7 +27,7 @@ md5sum = 9c1db8606e520f201c451ec9a0b095f6
[apache] [apache]
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/ # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${gdbm:version} ${gdbm:version}
version = 2.4.4 version = 2.4.4
...@@ -101,7 +101,7 @@ md5sum = 4f074f035d3b37f3f3e71cd9616440f3 ...@@ -101,7 +101,7 @@ md5sum = 4f074f035d3b37f3f3e71cd9616440f3
[apache-antiloris] [apache-antiloris]
# Note: Shall react on each build of apache and reinstall itself # Note: Shall react on each build of apache and reinstall itself
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
md5sum = 66862bf10e9be3a023e475604a28a0b4 md5sum = 66862bf10e9be3a023e475604a28a0b4
patch-options = -p0 patch-options = -p0
...@@ -119,7 +119,7 @@ make-targets = ...@@ -119,7 +119,7 @@ make-targets =
[apache-2.2] [apache-2.2]
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/ # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.24.tar.gz url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.24.tar.gz
md5sum = 64a3392018ad60583209a16d728180d3 md5sum = 64a3392018ad60583209a16d728180d3
patch-options = -p1 patch-options = -p1
...@@ -179,7 +179,7 @@ environment = ...@@ -179,7 +179,7 @@ environment =
[apache-antiloris-apache-2.2] [apache-antiloris-apache-2.2]
# Note: Shall react on each build of apache and reinstall itself # Note: Shall react on each build of apache and reinstall itself
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
md5sum = 66862bf10e9be3a023e475604a28a0b4 md5sum = 66862bf10e9be3a023e475604a28a0b4
configure-command = ${apache-2.2:location}/bin/apxs configure-command = ${apache-2.2:location}/bin/apxs
......
...@@ -14,12 +14,12 @@ update-command = ${:command} ...@@ -14,12 +14,12 @@ update-command = ${:command}
stop-on-error = yes stop-on-error = yes
[aspell] [aspell]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
md5sum = e66a9c9af6a60dc46134fdacf6ce97d7 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
[aspell-en-dictionary] [aspell-en-dictionary]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2 url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
md5sum = beba5e8f3afd3ed1644653bb685b2dfb md5sum = beba5e8f3afd3ed1644653bb685b2dfb
configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
\ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
parts = attr parts = attr
[attr] [attr]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.igh.cnrs.fr/pub/nongnu/attr/attr-2.4.46.src.tar.gz url = ftp://ftp.igh.cnrs.fr/pub/nongnu/attr/attr-2.4.46.src.tar.gz
md5sum = db557c17fdfa4f785333ecda08654010 md5sum = db557c17fdfa4f785333ecda08654010
configure-options = configure-options =
......
...@@ -6,7 +6,7 @@ parts = ...@@ -6,7 +6,7 @@ parts =
autoconf autoconf
[autoconf] [autoconf]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
md5sum = 82d05e03b93e45f5a39b828dc9c6c29b md5sum = 82d05e03b93e45f5a39b828dc9c6c29b
environment = environment =
......
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
automake automake
[automake] [automake]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = 140e084223bf463a24c1a28427c6aec7 md5sum = 140e084223bf463a24c1a28427c6aec7
url = http://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.xz url = http://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.xz
environment = environment =
......
...@@ -3,6 +3,6 @@ parts = ...@@ -3,6 +3,6 @@ parts =
bash bash
[bash] [bash]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.gnu.org/gnu/bash/bash-4.2.tar.gz url = ftp://ftp.gnu.org/gnu/bash/bash-4.2.tar.gz
md5sum = 3fb927c7c33022f1c327f14a81c0d4b0 md5sum = 3fb927c7c33022f1c327f14a81c0d4b0
...@@ -3,6 +3,6 @@ parts = ...@@ -3,6 +3,6 @@ parts =
binutils binutils
[binutils] [binutils]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/binutils/binutils-2.21.1.tar.bz2 url = http://ftp.gnu.org/gnu/binutils/binutils-2.21.1.tar.bz2
md5sum = bde820eac53fa3a8d8696667418557ad md5sum = bde820eac53fa3a8d8696667418557ad
...@@ -17,7 +17,7 @@ patch-options = -p1 ...@@ -17,7 +17,7 @@ patch-options = -p1
patches = patches =
${bison-drop.gets.patch:location}/${bison-drop.gets.patch:filename} ${bison-drop.gets.patch:location}/${bison-drop.gets.patch:filename}
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2 url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2
md5sum = 9dba20116b13fc61a0846b0058fbe004 md5sum = 9dba20116b13fc61a0846b0058fbe004
environment = environment =
......
...@@ -10,7 +10,7 @@ download-only = true ...@@ -10,7 +10,7 @@ download-only = true
filename = bzip2-hooks.py filename = bzip2-hooks.py
[bzip2] [bzip2]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz url = http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
md5sum = 00b516f4704d4a7cb50a1d97e6e8e15b md5sum = 00b516f4704d4a7cb50a1d97e6e8e15b
configure-command = true configure-command = true
......
...@@ -17,7 +17,7 @@ filename = ${:_buildout_section_name_} ...@@ -17,7 +17,7 @@ filename = ${:_buildout_section_name_}
download-only = true download-only = true
[ca-certificates] [ca-certificates]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 20130119 version = 20130119
url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
parts = ccache parts = ccache
[ccache-common] [ccache-common]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
[ccache] [ccache]
<= ccache-3.1 <= ccache-3.1
......
...@@ -17,7 +17,7 @@ md5sum = 42c77fdd5d7a976fc302b93aadb3da98 ...@@ -17,7 +17,7 @@ md5sum = 42c77fdd5d7a976fc302b93aadb3da98
filename = imap-2007f.patch filename = imap-2007f.patch
[cclient] [cclient]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
md5sum = 2126fd125ea26b73b20f01fcd5940369 md5sum = 2126fd125ea26b73b20f01fcd5940369
configure-command = true configure-command = true
......
...@@ -3,6 +3,6 @@ parts = ...@@ -3,6 +3,6 @@ parts =
cmake cmake
[cmake] [cmake]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz url = http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz
md5sum = 097278785da7182ec0aea8769d06860c md5sum = 097278785da7182ec0aea8769d06860c
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
coreutils coreutils
[coreutils] [coreutils]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.21.tar.xz url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.21.tar.xz
md5sum = 065ba41828644eca5dd8163446de5d64 md5sum = 065ba41828644eca5dd8163446de5d64
configure-options = configure-options =
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
corocosync corocosync
[corosync] [corosync]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp:downloads@corosync.org/downloads/corosync-1.3.1/corosync-1.3.1.tar.gz url = ftp://ftp:downloads@corosync.org/downloads/corosync-1.3.1/corosync-1.3.1.tar.gz
md5sum = c58459a009a3a9d0b9c00e276a190d90 md5sum = c58459a009a3a9d0b9c00e276a190d90
environment = environment =
......
...@@ -10,7 +10,7 @@ extends = ...@@ -10,7 +10,7 @@ extends =
parts = couchdb parts = couchdb
[couchdb] [couchdb]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://mir2.ovh.net/ftp.apache.org/dist//couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz url = http://mir2.ovh.net/ftp.apache.org/dist//couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz
md5sum = cd126219b9cb69a4c521abd6960807a6 md5sum = cd126219b9cb69a4c521abd6960807a6
configure-options = configure-options =
......
...@@ -15,6 +15,6 @@ virtual-depends = ...@@ -15,6 +15,6 @@ virtual-depends =
patch-options = -p1 patch-options = -p1
patches = patches =
${cpio-drop.gets.patch:location}/${cpio-drop.gets.patch:filename} ${cpio-drop.gets.patch:location}/${cpio-drop.gets.patch:filename}
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.bz2 url = http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.bz2
md5sum = 20fc912915c629e809f80b96b2e75d7d md5sum = 20fc912915c629e809f80b96b2e75d7d
...@@ -5,7 +5,7 @@ extends = ...@@ -5,7 +5,7 @@ extends =
parts = cuneiform parts = cuneiform
[cuneiform] [cuneiform]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://launchpad.net/cuneiform-linux/1.0/1.0/+download/cuneiform-linux-1.0.0.tar.bz2 url = http://launchpad.net/cuneiform-linux/1.0/1.0/+download/cuneiform-linux-1.0.0.tar.bz2
md5sum = 785232ffffad7d82446fbac08a1c3ef9 md5sum = 785232ffffad7d82446fbac08a1c3ef9
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
......
...@@ -11,8 +11,8 @@ parts = ...@@ -11,8 +11,8 @@ parts =
[curl] [curl]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
url = http://curl.haxx.se/download/curl-7.29.0.tar.bz2 url = http://curl.haxx.se/download/curl-7.30.0.tar.bz2
md5sum = fa5f37f38a8042020e292ce7ec5341ce md5sum = 0db5ec03a5001b42a2edc03bf63b5ceb
configure-options = configure-options =
--disable-static --disable-static
--disable-ldap --disable-ldap
......
...@@ -5,7 +5,7 @@ extends = ...@@ -5,7 +5,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
[cyrus-sasl] [cyrus-sasl]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
md5sum = a7f4e5e559a0e37b3ffc438c9456e425 md5sum = a7f4e5e559a0e37b3ffc438c9456e425
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
parts = dash parts = dash
[dash] [dash]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz
md5sum = f6cedb10ae7258adb5ab17a10ae80d51 md5sum = f6cedb10ae7258adb5ab17a10ae80d51
configure-options = configure-options =
......
...@@ -8,7 +8,7 @@ parts = ...@@ -8,7 +8,7 @@ parts =
dbus dbus
[dbus] [dbus]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz
md5sum = 402a2f8102bedbe236e2891b2b0f31c2 md5sum = 402a2f8102bedbe236e2891b2b0f31c2
configure-options = configure-options =
...@@ -20,7 +20,7 @@ environment = ...@@ -20,7 +20,7 @@ environment =
LDFLAGS=-L${libexpat:location}/lib LDFLAGS=-L${libexpat:location}/lib
[dbus-glib] [dbus-glib]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.94.tar.gz url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.94.tar.gz
md5sum = e1f1506a6f4941e67bffd614b1ad5af6 md5sum = e1f1506a6f4941e67bffd614b1ad5af6
environment = environment =
......
...@@ -9,7 +9,7 @@ filename = dcron-4.4.noroot.no.globals.patch ...@@ -9,7 +9,7 @@ filename = dcron-4.4.noroot.no.globals.patch
download-only = true download-only = true
[dcron] [dcron]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.jimpryor.net/linux/releases/dcron-4.4.tar.gz url = http://www.jimpryor.net/linux/releases/dcron-4.4.tar.gz
md5sum = 02d848ba043a9df5bf2102a9f4bc04bd md5sum = 02d848ba043a9df5bf2102a9f4bc04bd
configure-command = true configure-command = true
......
...@@ -40,7 +40,7 @@ filename = dropbear-0.53.1-static_build_fix.patch ...@@ -40,7 +40,7 @@ filename = dropbear-0.53.1-static_build_fix.patch
download-only = true download-only = true
[dropbear] [dropbear]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = 0284ea239083f04c8b874e08e1aca243 md5sum = 0284ea239083f04c8b874e08e1aca243
# XXX: We still use an old version of dropbear instead of the last one # XXX: We still use an old version of dropbear instead of the last one
# in order have all patches working. # in order have all patches working.
......
...@@ -8,7 +8,7 @@ extends = ...@@ -8,7 +8,7 @@ extends =
parts = erlang parts = erlang
[erlang] [erlang]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.erlang.org/download/otp_src_R14B04.tar.gz url = http://www.erlang.org/download/otp_src_R14B04.tar.gz
md5sum = 4b469729f103f52702bfb1fb24529dc0 md5sum = 4b469729f103f52702bfb1fb24529dc0
configure-options = configure-options =
......
...@@ -4,7 +4,7 @@ extends = ...@@ -4,7 +4,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
[fastjar] [fastjar]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.tar.gz/download url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.tar.gz/download
md5sum = 14d4bdfac236e347d806c6743dba48c6 md5sum = 14d4bdfac236e347d806c6743dba48c6
environment = environment =
......
...@@ -12,14 +12,14 @@ parts = ...@@ -12,14 +12,14 @@ parts =
<= ffmpeg-0.8 <= ffmpeg-0.8
[libogg] [libogg]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://downloads.xiph.org/releases/ogg/libogg-1.2.2.tar.gz url = http://downloads.xiph.org/releases/ogg/libogg-1.2.2.tar.gz
md5sum = 5a9fcabc9a1b7c6f1cd75ddc78f36c56 md5sum = 5a9fcabc9a1b7c6f1cd75ddc78f36c56
configure-options = configure-options =
--disable-static --disable-static
[libvorbis] [libvorbis]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2 url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2
md5sum = 798a4211221073c1409f26eac4567e8b md5sum = 798a4211221073c1409f26eac4567e8b
configure-options = configure-options =
...@@ -29,7 +29,7 @@ environment = ...@@ -29,7 +29,7 @@ environment =
PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig
[libtheora] [libtheora]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
md5sum = 292ab65cedd5021d6b7ddd117e07cd8e md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
configure-options = configure-options =
...@@ -39,11 +39,11 @@ environment = ...@@ -39,11 +39,11 @@ environment =
PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libvorbis:location}/lib/pkgconfig PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libvorbis:location}/lib/pkgconfig
[yasm] [yasm]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz
[libvpx] [libvpx]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2 url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2
md5sum = 383f3f07a76099682abb43f79b692b72 md5sum = 383f3f07a76099682abb43f79b692b72
configure-options = configure-options =
...@@ -52,7 +52,7 @@ environment = ...@@ -52,7 +52,7 @@ environment =
PATH=${yasm:location}/bin:%(PATH)s PATH=${yasm:location}/bin:%(PATH)s
[libx264] [libx264]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111005-2245-stable.tar.bz2 url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111005-2245-stable.tar.bz2
md5sum = f86260b2ea6d6cb5186937c9363891d7 md5sum = f86260b2ea6d6cb5186937c9363891d7
configure-options = configure-options =
...@@ -62,7 +62,7 @@ environment = ...@@ -62,7 +62,7 @@ environment =
PATH=${yasm:location}/bin:%(PATH)s PATH=${yasm:location}/bin:%(PATH)s
[lame] [lame]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://prdownloads.sourceforge.net/lame/lame-3.98.4.tar.gz url = http://prdownloads.sourceforge.net/lame/lame-3.98.4.tar.gz
md5sum = 8e9866ad6b570c6c95c8cba48060473f md5sum = 8e9866ad6b570c6c95c8cba48060473f
configure-options = configure-options =
...@@ -70,14 +70,14 @@ configure-options = ...@@ -70,14 +70,14 @@ configure-options =
--disable-gtktest --disable-gtktest
[opencore-amr] [opencore-amr]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://prdownloads.sourceforge.net/opencore-amr/opencore-amr/opencore-amr-0.1.2.tar.gz url = http://prdownloads.sourceforge.net/opencore-amr/opencore-amr/opencore-amr-0.1.2.tar.gz
md5sum = 8e8b8b253eb046340ff7b6bf7a6ccd3e md5sum = 8e8b8b253eb046340ff7b6bf7a6ccd3e
configure-options = configure-options =
--disable-static --disable-static
[ffmpeg-0.8] [ffmpeg-0.8]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2 url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2
md5sum = 726877b19ece7ea64def8b7e6727e182 md5sum = 726877b19ece7ea64def8b7e6727e182
configure-options = configure-options =
......
...@@ -7,7 +7,7 @@ extends = ...@@ -7,7 +7,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
[file] [file]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.astron.com/pub/file/file-5.11.tar.gz url = ftp://ftp.astron.com/pub/file/file-5.11.tar.gz
md5sum = 16a407bd66d6c7a832f3a5c0d609c27b md5sum = 16a407bd66d6c7a832f3a5c0d609c27b
configure-options = configure-options =
......
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
flare flare
[flare] [flare]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://labs.gree.jp/data/source/flare-1.0.9.tgz url = http://labs.gree.jp/data/source/flare-1.0.9.tgz
md5sum = e59ccce1ba29e7edf6f665561678d5c8 md5sum = e59ccce1ba29e7edf6f665561678d5c8
configure-options = configure-options =
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
flex flex
[flex] [flex]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz url = http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz
md5sum = 201d3f38758d95436cbc64903386de0b md5sum = 201d3f38758d95436cbc64903386de0b
environment = environment =
......
...@@ -12,7 +12,7 @@ parts = ...@@ -12,7 +12,7 @@ parts =
fontconfig fontconfig
[fontconfig] [fontconfig]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://fontconfig.org/release/fontconfig-2.10.2.tar.bz2 url = http://fontconfig.org/release/fontconfig-2.10.2.tar.bz2
md5sum = 2f239690057d1438aa282e051f721d08 md5sum = 2f239690057d1438aa282e051f721d08
# XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share? # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
......
...@@ -10,7 +10,7 @@ parts = ...@@ -10,7 +10,7 @@ parts =
freetype freetype
[freetype] [freetype]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.11.tar.bz2 url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.11.tar.bz2
md5sum = b93435488942486c8d0ca22e8f768034 md5sum = b93435488942486c8d0ca22e8f768034
configure-options = configure-options =
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
parts = garbage-collector parts = garbage-collector
[garbage-collector] [garbage-collector]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = 2ff9924c7249ef7f736ecfe6f08f3f9b md5sum = 2ff9924c7249ef7f736ecfe6f08f3f9b
url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz
configure-options = configure-options =
......
...@@ -10,7 +10,7 @@ parts = ...@@ -10,7 +10,7 @@ parts =
gcc gcc
[mpfr] [mpfr]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2 url = http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2
md5sum = bfbecb2eacb6d48432ead5cfc3f7390a md5sum = bfbecb2eacb6d48432ead5cfc3f7390a
configure-options = configure-options =
...@@ -20,7 +20,7 @@ environment = ...@@ -20,7 +20,7 @@ environment =
LDFLAGS=-Wl,-rpath=${gmp:location}/lib LDFLAGS=-Wl,-rpath=${gmp:location}/lib
[mpc] [mpc]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz url = http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz
md5sum = 0d6acab8d214bd7d1fbbc593e83dd00d md5sum = 0d6acab8d214bd7d1fbbc593e83dd00d
configure-options = configure-options =
...@@ -31,7 +31,7 @@ environment = ...@@ -31,7 +31,7 @@ environment =
LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib
[ppl] [ppl]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
# we should use version 0.10.x for gcc-4.5 # we should use version 0.10.x for gcc-4.5
url = http://www.cs.unipr.it/ppl/Download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2 url = http://www.cs.unipr.it/ppl/Download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
md5sum = 5667111f53150618b0fa522ffc53fc3e md5sum = 5667111f53150618b0fa522ffc53fc3e
...@@ -44,7 +44,7 @@ environment = ...@@ -44,7 +44,7 @@ environment =
LDFLAGS=-Wl,-rpath=${gmp:location}/lib LDFLAGS=-Wl,-rpath=${gmp:location}/lib
[cloog-ppl] [cloog-ppl]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz
md5sum = 806e001d1b1a6b130069ff6274900af5 md5sum = 806e001d1b1a6b130069ff6274900af5
configure-options = configure-options =
...@@ -78,7 +78,7 @@ download-only = true ...@@ -78,7 +78,7 @@ download-only = true
hack-revision = ${gcc-interconnection-workaround:hack-revision} hack-revision = ${gcc-interconnection-workaround:hack-revision}
depends = depends =
${gcc-download:location} ${gcc-download:location}
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
path = ${gcc-source:location} path = ${gcc-source:location}
md5sum = bb3265edf0fa7543e50cedb93e04e427 md5sum = bb3265edf0fa7543e50cedb93e04e427
patches = patches =
...@@ -86,7 +86,7 @@ patches = ...@@ -86,7 +86,7 @@ patches =
patch-options = -p2 patch-options = -p2
configure-command = make clean \\; make distclean \\; ./configure configure-command = make clean \\; make distclean \\; ./configure
# GMP does not correctly detect achitecture so it have to be given # GMP does not correctly detect achitecture so it have to be given
# as hexagonit.recipe.cmmi is using shell expansion in subproceses # as slapos.recipe.cmmi is using shell expansion in subproceses
# backticks are working # backticks are working
configure-options = configure-options =
--disable-bootstrap --disable-bootstrap
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
gdbm gdbm
[gdbm] [gdbm]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 1.10 version = 1.10
url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
md5sum = 88770493c2559dc80b561293e39d3570 md5sum = 88770493c2559dc80b561293e39d3570
......
...@@ -7,7 +7,7 @@ extends = ...@@ -7,7 +7,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
[gettext] [gettext]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.1.tar.gz url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.1.tar.gz
md5sum = 034c8103b14654ebd300fadac44d6f14 md5sum = 034c8103b14654ebd300fadac44d6f14
......
...@@ -8,7 +8,7 @@ extends = ...@@ -8,7 +8,7 @@ extends =
parts = ghostscript parts = ghostscript
[ghostscript-common] [ghostscript-common]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${libtiff:version} ${libtiff:version}
configure-options = configure-options =
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
giflib giflib
[giflib] [giflib]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download
md5sum = 711ad48551ee14db7c200b5f402df849 md5sum = 711ad48551ee14db7c200b5f402df849
configure-options = configure-options =
......
...@@ -11,7 +11,7 @@ parts = ...@@ -11,7 +11,7 @@ parts =
git git
[git] [git]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://git-core.googlecode.com/files/git-1.7.12.tar.gz url = http://git-core.googlecode.com/files/git-1.7.12.tar.gz
md5sum = ceb1a6b17a3e33bbc70eadf8fce5876c md5sum = ceb1a6b17a3e33bbc70eadf8fce5876c
configure-options = configure-options =
......
...@@ -4,7 +4,7 @@ extends = ...@@ -4,7 +4,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
[glib] [glib]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2 url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2
md5sum = 789e7520f71c6a4bf08bc683ec764d24 md5sum = 789e7520f71c6a4bf08bc683ec764d24
configure-options = configure-options =
......
...@@ -6,12 +6,12 @@ parts = ...@@ -6,12 +6,12 @@ parts =
gmp gmp
[gmp] [gmp]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
# we should use version 4.x for ppl-0.10 # we should use version 4.x for ppl-0.10
url = ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 url = ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2
md5sum = dd60683d7057917e34630b4a787932e8 md5sum = dd60683d7057917e34630b4a787932e8
# GMP does not correctly detect achitecture so it have to be given # GMP does not correctly detect achitecture so it have to be given
# as hexagonit.recipe.cmmi is using shell expansion in subproceses # as slapos.recipe.cmmi is using shell expansion in subproceses
# backticks are working # backticks are working
configure-options = configure-options =
--build=`uname -m`-linux --build=`uname -m`-linux
......
...@@ -7,12 +7,12 @@ extends = ...@@ -7,12 +7,12 @@ extends =
parts = gnutls parts = gnutls
[gpg-error] [gpg-error]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
md5sum = 7c2710ef439f82ac429b88fec88e9a4c md5sum = 7c2710ef439f82ac429b88fec88e9a4c
[gcrypt] [gcrypt]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.gz url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.gz
md5sum = 78f8f8bec4580f75b25816f7896d0389 md5sum = 78f8f8bec4580f75b25816f7896d0389
configure-options = configure-options =
...@@ -23,7 +23,7 @@ environment = ...@@ -23,7 +23,7 @@ environment =
[gnutls] [gnutls]
# XXX-Cedric : update to latest gnutls # XXX-Cedric : update to latest gnutls
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.gnutls.org/gcrypt/gnutls/v2.8/gnutls-2.8.6.tar.bz2 url = ftp://ftp.gnutls.org/gcrypt/gnutls/v2.8/gnutls-2.8.6.tar.bz2
md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
configure-options = configure-options =
......
...@@ -13,7 +13,7 @@ extends = ...@@ -13,7 +13,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
[graphviz] [graphviz]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz
md5sum = 8d26c1171f30ca3b1dc1b429f7937e58 md5sum = 8d26c1171f30ca3b1dc1b429f7937e58
configure-options = configure-options =
......
...@@ -6,7 +6,7 @@ parts = ...@@ -6,7 +6,7 @@ parts =
grep grep
[grep] [grep]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/grep/grep-2.14.tar.xz url = http://ftp.gnu.org/gnu/grep/grep-2.14.tar.xz
md5sum = d4a3f03849d1e17ce56ab76aa5a24cab md5sum = d4a3f03849d1e17ce56ab76aa5a24cab
environment = environment =
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
groff groff
[groff] [groff]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz
md5sum = 8b8cd29385b97616a0f0d96d0951c5bf md5sum = 8b8cd29385b97616a0f0d96d0951c5bf
configure-options = configure-options =
......
...@@ -10,7 +10,7 @@ extends = ...@@ -10,7 +10,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
[groonga] [groonga]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 3.0.2 version = 3.0.2
url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
md5sum = b17934ef2589a4e261ed0d99aec713eb md5sum = b17934ef2589a4e261ed0d99aec713eb
...@@ -26,7 +26,7 @@ environment = ...@@ -26,7 +26,7 @@ environment =
LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
[groonga-normalizer-mysql] [groonga-normalizer-mysql]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 1.0.2 version = 1.0.2
url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
md5sum = 782111599dcba5023beb698dc5ea514a md5sum = 782111599dcba5023beb698dc5ea514a
......
...@@ -15,7 +15,7 @@ parts = ...@@ -15,7 +15,7 @@ parts =
gtk-2 gtk-2
[cairo] [cairo]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://cairographics.org/releases/cairo-1.10.2.tar.gz url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
md5sum = f101a9e88b783337b20b2e26dfd26d5f md5sum = f101a9e88b783337b20b2e26dfd26d5f
configure-options = configure-options =
...@@ -29,7 +29,7 @@ environment = ...@@ -29,7 +29,7 @@ environment =
LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
[pango] [pango]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.3.tar.bz2 url = http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.3.tar.bz2
md5sum = be4e3891353fae6b62a6f8d7689c4266 md5sum = be4e3891353fae6b62a6f8d7689c4266
configure-options = configure-options =
...@@ -43,7 +43,7 @@ environment = ...@@ -43,7 +43,7 @@ environment =
LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
[gdk-pixbuf] [gdk-pixbuf]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.0.tar.bz2 url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.0.tar.bz2
md5sum = d8ece3a4ade4a91c768328620e473ab8 md5sum = d8ece3a4ade4a91c768328620e473ab8
configure-options = configure-options =
...@@ -57,7 +57,7 @@ environment = ...@@ -57,7 +57,7 @@ environment =
LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
[atk] [atk]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2 url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2
md5sum = 87f20b78deaedef858ac54358c0786b1 md5sum = 87f20b78deaedef858ac54358c0786b1
environment = environment =
...@@ -67,7 +67,7 @@ environment = ...@@ -67,7 +67,7 @@ environment =
LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
[gtk-2] [gtk-2]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.6.tar.bz2 url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.6.tar.bz2
md5sum = 421100f6597e613234f8dead6091a9fe md5sum = 421100f6597e613234f8dead6091a9fe
configure-options = configure-options =
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
gzip gzip
[gzip] [gzip]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.5.tar.xz url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.5.tar.xz
md5sum = 2a431e169b6f62f7332ef6d47cc53bae md5sum = 2a431e169b6f62f7332ef6d47cc53bae
environment = environment =
......
...@@ -8,7 +8,7 @@ extends = ...@@ -8,7 +8,7 @@ extends =
parts = haproxy parts = haproxy
[haproxy] [haproxy]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.23.tar.gz url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.23.tar.gz
md5sum = 6535d5e58037ada4b58b439cebe03c79 md5sum = 6535d5e58037ada4b58b439cebe03c79
configure-command = true configure-command = true
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
parts = icu4c parts = icu4c
[icu4c] [icu4c]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
md5sum = ea93970a0275be6b42f56953cd332c17 md5sum = ea93970a0275be6b42f56953cd332c17
......
...@@ -30,7 +30,7 @@ download-only = true ...@@ -30,7 +30,7 @@ download-only = true
filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
[imagemagick] [imagemagick]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.2-6.tar.xz url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.2-6.tar.xz
md5sum = ee01558201041a9978dd14b1db946ce8 md5sum = ee01558201041a9978dd14b1db946ce8
depends = depends =
......
...@@ -8,7 +8,7 @@ parts = ...@@ -8,7 +8,7 @@ parts =
intltool intltool
[intltool] [intltool]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz
md5sum = d6c91bf06681919ccfdf3624035b75dc md5sum = d6c91bf06681919ccfdf3624035b75dc
depends = depends =
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
jasper jasper
[jasper] [jasper]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip url = http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip
md5sum = a342b2b4495b3e1394e161eb5d85d754 md5sum = a342b2b4495b3e1394e161eb5d85d754
# jasper configure script is not executable by default # jasper configure script is not executable by default
......
...@@ -19,7 +19,7 @@ filename = jbigkit-2.0-build.patch ...@@ -19,7 +19,7 @@ filename = jbigkit-2.0-build.patch
md5sum = e974958e9331735c07478e9c2dde8795 md5sum = e974958e9331735c07478e9c2dde8795
[jbigkit] [jbigkit]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz url = http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz
md5sum = 3dd87f605abb1a97a22dc79d8b3e8f6c md5sum = 3dd87f605abb1a97a22dc79d8b3e8f6c
patch-options = patch-options =
......
...@@ -10,7 +10,7 @@ extends = ...@@ -10,7 +10,7 @@ extends =
../giflib/buildout.cfg ../giflib/buildout.cfg
[leptonica] [leptonica]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403 md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
configure-command = configure-command =
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
libaio libaio
[libaio] [libaio]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
# originally located at http://www.kernel.org/pub/linux/libs/aio/ # originally located at http://www.kernel.org/pub/linux/libs/aio/
url = http://ftp.free.fr/mirrors/ftp.debian.org/pool/main/liba/libaio/libaio_0.3.109.orig.tar.gz url = http://ftp.free.fr/mirrors/ftp.debian.org/pool/main/liba/libaio/libaio_0.3.109.orig.tar.gz
md5sum = 435a5b16ca6198eaf01155263d855756 md5sum = 435a5b16ca6198eaf01155263d855756
......
...@@ -9,7 +9,7 @@ download-only=true ...@@ -9,7 +9,7 @@ download-only=true
filename = libdb-hooks.py filename = libdb-hooks.py
[libdb] [libdb]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz url = http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz
md5sum = b0f1c777708cb8e9d37fb47e7ed3312d md5sum = b0f1c777708cb8e9d37fb47e7ed3312d
pre-configure-hook = ${libdb-hooks-download:location}/${libdb-hooks-download:filename}:pre_configure_hook pre-configure-hook = ${libdb-hooks-download:location}/${libdb-hooks-download:filename}:pre_configure_hook
......
...@@ -12,14 +12,14 @@ parts = ...@@ -12,14 +12,14 @@ parts =
dmtx-utils dmtx-utils
[libdmtx] [libdmtx]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://prdownloads.sourceforge.net/libdmtx/libdmtx-0.7.4.tar.bz2 url = http://prdownloads.sourceforge.net/libdmtx/libdmtx-0.7.4.tar.bz2
md5sum = d3a4c0becd92895eb606dbdb78b023e2 md5sum = d3a4c0becd92895eb606dbdb78b023e2
configure-options = configure-options =
--disable-static --disable-static
[dmtx-utils] [dmtx-utils]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2 url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
md5sum = b132ab9fb1d289869469b8bb4959a08a md5sum = b132ab9fb1d289869469b8bb4959a08a
configure-options = configure-options =
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
parts = libevent parts = libevent
[libevent] [libevent]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz url = http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz
md5sum = 0b3ea18c634072d12b3c1ee734263664 md5sum = 0b3ea18c634072d12b3c1ee734263664
configure-options = configure-options =
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
libexpat libexpat
[libexpat] [libexpat]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
md5sum = dd7dab7a5fea97d2a6a43f511449b7cd md5sum = dd7dab7a5fea97d2a6a43f511449b7cd
configure-options = configure-options =
......
...@@ -3,6 +3,6 @@ parts = ...@@ -3,6 +3,6 @@ parts =
libiconv libiconv
[libiconv] [libiconv]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
md5sum = e34509b1623cec449dfeb73d7ce9c6c6 md5sum = e34509b1623cec449dfeb73d7ce9c6c6
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
libjpeg libjpeg
[libjpeg] [libjpeg]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz
md5sum = 52654eb3b2e60c35731ea8fc87f1bd29 md5sum = 52654eb3b2e60c35731ea8fc87f1bd29
configure-options = configure-options =
......
...@@ -17,7 +17,7 @@ url = http://launchpad.net/libmemcached/1.0/0.44/+download/libmemcached-0.44.tar ...@@ -17,7 +17,7 @@ url = http://launchpad.net/libmemcached/1.0/0.44/+download/libmemcached-0.44.tar
md5sum = e6bd825c46fa080b550f90f9001cba8c md5sum = e6bd825c46fa080b550f90f9001cba8c
[libmemcached-common] [libmemcached-common]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
configure-options = configure-options =
--without-docs --without-docs
--without-memcached --without-memcached
......
...@@ -8,7 +8,7 @@ parts = ...@@ -8,7 +8,7 @@ parts =
libpng libpng
[libpng-common] [libpng-common]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
configure-options = configure-options =
--disable-static --disable-static
environment = environment =
......
...@@ -10,7 +10,7 @@ extends = ...@@ -10,7 +10,7 @@ extends =
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
[libcroco] [libcroco]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz
md5sum = 767e73c4174f75b99695d4530fd9bb80 md5sum = 767e73c4174f75b99695d4530fd9bb80
environment = environment =
...@@ -19,7 +19,7 @@ environment = ...@@ -19,7 +19,7 @@ environment =
LDFLAGS=-Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${zlib:location}/lib
[librsvg] [librsvg]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 2.36.1 version = 2.36.1
url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.4.tar.xz url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.4.tar.xz
md5sum = 3c94524c8ccf668e30b236f409239f54 md5sum = 3c94524c8ccf668e30b236f409239f54
......
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
librsync librsync
[librsync] [librsync]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://downloads.sourceforge.net/sourceforge/librsync/librsync-0.9.7.tar.gz url = http://downloads.sourceforge.net/sourceforge/librsync/librsync-0.9.7.tar.gz
md5sum = 24cdb6b78f45e0e83766903fd4f6bc84 md5sum = 24cdb6b78f45e0e83766903fd4f6bc84
configure-options = configure-options =
......
...@@ -8,7 +8,7 @@ parts = ...@@ -8,7 +8,7 @@ parts =
libtiff libtiff
[libtiff] [libtiff]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 4.0.3 version = 4.0.3
url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
md5sum = 051c1068e6a0627f461948c365290410 md5sum = 051c1068e6a0627f461948c365290410
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
parts = libtool parts = libtool
[libtool] [libtool]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = d2f3b7d4627e69e13514a40e72a24d50 md5sum = d2f3b7d4627e69e13514a40e72a24d50
url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
configure-options = configure-options =
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
libuuid libuuid
[libuuid] [libuuid]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2 url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
md5sum = 2f5f71e6af969d041d73ab778c141a77 md5sum = 2f5f71e6af969d041d73ab778c141a77
configure-options = configure-options =
......
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
libxml2 libxml2
[libxml2] [libxml2]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.0.tar.gz url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.0.tar.gz
md5sum = 5b9bebf4f5d2200ae2c4efe8fa6103f7 md5sum = 5b9bebf4f5d2200ae2c4efe8fa6103f7
configure-options = configure-options =
......
...@@ -10,7 +10,7 @@ parts = ...@@ -10,7 +10,7 @@ parts =
[libxslt] [libxslt]
url = ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz url = ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
md5sum = 9667bf6f9310b957254fdcf6596600b7 md5sum = 9667bf6f9310b957254fdcf6596600b7
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
configure-options = configure-options =
--disable-static --disable-static
--with-libxml-prefix=${libxml2:location} --with-libxml-prefix=${libxml2:location}
......
...@@ -4,6 +4,6 @@ parts = ...@@ -4,6 +4,6 @@ parts =
libyaml libyaml
[libyaml] [libyaml]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
md5sum = 36c852831d02cf90508c29852361d01b md5sum = 36c852831d02cf90508c29852361d01b
...@@ -11,7 +11,7 @@ md5sum = 6beac248c978b767d4bccc1b7eebe6bd ...@@ -11,7 +11,7 @@ md5sum = 6beac248c978b767d4bccc1b7eebe6bd
filename = ${:_buildout_section_name_} filename = ${:_buildout_section_name_}
[logrotate] [logrotate]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.9.tar.gz url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.9.tar.gz
md5sum = eeba9dbca62a9210236f4b83195e4ea5 md5sum = eeba9dbca62a9210236f4b83195e4ea5
patch-options = -p1 patch-options = -p1
......
...@@ -32,7 +32,7 @@ download-only = true ...@@ -32,7 +32,7 @@ download-only = true
md5sum = 8d3706a9bd60b6ebfea33998644b1a99 md5sum = 8d3706a9bd60b6ebfea33998644b1a99
[lxc-0.8] [lxc-0.8]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://lxc.sourceforge.net/download/lxc/lxc-0.8.0-rc2.tar.gz url = http://lxc.sourceforge.net/download/lxc/lxc-0.8.0-rc2.tar.gz
md5sum = 9bd6988542fd7dd198d056ef3a2db9f6 md5sum = 9bd6988542fd7dd198d056ef3a2db9f6
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
parts = lynx parts = lynx
[lynx] [lynx]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = 124253e635f7c76bdffc47b9d036c812 md5sum = 124253e635f7c76bdffc47b9d036c812
url = http://lynx.isc.org/lynx2.8.7/lynx2.8.7.tar.gz url = http://lynx.isc.org/lynx2.8.7/lynx2.8.7.tar.gz
...@@ -15,6 +15,6 @@ patch-options = -p1 ...@@ -15,6 +15,6 @@ patch-options = -p1
patches = patches =
${m4-drop.gets.patch:location}/${m4-drop.gets.patch:filename} ${m4-drop.gets.patch:location}/${m4-drop.gets.patch:filename}
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2 url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
md5sum = 8a7cef47fecab6272eb86a6be6363b2f md5sum = 8a7cef47fecab6272eb86a6be6363b2f
...@@ -24,7 +24,7 @@ filename = mariadb_5.5_create_system_tables__no_test.patch ...@@ -24,7 +24,7 @@ filename = mariadb_5.5_create_system_tables__no_test.patch
download-only = true download-only = true
[mariadb] [mariadb]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 5.5.30 version = 5.5.30
revision = 1 revision = 1
url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
...@@ -61,7 +61,7 @@ environment = ...@@ -61,7 +61,7 @@ environment =
[mroonga-mariadb] [mroonga-mariadb]
# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users. # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
# http://mroonga.github.com/ # http://mroonga.github.com/
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/mroonga/mroonga-3.02.tar.gz url = http://packages.groonga.org/source/mroonga/mroonga-3.02.tar.gz
md5sum = b2d1a4abc12030fdbd9064bbb6175366 md5sum = b2d1a4abc12030fdbd9064bbb6175366
configure-options = configure-options =
......
...@@ -34,7 +34,7 @@ recipe = hexagonit.recipe.download ...@@ -34,7 +34,7 @@ recipe = hexagonit.recipe.download
strip-top-level-dir = true strip-top-level-dir = true
[membase-component-common] [membase-component-common]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
path = ${membase-source:location}/${:component} path = ${membase-source:location}/${:component}
prefix = ${membase:location} prefix = ${membase:location}
configure-options = configure-options =
......
...@@ -20,7 +20,7 @@ download-only = true ...@@ -20,7 +20,7 @@ download-only = true
md5sum = fd98d0cbfc4d3a25ac9808472fbe62f8 md5sum = fd98d0cbfc4d3a25ac9808472fbe62f8
[memcached] [memcached]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz url = http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
md5sum = b7104e269511621c2777367d6d6315fe md5sum = b7104e269511621c2777367d6d6315fe
patches = patches =
......
...@@ -10,7 +10,7 @@ parts = ...@@ -10,7 +10,7 @@ parts =
memstrike memstrike
[memstrike] [memstrike]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
path = ${memstrikesource:location} path = ${memstrikesource:location}
configure-command = configure-command =
./bootstrap ./bootstrap
......
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
[libdrm] [libdrm]
#does not seem to compile with -jX #does not seem to compile with -jX
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://dri.freedesktop.org/libdrm/libdrm-2.4.26.tar.bz2 url = http://dri.freedesktop.org/libdrm/libdrm-2.4.26.tar.bz2
md5sum = 062569426773f69b11a47a7712bba770 md5sum = 062569426773f69b11a47a7712bba770
configure-options = configure-options =
...@@ -18,7 +18,7 @@ environment = ...@@ -18,7 +18,7 @@ environment =
[mesa] [mesa]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.freedesktop.org//pub/mesa/7.11/MesaLib-7.11.tar.bz2 url = ftp://ftp.freedesktop.org//pub/mesa/7.11/MesaLib-7.11.tar.bz2
md5sum = ff03aca82d0560009a076a87c888cf13 md5sum = ff03aca82d0560009a076a87c888cf13
configure-options = configure-options =
......
...@@ -59,10 +59,10 @@ script = ...@@ -59,10 +59,10 @@ script =
call(['make'], cwd=workdir, env=env) call(['make'], cwd=workdir, env=env)
call(['make', 'install'], cwd=workdir, env=env) call(['make', 'install'], cwd=workdir, env=env)
# XXX-Antoine: here's what I did using hexagonit.recipe.cmmi. # XXX-Antoine: here's what I did using slapos.recipe.cmmi.
# and it wasn't working ! # and it wasn't working !
#[mydumper] #[mydumper]
#recipe = hexagonit.recipe.cmmi #recipe = slapos.recipe.cmmi
#url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz #url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
#md5sum = 36e6a1c97a9634a6882ddaac5e2697d5 #md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
#strip-top-level-dir = true #strip-top-level-dir = true
......
...@@ -29,7 +29,7 @@ filename = mysql_create_system_tables__no_test.patch ...@@ -29,7 +29,7 @@ filename = mysql_create_system_tables__no_test.patch
download-only = true download-only = true
[mysql-5.1] [mysql-5.1]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 5.1.58 version = 5.1.58
url = http://mysql.he.net/Downloads/MySQL-5.1/mysql-${:version}.tar.gz url = http://mysql.he.net/Downloads/MySQL-5.1/mysql-${:version}.tar.gz
md5sum = ae5aef506088e521e4b1cc4f668e96d2 md5sum = ae5aef506088e521e4b1cc4f668e96d2
...@@ -74,7 +74,7 @@ environment = ...@@ -74,7 +74,7 @@ environment =
LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
[groonga-storage-engine-mysql-5.1] [groonga-storage-engine-mysql-5.1]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
md5sum = 289b8b7919e790599ea79b6fe9270e04 md5sum = 289b8b7919e790599ea79b6fe9270e04
configure-options = configure-options =
......
...@@ -32,7 +32,7 @@ filename = mysql_create_system_tables__no_test.patch ...@@ -32,7 +32,7 @@ filename = mysql_create_system_tables__no_test.patch
download-only = true download-only = true
[mysql-5.5] [mysql-5.5]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 5.5.16 version = 5.5.16
url = http://mysql.he.net/Downloads/MySQL-5.5/mysql-${:version}.tar.gz url = http://mysql.he.net/Downloads/MySQL-5.5/mysql-${:version}.tar.gz
md5sum = 462ab3752dd666ec06ca32f92673b59e md5sum = 462ab3752dd666ec06ca32f92673b59e
...@@ -63,7 +63,7 @@ environment = ...@@ -63,7 +63,7 @@ environment =
LDFLAGS=-L${libaio:location}/lib LDFLAGS=-L${libaio:location}/lib
[groonga-storage-engine-mysql-5.5] [groonga-storage-engine-mysql-5.5]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
md5sum = 289b8b7919e790599ea79b6fe9270e04 md5sum = 289b8b7919e790599ea79b6fe9270e04
configure-options = configure-options =
......
...@@ -18,7 +18,7 @@ parts = ...@@ -18,7 +18,7 @@ parts =
mysql-tritonn-5.0 mysql-tritonn-5.0
[senna] [senna]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.nexedi.org/static/tarballs/senna/senna-r1311.tar.gz url = http://www.nexedi.org/static/tarballs/senna/senna-r1311.tar.gz
md5sum = 1cc51554789f81a9e5208da04a5c2f4c md5sum = 1cc51554789f81a9e5208da04a5c2f4c
configure-command = configure-command =
...@@ -50,7 +50,7 @@ filename = mysql-5.0.87-sphinx-1.10.diff ...@@ -50,7 +50,7 @@ filename = mysql-5.0.87-sphinx-1.10.diff
download-only = true download-only = true
[mysql-tritonn-5.0] [mysql-tritonn-5.0]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.nexedi.org/static/tarballs/mysql/mysql-5.0.87.tar.gz url = http://www.nexedi.org/static/tarballs/mysql/mysql-5.0.87.tar.gz
md5sum = 65e6229cc98b6a8d4c5206d7fe16c7be md5sum = 65e6229cc98b6a8d4c5206d7fe16c7be
# configure: how to avoid searching for my.cnf? # configure: how to avoid searching for my.cnf?
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
ncurses ncurses
[ncurses] [ncurses]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz url = ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz
md5sum = 8cb9c412e5f2d96bc6f459aa8c6282a1 md5sum = 8cb9c412e5f2d96bc6f459aa8c6282a1
configure-options = configure-options =
......
...@@ -8,7 +8,7 @@ extends = ...@@ -8,7 +8,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
[neon] [neon]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.webdav.org/neon/neon-0.29.5.tar.gz url = http://www.webdav.org/neon/neon-0.29.5.tar.gz
md5sum = ff369e69ef0f0143beb5626164e87ae2 md5sum = ff369e69ef0f0143beb5626164e87ae2
configure-options = configure-options =
......
...@@ -5,7 +5,7 @@ extends = ...@@ -5,7 +5,7 @@ extends =
../openssl/buildout.cfg ../openssl/buildout.cfg
[nginx] [nginx]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://nginx.org/download/nginx-1.2.7.tar.gz url = http://nginx.org/download/nginx-1.2.7.tar.gz
md5sum = d252f5c689a14a668e241c744ccf5f06 md5sum = d252f5c689a14a668e241c744ccf5f06
configure-options= configure-options=
......
...@@ -6,5 +6,5 @@ parts = ...@@ -6,5 +6,5 @@ parts =
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
# Post-0.4 release from January 2013 # Post-0.4 release from January 2013
url = http://github.com/kanaka/noVNC/zipball/3b2acc2258d36137a37edfbe0f03a3099189c49d url = http://github.com/kanaka/noVNC/zipball/3b2acc2258d36137a37edfbe0f03a3099189c49d
md5sum = 0d06abc20e59643e14fefe52b42daf60 md5sum = a276be8fa193652bb5de8a271603f11f
strip-top-level-dir = true strip-top-level-dir = true
...@@ -13,7 +13,7 @@ parts = ...@@ -13,7 +13,7 @@ parts =
[nodejs-0.8] [nodejs-0.8]
# Server-side Javascript. # Server-side Javascript.
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://nodejs.org/dist/v0.8.14/node-v0.8.14.tar.gz url = http://nodejs.org/dist/v0.8.14/node-v0.8.14.tar.gz
md5sum = 284fd2c7578064c339d9cf6a3a475ac7 md5sum = 284fd2c7578064c339d9cf6a3a475ac7
configure-options = configure-options =
...@@ -28,7 +28,7 @@ environment = ...@@ -28,7 +28,7 @@ environment =
[nodejs-0.6] [nodejs-0.6]
# Server-side Javascript. # Server-side Javascript.
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz
md5sum = 0da985a0bf820400af92363b9f453fe4 md5sum = 0da985a0bf820400af92363b9f453fe4
configure-options = configure-options =
...@@ -42,7 +42,7 @@ environment = ...@@ -42,7 +42,7 @@ environment =
LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
[nodejs-0.4] [nodejs-0.4]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://nodejs.org/dist/node-v0.4.12.tar.gz url = http://nodejs.org/dist/node-v0.4.12.tar.gz
md5sum = a6375eaa43db5356bf443e25b828ae16 md5sum = a6375eaa43db5356bf443e25b828ae16
configure-options = configure-options =
......
...@@ -9,7 +9,7 @@ md5sum = 7c00beff0475314f59214842509e407f ...@@ -9,7 +9,7 @@ md5sum = 7c00beff0475314f59214842509e407f
download-only = true download-only = true
[nspr] [nspr]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.7/src/nspr-4.8.7.tar.gz url = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.7/src/nspr-4.8.7.tar.gz
md5sum = 97e30989a56ab813453b71261849c200 md5sum = 97e30989a56ab813453b71261849c200
patches = ${nspr-pkgconfig-patch-download:location}/${nspr-pkgconfig-patch-download:filename} patches = ${nspr-pkgconfig-patch-download:location}/${nspr-pkgconfig-patch-download:filename}
......
...@@ -58,7 +58,7 @@ command = ...@@ -58,7 +58,7 @@ command =
rm -rf ${:compile-location} rm -rf ${:compile-location}
[nss-cmmi] [nss-cmmi]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
path = ${nss-download:location}/mozilla/security/nss path = ${nss-download:location}/mozilla/security/nss
configure-command = echo "No need to configure" configure-command = echo "No need to configure"
make-binary = gmake make-binary = gmake
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
parts = nullmailer parts = nullmailer
[nullmailer] [nullmailer]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://untroubled.org/nullmailer/nullmailer-1.05.tar.gz url = http://untroubled.org/nullmailer/nullmailer-1.05.tar.gz
md5sum = 35124cc05f893efba1310e2ec7c876ff md5sum = 35124cc05f893efba1310e2ec7c876ff
...@@ -9,7 +9,7 @@ url = ${:_profile_base_location_}/${:filename} ...@@ -9,7 +9,7 @@ url = ${:_profile_base_location_}/${:filename}
md5sum = 08710ec022f3ce13e5c0b584dfee2c1c md5sum = 08710ec022f3ce13e5c0b584dfee2c1c
[ocropus] [ocropus]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.nexedi.org/static/packages/source/ocropus/ocropus-0.4.4.tar.gz url = http://www.nexedi.org/static/packages/source/ocropus/ocropus-0.4.4.tar.gz
md5sum = 1485dbe9aab27574bfe3c8b4395cf3ce md5sum = 1485dbe9aab27574bfe3c8b4395cf3ce
configure-options = configure-options =
...@@ -37,7 +37,7 @@ url = ${:_profile_base_location_}/${:filename} ...@@ -37,7 +37,7 @@ url = ${:_profile_base_location_}/${:filename}
md5sum = dbbdf909814fb84ffe47e2ff59980db7 md5sum = dbbdf909814fb84ffe47e2ff59980db7
[iulib] [iulib]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.nexedi.org/static/packages/source/ocropus/iulib-0.4.4.tar.gz url = http://www.nexedi.org/static/packages/source/ocropus/iulib-0.4.4.tar.gz
md5sum = 3d9754dbd64c56029ce1cd7c2f61894c md5sum = 3d9754dbd64c56029ce1cd7c2f61894c
# workaround http://code.google.com/p/iulib/issues/detail?id=27 # workaround http://code.google.com/p/iulib/issues/detail?id=27
......
...@@ -7,7 +7,7 @@ extends = ...@@ -7,7 +7,7 @@ extends =
../cyrus-sasl/buildout.cfg ../cyrus-sasl/buildout.cfg
[openldap] [openldap]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.33.tgz url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.33.tgz
md5sum = 5adae44897647c15ce5abbff313bc85a md5sum = 5adae44897647c15ce5abbff313bc85a
configure-options = configure-options =
......
[buildout] [buildout]
[opensp] [opensp]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://prdownloads.sourceforge.net/openjade/OpenSP-1.5.2.tar.gz url = http://prdownloads.sourceforge.net/openjade/OpenSP-1.5.2.tar.gz
md5sum = 670b223c5d12cee40c9137be86b6c39b md5sum = 670b223c5d12cee40c9137be86b6c39b
configure-options = configure-options =
......
...@@ -12,7 +12,7 @@ parts = ...@@ -12,7 +12,7 @@ parts =
openssh openssh
[openssh] [openssh]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = 0541579adf9d55abb15ef927048d372e md5sum = 0541579adf9d55abb15ef927048d372e
url = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz url = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz
......
...@@ -28,7 +28,7 @@ filename = ${:_buildout_section_name_} ...@@ -28,7 +28,7 @@ filename = ${:_buildout_section_name_}
download-only = true download-only = true
[openssl] [openssl]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://www.openssl.org/source/openssl-1.0.1e.tar.gz url = https://www.openssl.org/source/openssl-1.0.1e.tar.gz
md5sum = 66bf6f10f060d561929de96f9dfe5b8c md5sum = 66bf6f10f060d561929de96f9dfe5b8c
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
patch patch
[patch] [patch]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.1.tar.xz url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.1.tar.xz
md5sum = e9ae5393426d3ad783a300a338c09b72 md5sum = e9ae5393426d3ad783a300a338c09b72
environment = environment =
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
pcre pcre
[pcre] [pcre]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.32.tar.bz2 url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.32.tar.bz2
md5sum = 62f02a76bb57a40bc66681760ed511d5 md5sum = 62f02a76bb57a40bc66681760ed511d5
configure-options = configure-options =
......
...@@ -24,7 +24,7 @@ md5sum = d2a067b98953ad30ba1230f87dfb8b92 ...@@ -24,7 +24,7 @@ md5sum = d2a067b98953ad30ba1230f87dfb8b92
download-only = true download-only = true
[pdftk] [pdftk]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-1.44-src.zip url = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-1.44-src.zip
md5sum = 9eb50fffcd621a627d387750c60982b4 md5sum = 9eb50fffcd621a627d387750c60982b4
configure-command = true configure-command = true
......
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
percona-toolkit percona-toolkit
[percona-toolkit] [percona-toolkit]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
version = 2.1.9 version = 2.1.9
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-Class-Accessor perl-Class-Accessor
[perl-Class-Accessor] [perl-Class-Accessor]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
url = http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz url = http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-Config-General perl-Config-General
[perl-Config-General] [perl-Config-General]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
url = http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/Config-General-2.50.tar.gz url = http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/Config-General-2.50.tar.gz
......
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
perl-DBD-MySQL perl-DBD-MySQL
[perl-DBD-MySQL] [perl-DBD-MySQL]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 4.019 version = 4.019
depends = depends =
${perl:version} ${perl:version}
......
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
perl-DBD-mariadb perl-DBD-mariadb
[perl-DBD-mariadb] [perl-DBD-mariadb]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 4.019 version = 4.019
# binary library should be rebuilt when perl is updated. # binary library should be rebuilt when perl is updated.
depends = depends =
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-DBI perl-DBI
[perl-DBI] [perl-DBI]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
version = 1.616 version = 1.616
# binary library should be rebuilt when perl is updated. # binary library should be rebuilt when perl is updated.
depends = depends =
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-Encode-HanExtra perl-Encode-HanExtra
[perl-Encode-HanExtra] [perl-Encode-HanExtra]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
# binary library should be rebuilt when perl is updated. # binary library should be rebuilt when perl is updated.
depends = depends =
${perl:version} ${perl:version}
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-HTML-Encoding perl-HTML-Encoding
[perl-HTML-Encoding] [perl-HTML-Encoding]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/HTML-Encoding-0.61.tar.gz url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/HTML-Encoding-0.61.tar.gz
......
...@@ -6,7 +6,7 @@ parts = ...@@ -6,7 +6,7 @@ parts =
perl-HTML-Parser perl-HTML-Parser
[perl-HTML-Parser] [perl-HTML-Parser]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
# binary library should be rebuilt when perl is updated. # binary library should be rebuilt when perl is updated.
depends = depends =
${perl:version} ${perl:version}
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-HTML-Tagset perl-HTML-Tagset
[perl-HTML-Tagset] [perl-HTML-Tagset]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
url = http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz url = http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-HTML-Template perl-HTML-Template
[perl-HTML-Template] [perl-HTML-Template]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
url = http://search.cpan.org/CPAN/authors/id/S/SA/SAMTREGAR/HTML-Template-2.9.tar.gz url = http://search.cpan.org/CPAN/authors/id/S/SA/SAMTREGAR/HTML-Template-2.9.tar.gz
......
...@@ -12,7 +12,7 @@ download-only = true ...@@ -12,7 +12,7 @@ download-only = true
filename = ${:_buildout_section_name_} filename = ${:_buildout_section_name_}
[perl-Image-Magick] [perl-Image-Magick]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
${imagemagick:location} ${imagemagick:location}
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-JSON perl-JSON
[perl-JSON] [perl-JSON]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
url = http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-2.50.tar.gz url = http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-2.50.tar.gz
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-Net-IP perl-Net-IP
[perl-Net-IP] [perl-Net-IP]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
url = http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz url = http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz
......
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
perl-SGML-Parser-OpenSP perl-SGML-Parser-OpenSP
[perl-SGML-Parser-OpenSP] [perl-SGML-Parser-OpenSP]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
# binary library should be rebuilt when perl is updated. # binary library should be rebuilt when perl is updated.
depends = depends =
${perl:version} ${perl:version}
...@@ -16,7 +16,8 @@ depends = ...@@ -16,7 +16,8 @@ depends =
url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/SGML-Parser-OpenSP-0.994.tar.gz url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/SGML-Parser-OpenSP-0.994.tar.gz
md5sum = b1ee0244e9daa4d37f28cf32c4753691 md5sum = b1ee0244e9daa4d37f28cf32c4753691
configure-command = configure-command =
${perl:location}/bin/perl Makefile.PL ${perl:location}/bin/perl Makefile.PL \
INC=-I${opensp:location}/include \
LIBS="-lstdc++ -L${opensp:location}/lib -losp"
make-options = make-options =
INC=-I${opensp:location}/include OTHERLDFLAGS="-Wl,-rpath=${opensp:location}/lib"
OTHERLDFLAGS="-L${opensp:location}/lib -Wl,-rpath=${opensp:location}/lib"
...@@ -13,7 +13,7 @@ download-only = true ...@@ -13,7 +13,7 @@ download-only = true
filename = ${:_buildout_section_name_} filename = ${:_buildout_section_name_}
[perl-Term-ReadLine-Gnu] [perl-Term-ReadLine-Gnu]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
url = http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz url = http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-URI perl-URI
[perl-URI] [perl-URI]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.58.tar.gz url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.58.tar.gz
......
...@@ -9,7 +9,7 @@ parts = ...@@ -9,7 +9,7 @@ parts =
perl-XML-LibXML perl-XML-LibXML
[perl-XML-LibXML] [perl-XML-LibXML]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
# binary library should be rebuilt when perl is updated. # binary library should be rebuilt when perl is updated.
depends = depends =
${perl:version} ${perl:version}
......
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
perl-XML-NamespaceSupport perl-XML-NamespaceSupport
[perl-XML-NamespaceSupport] [perl-XML-NamespaceSupport]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
url = http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.11.tar.gz url = http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.11.tar.gz
......
...@@ -9,7 +9,7 @@ parts = ...@@ -9,7 +9,7 @@ parts =
perl-XML-Parser perl-XML-Parser
[perl-XML-Parser] [perl-XML-Parser]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
${perl-libwww-perl:location} ${perl-libwww-perl:location}
......
...@@ -6,7 +6,7 @@ parts = ...@@ -6,7 +6,7 @@ parts =
perl-XML-SAX perl-XML-SAX
[perl-XML-SAX] [perl-XML-SAX]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
${perl-XML-NamespaceSupport:location} ${perl-XML-NamespaceSupport:location}
......
...@@ -6,7 +6,7 @@ parts = ...@@ -6,7 +6,7 @@ parts =
perl-libwww-perl perl-libwww-perl
[perl-libwww-perl] [perl-libwww-perl]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${perl:version}
${perl-HTML-Parser:location} ${perl-HTML-Parser:location}
......
...@@ -20,12 +20,12 @@ download-only = true ...@@ -20,12 +20,12 @@ download-only = true
filename = create-libs-symlink.py filename = create-libs-symlink.py
[perl] [perl]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${gdbm:version} ${gdbm:version}
version = 5.16.3 version = 5.16.3
# increase revision when we need to rebuild binary libraries. # increase revision when we need to rebuild binary libraries.
revision = 1 revision = 2
url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
md5sum = 025102de0e4a597cf541e57da80c6aa3 md5sum = 025102de0e4a597cf541e57da80c6aa3
siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_} siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
......
[buildout]
extends =
../fontconfig/buildout.cfg
../libexpat/buildout.cfg
../dash/buildout.cfg
parts =
phantomjs
[phantomjs]
recipe = slapos.recipe.build
slapos_promise =
file:phantomjs-slapos
depends =
${liberation-fonts:location}
${ipaex-fonts:location}
x86 = https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-i686.tar.bz2 2e94dcad7660d24309abe01011461693
x86-64 = https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2 8075fa873d8741c7ae9093c80a589a1f
script =
if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
workdir = guessworkdir(extract_dir)
self.copyTree(workdir, "%(location)s")
wrapper_location = os.path.join("%(location)s", "phantomjs-slapos")
wrapper = open(wrapper_location, 'w')
wrapper.write("""#!${dash:location}/bin/dash
cd %(location)s
export LD_LIBRARY_PATH=%(location)s:${freetype:location}/lib/:${fontconfig:location}/lib/:${libexpat:location}/lib
export PATH=${fontconfig:location}/bin:$PATH
exec %(location)s/bin/phantomjs $*""")
wrapper.flush()
wrapper.close()
os.chmod(wrapper_location, 0755)
\ No newline at end of file
...@@ -13,7 +13,7 @@ extends = ...@@ -13,7 +13,7 @@ extends =
<= pkgconfig <= pkgconfig
[pkgconfig] [pkgconfig]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz
md5sum = 5392b4e3372879c5bf856173b418d6a2 md5sum = 5392b4e3372879c5bf856173b418d6a2
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
......
...@@ -12,7 +12,7 @@ extends = ...@@ -12,7 +12,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
[poppler] [poppler]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = 3939740201c59c470bc7198003450a20 md5sum = 3939740201c59c470bc7198003450a20
url = http://poppler.freedesktop.org/poppler-0.22.2.tar.gz url = http://poppler.freedesktop.org/poppler-0.22.2.tar.gz
depends = depends =
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
popt popt
[popt] [popt]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://anduin.linuxfromscratch.org/BLFS/svn/p/popt-1.16.tar.gz url = ftp://anduin.linuxfromscratch.org/BLFS/svn/p/popt-1.16.tar.gz
md5sum = 3743beefa3dd6247a73f8f7a32c14c33 md5sum = 3743beefa3dd6247a73f8f7a32c14c33
configure-options = configure-options =
......
...@@ -10,7 +10,7 @@ extends = ...@@ -10,7 +10,7 @@ extends =
parts = postfix parts = postfix
[postfix] [postfix]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.3.tar.gz url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.3.tar.gz
md5sum = b3922ededd3fd6051f759e58a4ada3ae md5sum = b3922ededd3fd6051f759e58a4ada3ae
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
......
...@@ -13,7 +13,7 @@ parts = postgresql ...@@ -13,7 +13,7 @@ parts = postgresql
[postgresql91] [postgresql91]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.postgresql.org/pub/source/v9.1.9/postgresql-9.1.9.tar.bz2 url = http://ftp.postgresql.org/pub/source/v9.1.9/postgresql-9.1.9.tar.bz2
md5sum = 6b5ea53dde48fcd79acfc8c196b83535 md5sum = 6b5ea53dde48fcd79acfc8c196b83535
configure-options = --with-openssl --with-perl configure-options = --with-openssl --with-perl
...@@ -23,7 +23,7 @@ environment = ...@@ -23,7 +23,7 @@ environment =
[postgresql92] [postgresql92]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.postgresql.org/pub/source/v9.2.4/postgresql-9.2.4.tar.bz2 url = http://ftp.postgresql.org/pub/source/v9.2.4/postgresql-9.2.4.tar.bz2
md5sum = 6ee5bb53b97da7c6ad9cb0825d3300dd md5sum = 6ee5bb53b97da7c6ad9cb0825d3300dd
configure-options = --with-openssl configure-options = --with-openssl
......
...@@ -3,6 +3,6 @@ parts = ...@@ -3,6 +3,6 @@ parts =
pwgen pwgen
[pwgen] [pwgen]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://downloads.sourceforge.net/project/pwgen/pwgen/2.06/pwgen-2.06.tar.gz url = http://downloads.sourceforge.net/project/pwgen/pwgen/2.06/pwgen-2.06.tar.gz
md5sum = 935aebcbe610fbc9de8125e7b7d71297 md5sum = 935aebcbe610fbc9de8125e7b7d71297
...@@ -35,7 +35,7 @@ download-only = true ...@@ -35,7 +35,7 @@ download-only = true
filename = python2.4-backport-CPPFLAGS-setup-from-python2.6.patch filename = python2.4-backport-CPPFLAGS-setup-from-python2.6.patch
[python2.4] [python2.4]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
# This is actually the default setting for prefix, but we can't use it in # This is actually the default setting for prefix, but we can't use it in
# other settings in this part if we don't set it explicitly here. # other settings in this part if we don't set it explicitly here.
prefix = ${buildout:parts-directory}/${:_buildout_section_name_} prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
......
...@@ -24,7 +24,7 @@ download-only = true ...@@ -24,7 +24,7 @@ download-only = true
filename = python-2.6.6-no_system_inc_dirs.patch filename = python-2.6.6-no_system_inc_dirs.patch
[python2.6] [python2.6]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${gdbm:version} ${gdbm:version}
# This is actually the default setting for prefix, but we can't use it in # This is actually the default setting for prefix, but we can't use it in
......
...@@ -24,10 +24,10 @@ arguments = sys.argv[1:] + ["bootstrap"] ...@@ -24,10 +24,10 @@ arguments = sys.argv[1:] + ["bootstrap"]
python = python2.7 python = python2.7
[python2.7] [python2.7]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
package_version = 2.7.3 package_version = 2.7.4
package_version_suffix = package_version_suffix =
md5sum = c57477edd6d18bd9eeca2f21add73919 md5sum = 62704ea0f125923208d84ff0568f7d50
depends = depends =
${gdbm:version} ${gdbm:version}
......
...@@ -7,6 +7,7 @@ download-only = true ...@@ -7,6 +7,7 @@ download-only = true
filename = setuptools-0.6c11-py2.7.egg filename = setuptools-0.6c11-py2.7.egg
url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename} url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename}
md5sum = fe1f997bc722265116870bc7919059ea md5sum = fe1f997bc722265116870bc7919059ea
mode = 0644
[python-setuptools] [python-setuptools]
# Hack to manually install setuptools outside of the Buildout environment. # Hack to manually install setuptools outside of the Buildout environment.
...@@ -19,4 +20,5 @@ environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${: ...@@ -19,4 +20,5 @@ environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${:
stop-on-error = true stop-on-error = true
recipe = plone.recipe.command recipe = plone.recipe.command
update = true update = true
command = ${:environment} (mkdir ${:location}; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1) # chmod is a hack, but the mode of hexagonit.recipe.download above didn't worked yet (there was new version recently)
command = ${:environment} (mkdir ${:location}; chmod 644 ${setuptools-download:location}/${setuptools-download:filename} ; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1)
...@@ -3,6 +3,7 @@ extends = ...@@ -3,6 +3,7 @@ extends =
../../component/gnutls/buildout.cfg ../../component/gnutls/buildout.cfg
../../component/libpng/buildout.cfg ../../component/libpng/buildout.cfg
../../component/libuuid/buildout.cfg ../../component/libuuid/buildout.cfg
../../component/xorg/buildout.cfg
../../component/zlib/buildout.cfg ../../component/zlib/buildout.cfg
[kvm] [kvm]
...@@ -10,10 +11,12 @@ extends = ...@@ -10,10 +11,12 @@ extends =
<= qemu-kvm <= qemu-kvm
[qemu-kvm] [qemu-kvm]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/1.2.0/qemu-kvm-1.2.0.tar.gz # qemu-kvm and qemu are now the same since 1.3.
md5sum = d7b18b673c48abfee65a9c0245df0415 url = http://wiki.qemu-project.org/download/qemu-1.4.1.tar.bz2
md5sum = eb2d696956324722b5ecfa46e41f9a75
configure-options = configure-options =
--target-list=""
--disable-sdl --disable-sdl
--disable-xen --disable-xen
--enable-vnc-tls --enable-vnc-tls
...@@ -24,9 +27,11 @@ configure-options = ...@@ -24,9 +27,11 @@ configure-options =
--disable-docs --disable-docs
--enable-vnc-png --enable-vnc-png
--disable-vnc-jpeg --disable-vnc-jpeg
--enable-vnc-ws
--extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include" --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include"
--extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -L${gpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls" --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -L${gpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
--disable-werror --disable-werror
environment = environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
...@@ -5,7 +5,7 @@ parts = ...@@ -5,7 +5,7 @@ parts =
# readline-5.x is still used for GPL2 only softwares. # readline-5.x is still used for GPL2 only softwares.
[readline5] [readline5]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
md5sum = e39331f32ad14009b9ff49cc10c5e751 md5sum = e39331f32ad14009b9ff49cc10c5e751
configure-options = configure-options =
...@@ -13,7 +13,7 @@ configure-options = ...@@ -13,7 +13,7 @@ configure-options =
--disable-static --disable-static
[readline] [readline]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
md5sum = 67948acb2ca081f23359d0256e9a271c md5sum = 67948acb2ca081f23359d0256e9a271c
configure-options = configure-options =
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
rsync rsync
[rsync] [rsync]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz
md5sum = 5ee72266fe2c1822333c407e1761b92b md5sum = 5ee72266fe2c1822333c407e1761b92b
make-options = make-options =
......
...@@ -11,7 +11,7 @@ extends = ...@@ -11,7 +11,7 @@ extends =
parts = ruby parts = ruby
[ruby-1.9.3] [ruby-1.9.3]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
md5sum = bc0c715c69da4d1d8bd57069c19f6c0e md5sum = bc0c715c69da4d1d8bd57069c19f6c0e
configure-options = configure-options =
......
...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
sed sed
[sed] [sed]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz url = ftp://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz
md5sum = f0fd4d7da574d4707e442285fd2d3b86 md5sum = f0fd4d7da574d4707e442285fd2d3b86
environment = environment =
......
...@@ -8,7 +8,7 @@ extends = ...@@ -8,7 +8,7 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
[serf] [serf]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://serf.googlecode.com/files/serf-0.7.0.tar.gz url = http://serf.googlecode.com/files/serf-0.7.0.tar.gz
md5sum = 3233f22a5875320da7bdc854d0873080 md5sum = 3233f22a5875320da7bdc854d0873080
configure-options = configure-options =
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
parts = sheepstrike parts = sheepstrike
[sheepstrike] [sheepstrike]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://gitorious.org/sheepstrike/sheepstrike/archive-tarball/0.1 url = https://gitorious.org/sheepstrike/sheepstrike/archive-tarball/0.1
md5sum = 2c5009eb7c32d7ba5d270d0b88d7e5ab md5sum = 2c5009eb7c32d7ba5d270d0b88d7e5ab
prefix = ${buildout:parts-directory}/${:_buildout_section_name_} prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
......
...@@ -20,7 +20,7 @@ url = ${:_profile_base_location_}/${:filename} ...@@ -20,7 +20,7 @@ url = ${:_profile_base_location_}/${:filename}
download-only = true download-only = true
[shellinabox] [shellinabox]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz
md5sum = 0e144910d85d92edc54702ab9c46f032 md5sum = 0e144910d85d92edc54702ab9c46f032
environment = environment =
......
...@@ -131,54 +131,44 @@ scripts = py ...@@ -131,54 +131,44 @@ scripts = py
# Use our own buildout version # Use our own buildout version
zc.buildout = 1.6.0-dev-SlapOS-010 zc.buildout = 1.6.0-dev-SlapOS-010
# Don't use beta # Force to use zc.recipe.egg 1.x
lxml = 3.0.2 zc.recipe.egg = 1.3.2
# Use own version of h.r.download to be able to open archives not supported by python2.x: .xz
hexagonit.recipe.download = 1.6nxd002
Jinja2 = 2.6 Jinja2 = 2.6
Werkzeug = 0.8.3 Werkzeug = 0.8.3
buildout-versions = 1.7 buildout-versions = 1.7
collective.recipe.template = 1.9 collective.recipe.template = 1.10
hexagonit.recipe.cmmi = 1.6 lxml = 3.1.2
meld3 = 0.6.10 meld3 = 0.6.10
netaddr = 0.7.10 netaddr = 0.7.10
slapos.core = 0.35
slapos.libnetworkcache = 0.13.3 slapos.libnetworkcache = 0.13.3
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2
# Required by: # Required by:
# slapos.core==0.35 # slapos.core==0.35.2-dev
Flask = 0.9 Flask = 0.9
# Required by: # Required by:
# hexagonit.recipe.cmmi==1.6 # slapos.core==0.35.2-dev
hexagonit.recipe.download = 1.6nxd002
# Required by:
# slapos.core==0.35
netifaces = 0.8 netifaces = 0.8
# Required by: # Required by:
# slapos.core==0.35 # slapos.core==0.35.2-dev
pyflakes = 0.6.1
# Required by:
# slapos.core==0.35
# slapos.libnetworkcache==0.13.3 # slapos.libnetworkcache==0.13.3
# supervisor==3.0b1 # supervisor==3.0b1
# zc.buildout==1.6.0-dev-SlapOS-010 # zc.buildout==1.6.0-dev-SlapOS-010
# zope.interface==4.0.3 # zope.interface==4.0.5
setuptools = 0.6c12dev-r88846 setuptools = 0.6c12dev-r88846
# Required by: # Required by:
# slapos.core==0.35 # slapos.core==0.35.2-dev
supervisor = 3.0b1 supervisor = 3.0b1
# Required by: # Required by:
# slapos.core==0.35 # slapos.core==0.35.2-dev
unittest2 = 0.5.1 zope.interface = 4.0.5
# Required by:
# slapos.core==0.35
zope.interface = 4.0.3
...@@ -17,7 +17,7 @@ download-only = true ...@@ -17,7 +17,7 @@ download-only = true
filename = sphinx-1.10-beta-snowball.patch filename = sphinx-1.10-beta-snowball.patch
[sphinx] [sphinx]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${mariadb:version} ${mariadb:version}
url = http://sphinxsearch.com/files/sphinx-2.0.5-release.tar.gz url = http://sphinxsearch.com/files/sphinx-2.0.5-release.tar.gz
......
...@@ -4,7 +4,7 @@ parts = ...@@ -4,7 +4,7 @@ parts =
sqlite3 sqlite3
[sqlite3] [sqlite3]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz url = http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz
md5sum = 8860d1a1ed26d40f07e3c7ae035b644a md5sum = 8860d1a1ed26d40f07e3c7ae035b644a
configure-options = configure-options =
......
...@@ -6,7 +6,7 @@ parts = ...@@ -6,7 +6,7 @@ parts =
[stunnel] [stunnel]
<= stunnel-4 <= stunnel-4
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
[stunnel-4-hook-download] [stunnel-4-hook-download]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
...@@ -16,7 +16,7 @@ download-only=true ...@@ -16,7 +16,7 @@ download-only=true
filename = stunnel-4-hooks.py filename = stunnel-4-hooks.py
[stunnel-4] [stunnel-4]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.stunnel.org/stunnel/archive/4.x/stunnel-4.55.tar.gz url = ftp://ftp.stunnel.org/stunnel/archive/4.x/stunnel-4.55.tar.gz
md5sum = ebe6670368d30c6a01ca33b9c50cb239 md5sum = ebe6670368d30c6a01ca33b9c50cb239
pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
......
...@@ -24,7 +24,7 @@ url = ${:_profile_base_location_}/${:filename} ...@@ -24,7 +24,7 @@ url = ${:_profile_base_location_}/${:filename}
md5sum = 8d911ec2422dc4c08a00693ac915a07a md5sum = 8d911ec2422dc4c08a00693ac915a07a
[subversion] [subversion]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2 url = http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2
md5sum = 81e5dc5beee4b3fc025ac70c0b6caa14 md5sum = 81e5dc5beee4b3fc025ac70c0b6caa14
patches = patches =
......
...@@ -8,7 +8,7 @@ parts = ...@@ -8,7 +8,7 @@ parts =
swig swig
[swig] [swig]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://downloads.sourceforge.net/project/swig/swig/swig-1.3.40/swig-1.3.40.tar.gz url = http://downloads.sourceforge.net/project/swig/swig/swig-1.3.40/swig-1.3.40.tar.gz
md5sum = 2df766c9e03e02811b1ab4bba1c7b9cc md5sum = 2df766c9e03e02811b1ab4bba1c7b9cc
configure-options = configure-options =
......
...@@ -15,7 +15,7 @@ patch-options = -p1 ...@@ -15,7 +15,7 @@ patch-options = -p1
patches = patches =
${tar-drop.gets.patch:location}/${tar-drop.gets.patch:filename} ${tar-drop.gets.patch:location}/${tar-drop.gets.patch:filename}
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz
md5sum = 00d1e769c6af702c542cca54b728920d md5sum = 00d1e769c6af702c542cca54b728920d
environment = environment =
......
...@@ -23,7 +23,7 @@ filename = ${:_buildout_section_name_} ...@@ -23,7 +23,7 @@ filename = ${:_buildout_section_name_}
md5sum = 2e691858cb492b7c17d23bf0912b3d24 md5sum = 2e691858cb492b7c17d23bf0912b3d24
[tesseract] [tesseract]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
md5sum = 1ba496e51a42358fb9d3ffe781b2d20a md5sum = 1ba496e51a42358fb9d3ffe781b2d20a
patch-options = patch-options =
......
...@@ -5,7 +5,7 @@ extends = ...@@ -5,7 +5,7 @@ extends =
parts = tokyocabinet parts = tokyocabinet
[tokyocabinet] [tokyocabinet]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://fallabs.com/tokyocabinet/tokyocabinet-1.4.46.tar.gz url = http://fallabs.com/tokyocabinet/tokyocabinet-1.4.46.tar.gz
md5sum = 341dadd1f3d68760e350f7e731111786 md5sum = 341dadd1f3d68760e350f7e731111786
......
...@@ -15,7 +15,7 @@ extends = ...@@ -15,7 +15,7 @@ extends =
<= varnish-2.0 <= varnish-2.0
[varnish-2.0] [varnish-2.0]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://sourceforge.net/projects/varnish/files/varnish/2.0.6/varnish-2.0.6.tar.gz/download url = http://sourceforge.net/projects/varnish/files/varnish/2.0.6/varnish-2.0.6.tar.gz/download
md5sum = d91dc21c636db61c69b5e8f061c5bb95 md5sum = d91dc21c636db61c69b5e8f061c5bb95
configure-options = configure-options =
...@@ -25,7 +25,7 @@ environment = ...@@ -25,7 +25,7 @@ environment =
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
[varnish-2.1] [varnish-2.1]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz url = http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz
md5sum = 2d2f227da36a2a240c475304c717b8e3 md5sum = 2d2f227da36a2a240c475304c717b8e3
configure-options = configure-options =
......
...@@ -20,7 +20,7 @@ md5sum = 75422a6f7f671b3a6d9add6724cc0945 ...@@ -20,7 +20,7 @@ md5sum = 75422a6f7f671b3a6d9add6724cc0945
virtual-depend = virtual-depend =
${w3m-w3m.gcc.forward.compat.patch:md5sum} ${w3m-w3m.gcc.forward.compat.patch:md5sum}
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = 1b845a983a50b8dec0169ac48479eacc md5sum = 1b845a983a50b8dec0169ac48479eacc
url = http://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz url = http://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz
configure-options = configure-options =
......
...@@ -9,7 +9,7 @@ extends = ...@@ -9,7 +9,7 @@ extends =
../libpng/buildout.cfg ../libpng/buildout.cfg
[webp] [webp]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://webp.googlecode.com/files/libwebp-0.1.3.tar.gz url = https://webp.googlecode.com/files/libwebp-0.1.3.tar.gz
md5sum = 254d4670e14e9ed881f0536b006ab336 md5sum = 254d4670e14e9ed881f0536b006ab336
configure-options = configure-options =
......
...@@ -9,7 +9,7 @@ parts = ...@@ -9,7 +9,7 @@ parts =
wget wget
[wget] [wget]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz url = http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz
md5sum = 316f6f59292c9098ad81fd54f658c579 md5sum = 316f6f59292c9098ad81fd54f658c579
configure-options = configure-options =
......
...@@ -6,7 +6,7 @@ depends = ...@@ -6,7 +6,7 @@ depends =
../libuuid/buildout.cfg ../libuuid/buildout.cfg
[xapian] [xapian]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz
md5sum = faf33a3945edbe4c848627750856cbeb md5sum = faf33a3945edbe4c848627750856cbeb
environment = environment =
......
...@@ -27,12 +27,12 @@ parts = ...@@ -27,12 +27,12 @@ parts =
ACLOCAL=${xorg-util-macros:location}/share/aclocal ACLOCAL=${xorg-util-macros:location}/share/aclocal
[xorg-util-macros] [xorg-util-macros]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/util/util-macros-1.11.0.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/util/util-macros-1.11.0.tar.bz2
md5sum = 22d5cdff672450cb6902e0d68c200dcb md5sum = 22d5cdff672450cb6902e0d68c200dcb
[xproto] [xproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/proto/xproto-7.0.20.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/proto/xproto-7.0.20.tar.bz2
md5sum = 65633168e5315c19defb4652cd3d83c1 md5sum = 65633168e5315c19defb4652cd3d83c1
configure-options = configure-options =
...@@ -44,7 +44,7 @@ environment = ...@@ -44,7 +44,7 @@ environment =
PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s
[xextproto] [xextproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/proto/xextproto-7.1.2.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/proto/xextproto-7.1.2.tar.bz2
md5sum = 263ae968b223c23b2986603d84e5c30e md5sum = 263ae968b223c23b2986603d84e5c30e
configure-options = configure-options =
...@@ -63,7 +63,7 @@ filename = xtrans_tmp_env.patch ...@@ -63,7 +63,7 @@ filename = xtrans_tmp_env.patch
md5sum = 37d82a3b6009113023599632117a6855 md5sum = 37d82a3b6009113023599632117a6855
[xtrans] [xtrans]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/xtrans-1.2.6.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/lib/xtrans-1.2.6.tar.bz2
md5sum = c66f9ffd2da4fb012220c6c40ebc7609 md5sum = c66f9ffd2da4fb012220c6c40ebc7609
patches = patches =
...@@ -79,7 +79,7 @@ environment = ...@@ -79,7 +79,7 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
[libXau] [libXau]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libXau-1.0.6.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/lib/libXau-1.0.6.tar.bz2
md5sum = 4a2cbd83727682f9ee1c1e719bac6adb md5sum = 4a2cbd83727682f9ee1c1e719bac6adb
configure-options = configure-options =
...@@ -89,7 +89,7 @@ environment = ...@@ -89,7 +89,7 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
[xcbproto] [xcbproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/xcb/xcb-proto-1.6.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/xcb/xcb-proto-1.6.tar.bz2
md5sum = 04313e1d914b44d0e457f6c494fc178b md5sum = 04313e1d914b44d0e457f6c494fc178b
environment = environment =
...@@ -97,7 +97,7 @@ environment = ...@@ -97,7 +97,7 @@ environment =
PYTHON=${buildout:executable} PYTHON=${buildout:executable}
[xorg-libpthread-stubs] [xorg-libpthread-stubs]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/xcb/libpthread-stubs-0.3.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/xcb/libpthread-stubs-0.3.tar.bz2
md5sum = e8fa31b42e13f87e8f5a7a2b731db7ee md5sum = e8fa31b42e13f87e8f5a7a2b731db7ee
...@@ -109,7 +109,7 @@ filename = xcb_tmp_env.patch ...@@ -109,7 +109,7 @@ filename = xcb_tmp_env.patch
md5sum = 61f39878120ba434a169e24cae2af862 md5sum = 61f39878120ba434a169e24cae2af862
[libxcb] [libxcb]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/xcb/libxcb-1.7.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/xcb/libxcb-1.7.tar.bz2
md5sum = 925699df361b99491165ebc12068056b md5sum = 925699df361b99491165ebc12068056b
patches = patches =
...@@ -129,7 +129,7 @@ environment = ...@@ -129,7 +129,7 @@ environment =
# suitable library. # suitable library.
[libXext] [libXext]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2
md5sum = 9bb236ff0193e9fc1c1fb504dd840331 md5sum = 9bb236ff0193e9fc1c1fb504dd840331
environment = environment =
...@@ -158,17 +158,17 @@ filename = 700c7896b832d6e4fb0185f0d5382b01f94e7141.patch ...@@ -158,17 +158,17 @@ filename = 700c7896b832d6e4fb0185f0d5382b01f94e7141.patch
md5sum = 52635ef694ee6f1acb642a77ee8eb010 md5sum = 52635ef694ee6f1acb642a77ee8eb010
[inputproto] [inputproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2
md5sum = da9bf9e5d174163f597d2d72757d9038 md5sum = da9bf9e5d174163f597d2d72757d9038
[kbproto] [kbproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2
md5sum = e7edb59a3f54af15f749e8f3e314ee62 md5sum = e7edb59a3f54af15f749e8f3e314ee62
[libX11] [libX11]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libX11-1.4.0.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/lib/libX11-1.4.0.tar.bz2
md5sum = b63d9f7493a61df51d0c0be04ac435e4 md5sum = b63d9f7493a61df51d0c0be04ac435e4
configure-options = configure-options =
...@@ -189,7 +189,7 @@ environment = ...@@ -189,7 +189,7 @@ environment =
[libXdmcp] [libXdmcp]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libXdmcp-1.1.0.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/lib/libXdmcp-1.1.0.tar.bz2
md5sum = 762b6bbaff7b7d0831ddb4f072f939a5 md5sum = 762b6bbaff7b7d0831ddb4f072f939a5
environment = environment =
...@@ -201,67 +201,67 @@ configure-options = ...@@ -201,67 +201,67 @@ configure-options =
--without-fop --without-fop
[fixesproto] [fixesproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2
md5sum = bdb58ecc313b509247036d5c11fa99df md5sum = bdb58ecc313b509247036d5c11fa99df
[bigreqsproto] [bigreqsproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
md5sum = 6f6c24436c2b3ab235eb14a85b9aaacf md5sum = 6f6c24436c2b3ab235eb14a85b9aaacf
[xcmiscproto] [xcmiscproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2
md5sum = cd7372cd827bfd7ca7e9238f2ce274b1 md5sum = cd7372cd827bfd7ca7e9238f2ce274b1
[damageproto] [damageproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
md5sum = 998e5904764b82642cc63d97b4ba9e95 md5sum = 998e5904764b82642cc63d97b4ba9e95
[randrproto] [randrproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2
md5sum = 597491c0d8055e2a66f11350c4985775 md5sum = 597491c0d8055e2a66f11350c4985775
[renderproto] [renderproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2
md5sum = a914ccc1de66ddeb4b611c6b0686e274 md5sum = a914ccc1de66ddeb4b611c6b0686e274
[videoproto] [videoproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2
md5sum = c3b348c6e2031b72b11ae63fc7f805c2 md5sum = c3b348c6e2031b72b11ae63fc7f805c2
[fontsproto] [fontsproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2
md5sum = 37102ffcaa73f77d700acd6f7a25d8f0 md5sum = 37102ffcaa73f77d700acd6f7a25d8f0
[recordproto] [recordproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2
md5sum = 24541a30b399213def35f48efd926c63 md5sum = 24541a30b399213def35f48efd926c63
[resourceproto] [resourceproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2
md5sum = 8ff0525ae7502b48597b78d00bc22284 md5sum = 8ff0525ae7502b48597b78d00bc22284
[xineramaproto] [xineramaproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/xineramaproto-1.2.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/xineramaproto-1.2.tar.bz2
md5sum = a8aadcb281b9c11a91303e24cdea45f5 md5sum = a8aadcb281b9c11a91303e24cdea45f5
[pixman] [pixman]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.23.2.tar.bz2 url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.23.2.tar.bz2
md5sum = 2e2805f5ca02edeb15a7862779670069 md5sum = 2e2805f5ca02edeb15a7862779670069
[libfontenc] [libfontenc]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
md5sum = 11d3c292f05a90f6f67840a9e9c3d9b8 md5sum = 11d3c292f05a90f6f67840a9e9c3d9b8
environment = environment =
...@@ -273,7 +273,7 @@ environment = ...@@ -273,7 +273,7 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
[libXfont] [libXfont]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2
md5sum = 6fb689cfe13d8d9460f4abb5bd88588d md5sum = 6fb689cfe13d8d9460f4abb5bd88588d
environment = environment =
...@@ -285,7 +285,7 @@ environment = ...@@ -285,7 +285,7 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
[libxkbfile] [libxkbfile]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
md5sum = 59b4fe0bdf8d9b05e45b59e8fe9e7516 md5sum = 59b4fe0bdf8d9b05e45b59e8fe9e7516
environment = environment =
...@@ -296,7 +296,7 @@ environment = ...@@ -296,7 +296,7 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
[xkeyboard-config] [xkeyboard-config]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.1.tar.bz2 url = http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.1.tar.bz2
md5sum = 57ecc78bacd8ecc398d8ed6588f4d04b md5sum = 57ecc78bacd8ecc398d8ed6588f4d04b
depends = depends =
...@@ -312,7 +312,7 @@ environment = ...@@ -312,7 +312,7 @@ environment =
PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
[xkbcomp] [xkbcomp]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/app/xkbcomp-1.2.0.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/app/xkbcomp-1.2.0.tar.bz2
md5sum = 0f55995cd8da9b2d88553e1a2e17cd0a md5sum = 0f55995cd8da9b2d88553e1a2e17cd0a
# Hardcoded location for xkeyboard-config, needed during compile time # Hardcoded location for xkeyboard-config, needed during compile time
...@@ -327,12 +327,12 @@ environment = ...@@ -327,12 +327,12 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
[render] [render]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2 url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2
md5sum = d43c2afc69937655d13c02588c9ff974 md5sum = d43c2afc69937655d13c02588c9ff974
[libXrender] [libXrender]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://xlibs.freedesktop.org/release/libXrender-0.9.0.tar.bz2 url = http://xlibs.freedesktop.org/release/libXrender-0.9.0.tar.bz2
md5sum = ce7cda009aa0b10a73637941d44ae789 md5sum = ce7cda009aa0b10a73637941d44ae789
configure-options = configure-options =
...@@ -342,7 +342,7 @@ environment = ...@@ -342,7 +342,7 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
[libXinerama] [libXinerama]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2
md5sum = ecd4839ad01f6f637c6fb5327207f89b md5sum = ecd4839ad01f6f637c6fb5327207f89b
environment = environment =
...@@ -352,7 +352,7 @@ configure-options = ...@@ -352,7 +352,7 @@ configure-options =
--disable-static --disable-static
[libICE] [libICE]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2
md5sum = bb72a732b15e9dc25c3036559387eed5 md5sum = bb72a732b15e9dc25c3036559387eed5
configure-options = configure-options =
...@@ -364,7 +364,7 @@ environment = ...@@ -364,7 +364,7 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
[libSM] [libSM]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libSM-1.2.0.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/lib/libSM-1.2.0.tar.bz2
md5sum = e78c447bf1790552b644eca81b542742 md5sum = e78c447bf1790552b644eca81b542742
configure-options = configure-options =
...@@ -377,7 +377,7 @@ environment = ...@@ -377,7 +377,7 @@ environment =
LIBUUID_CFLAGS=-I${libuuid:location}/include LIBUUID_CFLAGS=-I${libuuid:location}/include
[libXt] [libXt]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libXt-1.0.9.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/lib/libXt-1.0.9.tar.bz2
md5sum = 8a414f8f2327aaa616ca2dcac1f5d8c3 md5sum = 8a414f8f2327aaa616ca2dcac1f5d8c3
environment = environment =
...@@ -386,7 +386,7 @@ environment = ...@@ -386,7 +386,7 @@ environment =
CPPFLAGS=-I${libSM:location}/include -I${kbproto:location}/include -I${libICE:location}/include -I${xproto:location}/include -I${libX11:location}/include CPPFLAGS=-I${libSM:location}/include -I${kbproto:location}/include -I${libICE:location}/include -I${xproto:location}/include -I${libX11:location}/include
[dri2proto] [dri2proto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.6.tar.gz url = http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.6.tar.gz
md5sum = 873142af5db695537cfe05e01d13541f md5sum = 873142af5db695537cfe05e01d13541f
configure-options = configure-options =
...@@ -397,7 +397,7 @@ environment = ...@@ -397,7 +397,7 @@ environment =
[pciaccess] [pciaccess]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libpciaccess-0.12.0.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/lib/libpciaccess-0.12.0.tar.bz2
md5sum = 285e07976274572e1f1e68edee09b70a md5sum = 285e07976274572e1f1e68edee09b70a
configure-options = configure-options =
...@@ -406,7 +406,7 @@ environment = ...@@ -406,7 +406,7 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
[makedepend] [makedepend]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2 url = http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2
md5sum = 4e6cb97bbecfbb34f3f644a75e513093 md5sum = 4e6cb97bbecfbb34f3f644a75e513093
configure-options = configure-options =
...@@ -416,7 +416,7 @@ environment = ...@@ -416,7 +416,7 @@ environment =
PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
[glproto] [glproto]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.14.tar.bz2 url = http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.14.tar.bz2
md5sum = f48257daf0017f7a7667e5bf48ca3578 md5sum = f48257daf0017f7a7667e5bf48ca3578
configure-options = configure-options =
...@@ -426,7 +426,7 @@ environment = ...@@ -426,7 +426,7 @@ environment =
PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
[xfixes] [xfixes]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.5.tar.bz2 url = http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.5.tar.bz2
md5sum = 1b4b8386bd5d1751b2c7177223ad4629 md5sum = 1b4b8386bd5d1751b2c7177223ad4629
configure-options = configure-options =
...@@ -437,7 +437,7 @@ environment = ...@@ -437,7 +437,7 @@ environment =
CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${xextproto:location}/include CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${xextproto:location}/include
[xdamage] [xdamage]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.3.tar.bz2 url = http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.3.tar.bz2
md5sum = 44774e1a065158b52f1a0da5100cebec md5sum = 44774e1a065158b52f1a0da5100cebec
configure-options = configure-options =
...@@ -455,7 +455,7 @@ filename = tmp_env.patch ...@@ -455,7 +455,7 @@ filename = tmp_env.patch
md5sum = 8b60ab8121f0564a681fc00d03101696 md5sum = 8b60ab8121f0564a681fc00d03101696
[libxmu] [libxmu]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libXmu-1.1.0.tar.gz url = http://www.x.org/releases/X11R7.6/src/lib/libXmu-1.1.0.tar.gz
md5sum = 15e1cb9aaf97eae169bfe6944e0a541e md5sum = 15e1cb9aaf97eae169bfe6944e0a541e
environment = environment =
...@@ -464,7 +464,7 @@ environment = ...@@ -464,7 +464,7 @@ environment =
CPPFLAGS=-I${libX11:location}/include -I${xextproto:location}/include CPPFLAGS=-I${libX11:location}/include -I${xextproto:location}/include
[libXcursor] [libXcursor]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libXcursor-1.1.11.tar.gz url = http://www.x.org/releases/X11R7.6/src/lib/libXcursor-1.1.11.tar.gz
md5sum = 55558a41d0bcf9210636858844fa4d2f md5sum = 55558a41d0bcf9210636858844fa4d2f
environment = environment =
...@@ -473,7 +473,7 @@ environment = ...@@ -473,7 +473,7 @@ environment =
CPPFLAGS=-I${render:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${libX11:location}/include -I${xfixes:location}/include -I${libXrender:location}/include CPPFLAGS=-I${render:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${libX11:location}/include -I${xfixes:location}/include -I${libXrender:location}/include
[xwd] [xwd]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/app/xwd-1.0.4.tar.gz url = http://www.x.org/releases/X11R7.6/src/app/xwd-1.0.4.tar.gz
md5sum = f8da771069756210833524b5afa1832c md5sum = f8da771069756210833524b5afa1832c
environment = environment =
...@@ -484,7 +484,7 @@ environment = ...@@ -484,7 +484,7 @@ environment =
[xserver] [xserver]
# Adds Xvfb functionnality # Adds Xvfb functionnality
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/xserver/xorg-server-1.9.3.tar.bz2 url = http://www.x.org/releases/X11R7.6/src/xserver/xorg-server-1.9.3.tar.bz2
md5sum = 5bef6839a76d029204ab31aa2fcb5201 md5sum = 5bef6839a76d029204ab31aa2fcb5201
patches = patches =
......
...@@ -35,7 +35,7 @@ filename = xpdf-3.02pl5.patch ...@@ -35,7 +35,7 @@ filename = xpdf-3.02pl5.patch
md5sum = 504902ca5e9d66c67eed03636ec6b163 md5sum = 504902ca5e9d66c67eed03636ec6b163
[xpdf-3.02] [xpdf-3.02]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = 599dc4cc65a07ee868cf92a667a913d2 md5sum = 599dc4cc65a07ee868cf92a667a913d2
url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz
configure-options = configure-options =
......
...@@ -46,7 +46,7 @@ download-only = true ...@@ -46,7 +46,7 @@ download-only = true
filename = libtar-${:version}.tar.gz filename = libtar-${:version}.tar.gz
[xtrabackup] [xtrabackup]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.percona.com/downloads/XtraBackup/XtraBackup-1.6.3/source/xtrabackup-1.6.3.tar.gz url = http://www.percona.com/downloads/XtraBackup/XtraBackup-1.6.3/source/xtrabackup-1.6.3.tar.gz
md5sum = d0b827fd18cd76416101eb7b7c56a311 md5sum = d0b827fd18cd76416101eb7b7c56a311
make-binary = true make-binary = true
......
...@@ -3,6 +3,6 @@ parts = ...@@ -3,6 +3,6 @@ parts =
xz-utils xz-utils
[xz-utils] [xz-utils]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://tukaani.org/xz/xz-5.0.4.tar.gz url = http://tukaani.org/xz/xz-5.0.4.tar.gz
md5sum = df3df690aef18384e1e031be7ec3a964 md5sum = df3df690aef18384e1e031be7ec3a964
...@@ -3,9 +3,9 @@ parts = ...@@ -3,9 +3,9 @@ parts =
zabbix-agent zabbix-agent
[zabbix-agent] [zabbix-agent]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.1.tar.gz?download url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.5.tar.gz?download
md5sum = 3b301aa4f2b7cb5ede46884b9c7873e1 md5sum = 0c0721c31889b63bce9aa556bcb927e8
configure-options = configure-options =
--enable-agent --enable-agent
--enable-ipv6 --enable-ipv6
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
parts = zip parts = zip
[zip] [zip]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://sourceforge.net/projects/infozip/files/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz/download url = http://sourceforge.net/projects/infozip/files/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz/download
md5sum = 7b74551e63f8ee6aab6fbc86676c0d37 md5sum = 7b74551e63f8ee6aab6fbc86676c0d37
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
......
...@@ -3,6 +3,6 @@ parts = ...@@ -3,6 +3,6 @@ parts =
zlib zlib
[zlib] [zlib]
recipe = hexagonit.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://prdownloads.sourceforge.net/libpng/zlib-1.2.6.tar.bz2?download url = http://prdownloads.sourceforge.net/libpng/zlib-1.2.6.tar.bz2?download
md5sum = dc2cfa0d2313ca77224b4d932b2911e9 md5sum = dc2cfa0d2313ca77224b4d932b2911e9
...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages ...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '0.76.1.dev' version = '0.77.2.dev'
name = 'slapos.cookbook' name = 'slapos.cookbook'
long_description = open("README.txt").read() + "\n" + \ long_description = open("README.txt").read() + "\n" + \
open("CHANGES.txt").read() + "\n" open("CHANGES.txt").read() + "\n"
......
...@@ -36,6 +36,7 @@ import ConfigParser ...@@ -36,6 +36,7 @@ import ConfigParser
import re import re
import traceback import traceback
TRUE_VALUES = ['y', 'yes', '1', 'true']
class Recipe(BaseSlapRecipe): class Recipe(BaseSlapRecipe):
...@@ -65,13 +66,13 @@ class Recipe(BaseSlapRecipe): ...@@ -65,13 +66,13 @@ class Recipe(BaseSlapRecipe):
# self.cron_d is a directory, where cron jobs can be registered # self.cron_d is a directory, where cron jobs can be registered
self.cron_d = self.installCrond() self.cron_d = self.installCrond()
self.logrotate_d, self.logrotate_backup = self.installLogrotate()
self.killpidfromfile = zc.buildout.easy_install.scripts( self.killpidfromfile = zc.buildout.easy_install.scripts(
[('killpidfromfile', 'slapos.recipe.erp5.killpidfromfile', [('killpidfromfile', 'slapos.toolbox.killpidfromfile',
'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0] 'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0]
self.path_list.append(self.killpidfromfile) self.path_list.append(self.killpidfromfile)
rewrite_rule_list = [] rewrite_rule_list = []
rewrite_rule_https_only_list = []
rewrite_rule_zope_list = [] rewrite_rule_zope_list = []
rewrite_rule_zope_path_list = [] rewrite_rule_zope_path_list = []
slave_dict = {} slave_dict = {}
...@@ -88,19 +89,15 @@ class Recipe(BaseSlapRecipe): ...@@ -88,19 +89,15 @@ class Recipe(BaseSlapRecipe):
# Sanitize inputs # Sanitize inputs
backend_url = slave_instance.get("url", None) backend_url = slave_instance.get("url", None)
reference = slave_instance.get("slave_reference") reference = slave_instance.get("slave_reference")
enable_cache = slave_instance.get('enable_cache', '').lower() in TRUE_VALUES
slave_type = slave_instance.get('type', '').lower() or None
if slave_instance.haskey("enable_cache"): https_only = slave_instance.get('https-only', '').lower() in TRUE_VALUES
enable_cache = slave_instance.get("enable_cache", "").upper() in ('1', 'TRUE')
else:
enable_cache = False
if slave_instance.haskey("type"):
slave_type = slave_instance.get("type", "").lower()
else:
slave_type = None
# Set scheme (http? https?) # Set scheme (http? https?)
# Future work may allow to choose between http and https (or both?) if https_only:
scheme = 'https://'
else:
scheme = 'http://' scheme = 'http://'
self.logger.info('Processing slave instance: %s' % reference) self.logger.info('Processing slave instance: %s' % reference)
...@@ -143,6 +140,10 @@ class Recipe(BaseSlapRecipe): ...@@ -143,6 +140,10 @@ class Recipe(BaseSlapRecipe):
rewrite_rule = "%s %s" % (domain, backend_url) rewrite_rule = "%s %s" % (domain, backend_url)
# Finally, if successful, we add the rewrite rule to our list of rules # Finally, if successful, we add the rewrite rule to our list of rules
# We have 4 RewriteMaps:
# - One for generic (non-zope) websites, accepting both HTTP and HTTPS
# - One for generic websites that only accept HTTPS
# - Two for Zope-based websites
if rewrite_rule: if rewrite_rule:
# We check if we have a zope slave. It requires different rewrite # We check if we have a zope slave. It requires different rewrite
# rule structure. # rule structure.
...@@ -153,6 +154,9 @@ class Recipe(BaseSlapRecipe): ...@@ -153,6 +154,9 @@ class Recipe(BaseSlapRecipe):
# For Zope, we have another dict containing the path e.g '/erp5/... # For Zope, we have another dict containing the path e.g '/erp5/...
rewrite_rule_path = "%s %s" % (domain, slave_instance.get('path', '')) rewrite_rule_path = "%s %s" % (domain, slave_instance.get('path', ''))
rewrite_rule_zope_path_list.append(rewrite_rule_path) rewrite_rule_zope_path_list.append(rewrite_rule_path)
else:
if https_only:
rewrite_rule_https_only_list.append(rewrite_rule)
else: else:
rewrite_rule_list.append(rewrite_rule) rewrite_rule_list.append(rewrite_rule)
...@@ -186,6 +190,7 @@ class Recipe(BaseSlapRecipe): ...@@ -186,6 +190,7 @@ class Recipe(BaseSlapRecipe):
plain_http_port=frontend_plain_http_port_number, plain_http_port=frontend_plain_http_port_number,
name=frontend_domain_name, name=frontend_domain_name,
rewrite_rule_list=rewrite_rule_list, rewrite_rule_list=rewrite_rule_list,
rewrite_rule_https_only_list=rewrite_rule_https_only_list,
rewrite_rule_zope_list=rewrite_rule_zope_list, rewrite_rule_zope_list=rewrite_rule_zope_list,
rewrite_rule_zope_path_list=rewrite_rule_zope_path_list, rewrite_rule_zope_path_list=rewrite_rule_zope_path_list,
key=key, certificate=certificate) key=key, certificate=certificate)
...@@ -279,29 +284,6 @@ class Recipe(BaseSlapRecipe): ...@@ -279,29 +284,6 @@ class Recipe(BaseSlapRecipe):
return "%s http://%s:%s" % \ return "%s http://%s:%s" % \
(domain, varnish_ip, base_varnish_port) (domain, varnish_ip, base_varnish_port)
def installLogrotate(self):
"""Installs logortate main configuration file and registers its to cron"""
logrotate_d = os.path.abspath(os.path.join(self.etc_directory,
'logrotate.d'))
self._createDirectory(logrotate_d)
logrotate_backup = self.createBackupDirectory('logrotate')
logrotate_conf = self.createConfigurationFile("logrotate.conf",
"include %s" % logrotate_d)
logrotate_cron = os.path.join(self.cron_d, 'logrotate')
state_file = os.path.join(self.data_root_directory, 'logrotate.status')
open(logrotate_cron, 'w').write('0 0 * * * %s -s %s %s' %
(self.options['logrotate_binary'], state_file, logrotate_conf))
self.path_list.extend([logrotate_d, logrotate_conf, logrotate_cron])
return logrotate_d, logrotate_backup
def registerLogRotation(self, name, log_file_list, postrotate_script):
"""Register new log rotation requirement"""
open(os.path.join(self.logrotate_d, name), 'w').write(
self.substituteTemplate(self.getTemplateFilename(
'logrotate_entry.in'),
dict(file_list=' '.join(['"'+q+'"' for q in log_file_list]),
postrotate=postrotate_script, olddir=self.logrotate_backup)))
def requestCertificate(self, name): def requestCertificate(self, name):
hash = hashlib.sha512(name).hexdigest() hash = hashlib.sha512(name).hexdigest()
key = os.path.join(self.ca_private, hash + self.ca_key_ext) key = os.path.join(self.ca_private, hash + self.ca_key_ext)
...@@ -418,8 +400,7 @@ class Recipe(BaseSlapRecipe): ...@@ -418,8 +400,7 @@ class Recipe(BaseSlapRecipe):
def _getApacheConfigurationDict(self, name, ip_list, port): def _getApacheConfigurationDict(self, name, ip_list, port):
apache_conf = dict() apache_conf = dict()
apache_conf['server_name'] = name apache_conf['server_name'] = name
apache_conf['pid_file'] = os.path.join(self.run_directory, apache_conf['pid_file'] = self.options['pid-file']
name + '.pid')
apache_conf['lock_file'] = os.path.join(self.run_directory, apache_conf['lock_file'] = os.path.join(self.run_directory,
name + '.lock') name + '.lock')
apache_conf['document_root'] = os.path.join(self.data_root_directory, apache_conf['document_root'] = os.path.join(self.data_root_directory,
...@@ -429,13 +410,8 @@ class Recipe(BaseSlapRecipe): ...@@ -429,13 +410,8 @@ class Recipe(BaseSlapRecipe):
apache_conf['ip_list'] = ip_list apache_conf['ip_list'] = ip_list
apache_conf['port'] = port apache_conf['port'] = port
apache_conf['server_admin'] = 'admin@' apache_conf['server_admin'] = 'admin@'
apache_conf['error_log'] = os.path.join(self.log_directory, apache_conf['error_log'] = self.options['error-log']
'frontend-apache-error.log') apache_conf['access_log'] = self.options['access-log']
apache_conf['access_log'] = os.path.join(self.log_directory,
'frontend-apache-access.log')
self.registerLogRotation(name, [apache_conf['error_log'],
apache_conf['access_log']], self.killpidfromfile + ' ' +
apache_conf['pid_file'] + ' SIGUSR1')
return apache_conf return apache_conf
def installVarnishCache(self, name, ip, port, control_port, backend_host, def installVarnishCache(self, name, ip, port, control_port, backend_host,
...@@ -517,10 +493,13 @@ class Recipe(BaseSlapRecipe): ...@@ -517,10 +493,13 @@ class Recipe(BaseSlapRecipe):
port=4443, plain_http_port=8080, port=4443, plain_http_port=8080,
rewrite_rule_list=None, rewrite_rule_list=None,
rewrite_rule_zope_list=None, rewrite_rule_zope_list=None,
rewrite_rule_https_only_list=None,
rewrite_rule_zope_path_list=None, rewrite_rule_zope_path_list=None,
access_control_string=None): access_control_string=None):
if rewrite_rule_list is None: if rewrite_rule_list is None:
rewrite_rule_list = [] rewrite_rule_list = []
if rewrite_rule_https_only_list is None:
rewrite_rule_zope_path_list = []
if rewrite_rule_zope_list is None: if rewrite_rule_zope_list is None:
rewrite_rule_zope_list = [] rewrite_rule_zope_list = []
if rewrite_rule_zope_path_list is None: if rewrite_rule_zope_path_list is None:
...@@ -571,15 +550,22 @@ class Recipe(BaseSlapRecipe): ...@@ -571,15 +550,22 @@ class Recipe(BaseSlapRecipe):
self.path_list.append(backup_cron) self.path_list.append(backup_cron)
# Create configuration file and rewritemaps # Create configuration file and rewritemaps
apachemap_name = "apachemap.txt" apachemap_path = self.createConfigurationFile(
apachemapzope_name = "apachemapzope.txt" "apache_rewritemap_generic.txt",
apachemapzopepath_name = "apachemapzopepath.txt" "\n".join(rewrite_rule_list)
)
self.createConfigurationFile(apachemap_name, "\n".join(rewrite_rule_list)) apachemap_httpsonly_path = self.createConfigurationFile(
self.createConfigurationFile(apachemapzope_name, "apache_rewritemap_httpsonly.txt",
"\n".join(rewrite_rule_zope_list)) "\n".join(rewrite_rule_https_only_list)
self.createConfigurationFile(apachemapzopepath_name, )
"\n".join(rewrite_rule_zope_path_list)) apachemap_zope_path = self.createConfigurationFile(
"apache_rewritemap_zope.txt",
"\n".join(rewrite_rule_zope_list)
)
apachemap_zopepath_path = self.createConfigurationFile(
"apache_rewritemap_zopepath.txt",
"\n".join(rewrite_rule_zope_path_list)
)
apache_conf = self._getApacheConfigurationDict(name, ip_list, port) apache_conf = self._getApacheConfigurationDict(name, ip_list, port)
apache_conf['ssl_snippet'] = self.substituteTemplate( apache_conf['ssl_snippet'] = self.substituteTemplate(
...@@ -606,9 +592,10 @@ class Recipe(BaseSlapRecipe): ...@@ -606,9 +592,10 @@ class Recipe(BaseSlapRecipe):
apache_conf.update(**dict( apache_conf.update(**dict(
path_enable=path, path_enable=path,
apachemap_path=os.path.join(self.etc_directory, apachemap_name), apachemap_path=apachemap_path,
apachemapzope_path=os.path.join(self.etc_directory, apachemapzope_name), apachemap_httpsonly_path=apachemap_httpsonly_path,
apachemapzopepath_path=os.path.join(self.etc_directory, apachemapzopepath_name), apachemapzope_path=apachemap_zope_path,
apachemapzopepath_path=apachemap_zopepath_path,
apache_domain=name, apache_domain=name,
https_port=port, https_port=port,
plain_http_port=plain_http_port, plain_http_port=plain_http_port,
......
...@@ -104,10 +104,12 @@ Header append Vary User-Agent ...@@ -104,10 +104,12 @@ Header append Vary User-Agent
# or changed when slapgrid is ran. It can be freely customized by node admin. # or changed when slapgrid is ran. It can be freely customized by node admin.
Include %(custom_apache_virtualhost_conf)s Include %(custom_apache_virtualhost_conf)s
# Define the two RewriteMaps (key -> value store): one for Zope, one generic # Define the 3 RewriteMaps (key -> value store): one for Zope, one generic,
# one generic https only,
# containing: rewritten URL -> original URL (a.k.a VirtualHostBase in Zope) # containing: rewritten URL -> original URL (a.k.a VirtualHostBase in Zope)
RewriteMap apachemapzope txt:%(apachemapzope_path)s RewriteMap apachemapzope txt:%(apachemapzope_path)s
RewriteMap apachemapgeneric txt:%(apachemap_path)s RewriteMap apachemapgeneric txt:%(apachemap_path)s
RewriteMap apachemapgenerichttpsonly txt:%(apachemap_httpsonly_path)s
# Define another RewriteMap for Zope, containing: # Define another RewriteMap for Zope, containing:
# rewritten URL -> VirtualHostRoot # rewritten URL -> VirtualHostRoot
...@@ -123,21 +125,32 @@ Header append Vary User-Agent ...@@ -123,21 +125,32 @@ Header append Vary User-Agent
RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >"" RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
# We suppose that Apache listens to 443 (even indirectly thanks to things like iptables) # We suppose that Apache listens to 443 (even indirectly thanks to things like iptables)
RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P] RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
# Same for https only server
RewriteCond ${apachemapgenerichttpsonly:%%{SERVER_NAME}} >""
# We suppose that Apache listens to 443 (even indirectly thanks to things like iptables)
RewriteRule ^/(.*)$ ${apachemapgenerichttpsonly:%%{SERVER_NAME}}/$1 [L,P]
# If nothing exist : put a nice error # If nothing exist : put a nice error
ErrorDocument 404 /notfound.html ErrorDocument 404 /notfound.html
</VirtualHost> </VirtualHost>
# Only accept generic (i.e not Zope) backends on http
<VirtualHost *:%(plain_http_port)s> <VirtualHost *:%(plain_http_port)s>
RewriteEngine On
SSLProxyEngine on SSLProxyEngine on
# Rewrite part
ProxyVia On
ProxyPreserveHost On ProxyPreserveHost On
ProxyTimeout 600
RewriteEngine On
# Remove "Secure" from cookies, as backend may be https
Header edit Set-Cookie "(?i)^(.+);secure$" "$1"
# Include configuration file not operated by slapos. This file won't be erased # Include configuration file not operated by slapos. This file won't be erased
# or changed when slapgrid is ran. It can be freely customized by node admin. # or changed when slapgrid is ran. It can be freely customized by node admin.
Include %(custom_apache_virtualhost_conf)s Include %(custom_apache_virtualhost_conf)s
# We accept generic (i.e not lamp) backends on http
RewriteMap apachemapgeneric txt:%(apachemap_path)s RewriteMap apachemapgeneric txt:%(apachemap_path)s
RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >"" RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P] RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
...@@ -148,6 +161,7 @@ Header append Vary User-Agent ...@@ -148,6 +161,7 @@ Header append Vary User-Agent
RewriteRule ^/(.*)$ https://%%{SERVER_NAME}%%{REQUEST_URI} RewriteRule ^/(.*)$ https://%%{SERVER_NAME}%%{REQUEST_URI}
</VirtualHost> </VirtualHost>
# Include configuration file not operated by slapos. This file won't be erased # Include configuration file not operated by slapos. This file won't be erased
# or changed when slapgrid is ran. It can be freely customized by node admin. # or changed when slapgrid is ran. It can be freely customized by node admin.
Include %(custom_apache_conf)s Include %(custom_apache_conf)s
...@@ -107,7 +107,8 @@ class Recipe(GenericSlapRecipe): ...@@ -107,7 +107,8 @@ class Recipe(GenericSlapRecipe):
http_redirect_server = '' http_redirect_server = ''
config = dict( config = dict(
ip=self.options['ip'], ipv6=self.options['ipv6'],
ipv4=self.options['ipv4'],
port=self.options['port'], port=self.options['port'],
key=self.options['ssl-key-path'], key=self.options['ssl-key-path'],
certificate=self.options['ssl-cert-path'], certificate=self.options['ssl-cert-path'],
......
...@@ -37,12 +37,13 @@ var fs = require('fs'), ...@@ -37,12 +37,13 @@ var fs = require('fs'),
httpProxy = require('http-proxy'), httpProxy = require('http-proxy'),
proxyByUrl = require('proxy-by-url'); proxyByUrl = require('proxy-by-url');
var listenInterface = process.argv[2], var listenInterfacev6 = process.argv[2],
port = process.argv[3], listenInterfacev4 = process.argv[3],
sslKeyFile = process.argv[4], port = process.argv[4],
sslCertFile = process.argv[5], sslKeyFile = process.argv[5],
proxyTable = process.argv[6], sslCertFile = process.argv[6],
redirect = process.argv[7] || false, proxyTable = process.argv[7],
redirect = process.argv[8] || false,
isRawIPv6; isRawIPv6;
if (process.argv.length < 7) { if (process.argv.length < 7) {
...@@ -50,11 +51,6 @@ if (process.argv.length < 7) { ...@@ -50,11 +51,6 @@ if (process.argv.length < 7) {
process.exit(1); process.exit(1);
} }
isRawIPv6 = function checkipv6(str) {
// Inspired by http://forums.intermapper.com/viewtopic.php?t=452
return (/^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/.test(str));
}(listenInterface);
/** /**
* Dummy middleware that throws 404 not found. Does not contain websocket * Dummy middleware that throws 404 not found. Does not contain websocket
* middleware. * middleware.
...@@ -69,7 +65,7 @@ var middlewareNotFound = function(req, res, proxy) { ...@@ -69,7 +65,7 @@ var middlewareNotFound = function(req, res, proxy) {
/** /**
* Create server * Create server
*/ */
var proxyServer = httpProxy.createServer( var proxyServerv6 = httpProxy.createServer(
// We declare our proxyByUrl middleware // We declare our proxyByUrl middleware
proxyByUrl(proxyTable), proxyByUrl(proxyTable),
// Then we add your dummy middleware, called when proxyByUrl doesn't find url. // Then we add your dummy middleware, called when proxyByUrl doesn't find url.
...@@ -87,42 +83,70 @@ var proxyServer = httpProxy.createServer( ...@@ -87,42 +83,70 @@ var proxyServer = httpProxy.createServer(
) )
}, },
source: { source: {
host: listenInterface, host: listenInterfacev6,
port: port port: port
}} }}
); );
var proxyServerv4 = httpProxy.createServer(
// We declare our proxyByUrl middleware
proxyByUrl(proxyTable),
// Then we add your dummy middleware, called when proxyByUrl doesn't find url.
middlewareNotFound,
// And we set HTTPS options for server. HTTP will be forbidden.
{
https: {
key: fs.readFileSync(
sslKeyFile,
'utf8'
),
cert: fs.readFileSync(
sslCertFile,
'utf8'
)
},
source: {
host: listenInterfacev4,
port: port
}}
);
console.log('HTTPS server starting and trying to listen on ' + console.log('HTTPS server starting and trying to listen on ' +
listenInterface + ':' + port); listenInterfacev4 + ':' + port);
// Release the beast. // Release the beast.
proxyServer.listen(port, listenInterface); proxyServerv6.listen(port, listenInterfacev6);
proxyServerv4.listen(port, listenInterfacev4);
// Dummy HTTP server redirecting to HTTPS. Only has sense if we can use port 80 // Dummy HTTP server redirecting to HTTPS. Only has sense if we can use port 80
if (redirect === '1') { if (redirect === '1') {
console.log('HTTP redirect server starting and trying to listen on ' + console.log('HTTP redirect server starting and trying to listen on ' +
listenInterface + ':' + httpPort); listenInterface + ':' + httpPort);
try { /*
var httpPort = 80; *try {
http.createServer(function(req, res) { * var httpPort = 80;
var url; * http.createServer(function(req, res) {
if (isRawIPv6 === true) { * var url;
url = 'https://[' + listenInterface + ']'; * if (isRawIPv6 === true) {
} else { * url = 'https://[' + listenInterface + ']';
url = 'https://' + listenInterface; * } else {
} * url = 'https://' + listenInterface;
// If non standard port : need to specify it * }
if (port !== 443) { * // If non standard port : need to specify it
url = url + ':' + port; * if (port !== 443) {
} * url = url + ':' + port;
// Add last part of URL * }
url = url + req.url; * // Add last part of URL
console.log(url); * url = url + req.url;
// Anwser "permanently redirected" * console.log(url);
res.statusCode = 301; * // Anwser "permanently redirected"
res.setHeader('Location', url); * res.statusCode = 301;
res.end(); * res.setHeader('Location', url);
}).listen(httpPort, listenInterface); * res.end();
} catch (error) { * }).listen(httpPort, listenInterface);
console.log('Couldn\'t start plain HTTP redirection server : ' + error) * } catch (error) {
} * console.log('Couldn\'t start plain HTTP redirection server : ' + error)
* }
*/
} }
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
# BEWARE: This file is operated by slapgrid # BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically # BEWARE: It will be overwritten automatically
export NODE_PATH=%(node_env)s export NODE_PATH=%(node_env)s
exec %(node_path)s %(conf_path)s %(ip)s %(port)s %(key)s %(certificate)s %(map_path)s %(plain_http)s exec %(node_path)s %(conf_path)s %(ipv6)s %(ipv4)s %(port)s %(key)s %(certificate)s %(map_path)s %(plain_http)s
...@@ -35,6 +35,7 @@ class Recipe(GenericBaseRecipe): ...@@ -35,6 +35,7 @@ class Recipe(GenericBaseRecipe):
wrapper_path = self.options['wrapper-path'] wrapper_path = self.options['wrapper-path']
wait_files = self.options.get('wait-for-files') wait_files = self.options.get('wait-for-files')
environment = self.options.get('environment') environment = self.options.get('environment')
parameters_extra = self.options.get('parameters_extra')
if not wait_files and not environment: if not wait_files and not environment:
# Create a simple wrapper as shell script # Create a simple wrapper as shell script
...@@ -42,6 +43,7 @@ class Recipe(GenericBaseRecipe): ...@@ -42,6 +43,7 @@ class Recipe(GenericBaseRecipe):
name=wrapper_path, name=wrapper_path,
command=command_line[0], command=command_line[0],
parameters=command_line[1:], parameters=command_line[1:],
parameters_extra=parameters_extra,
)] )]
# More complex needs: create a Python script as wrapper # More complex needs: create a Python script as wrapper
......
...@@ -119,10 +119,13 @@ class Recipe(BaseSlapRecipe): ...@@ -119,10 +119,13 @@ class Recipe(BaseSlapRecipe):
# self.cron_d is a directory, where cron jobs can be registered # self.cron_d is a directory, where cron jobs can be registered
self.cron_d = self.installCrond() self.cron_d = self.installCrond()
self.logrotate_d, self.logrotate_backup = self.installLogrotate() self.logrotate_d, self.logrotate_backup = self.installLogrotate()
zabbix_agentd_conf = self.installZabbixAgentd(self.getGlobalIPv6Address(), zabbix_agentd_conf = self.installZabbixAgentd(
self.getGlobalIPv6Address(),
10050, 10050,
self.parameter_dict['hostname'], self.parameter_dict['hostname'],
self.parameter_dict['server']) self.parameter_dict['server'],
self.parameter_dict.get('custom-user-parameter', '')
)
self.setConnectionDict(dict(ip=zabbix_agentd_conf['ip'], self.setConnectionDict(dict(ip=zabbix_agentd_conf['ip'],
name=zabbix_agentd_conf['hostname'], name=zabbix_agentd_conf['hostname'],
port=str(zabbix_agentd_conf['port']))) port=str(zabbix_agentd_conf['port'])))
......
...@@ -118,6 +118,13 @@ Domain name to use as frontend. The frontend will be accessible from this domain ...@@ -118,6 +118,13 @@ Domain name to use as frontend. The frontend will be accessible from this domain
[instancereference].[masterdomain]. [instancereference].[masterdomain].
Example: www.mycustomdomain.com Example: www.mycustomdomain.com
https-only
~~~~~~~~~~
Specify if website should be accessed using https only. If so, the frontend
will redirect the user to https if accessed from http.
Possible values: "true", "false".
This is an optional parameter. Defaults to false.
path path
~~~~ ~~~~
Only used if type is "zope". Only used if type is "zope".
......
...@@ -3,6 +3,7 @@ extends = ...@@ -3,6 +3,7 @@ extends =
../../component/binutils/buildout.cfg ../../component/binutils/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/apache/buildout.cfg ../../component/apache/buildout.cfg
../../component/gzip/buildout.cfg
../../component/stunnel/buildout.cfg ../../component/stunnel/buildout.cfg
../../component/varnish/buildout.cfg ../../component/varnish/buildout.cfg
../../component/dcron/buildout.cfg ../../component/dcron/buildout.cfg
...@@ -38,14 +39,15 @@ recipe = zc.recipe.egg ...@@ -38,14 +39,15 @@ recipe = zc.recipe.egg
eggs = ${instance-recipe:egg} eggs = ${instance-recipe:egg}
[eggs] [eggs]
recipe = zc.recipe.egg recipe = z3c.recipe.scripts
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
slapos.toolbox
[template] [template]
# Default template for apache instance. # Default template for apache instance.
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
md5sum = fea902a2b9dbf8c80ff201bcf73f9396 md5sum = e7b9f57da7eb1450fc15789e239388d4
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
[buildout] [buildout]
parts = parts =
directory directory
instance apache
configtest configtest
logrotate
logrotate-entry-apache
eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
...@@ -10,15 +12,23 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} ...@@ -10,15 +12,23 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
# Create all needed directories # Create all needed directories
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
bin = $${buildout:directory}/bin/
etc = $${buildout:directory}/etc/ etc = $${buildout:directory}/etc/
var = $${buildout:directory}/var/
srv = $${buildout:directory}/srv/ srv = $${buildout:directory}/srv/
bin = $${buildout:directory}/bin/ var = $${buildout:directory}/var/
backup = $${:srv}/backup
log = $${:var}/log
run = $${:var}/run
service = $${:etc}/service service = $${:etc}/service
logrotate-backup = $${:backup}/logrotate
logrotate-entries = $${:etc}/logrotate.d
# Deploy Apache (old way, with monolithic recipe) # Deploy Apache (old way, with monolithic recipe)
[instance] [apache]
recipe = ${instance-recipe:egg}:${instance-recipe:module} recipe = ${instance-recipe:egg}:${instance-recipe:module}
httpd_home = ${apache-2.2:location} httpd_home = ${apache-2.2:location}
httpd_binary = ${apache-2.2:location}/bin/httpd httpd_binary = ${apache-2.2:location}/bin/httpd
...@@ -31,9 +41,40 @@ rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup ...@@ -31,9 +41,40 @@ rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
gcc_binary = gcc gcc_binary = gcc
binutils_directory = ${binutils:location}/bin/ binutils_directory = ${binutils:location}/bin/
access-log = $${directory:log}/frontend-apache-access.log
error-log = $${directory:log}/frontend-apache-error.log
pid-file = $${directory:run}/httpd.pid
# Create wrapper for "apachectl conftest" in bin # Create wrapper for "apachectl conftest" in bin
[configtest] [configtest]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${instance:httpd_binary} -f $${directory:etc}/apache_frontend.conf -t command-line = $${apache:httpd_binary} -f $${directory:etc}/apache_frontend.conf -t
output = $${directory:bin}/apache-configtest wrapper-path = $${directory:bin}/apache-configtest
# Deploy Logrotate
[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 = $${directory:bin}/logrotate
conf = $${directory:etc}/logrotate.conf
logrotate-entries = $${directory:logrotate-entries}
backup = $${directory:logrotate-backup}
state-file = $${directory:srv}/logrotate.status
[logrotate-entry-apache]
<= logrotate
recipe = slapos.cookbook:logrotate.d
name = apache
log = $${apache:error-log} $${apache:access-log}
frequency = daily
rotate-num = 30
post = ${buildout:bin-directory}/killpidfromfile $${apache:pid-file} SIGUSR1
sharedscripts = true
notifempty = true
create = true
...@@ -4,67 +4,101 @@ extends = common.cfg ...@@ -4,67 +4,101 @@ extends = common.cfg
[versions] [versions]
Jinja2 = 2.6 Jinja2 = 2.6
Werkzeug = 0.8.3 Werkzeug = 0.8.3
apache-libcloud = 0.12.3
async = 0.6.1
buildout-versions = 1.7 buildout-versions = 1.7
hexagonit.recipe.cmmi = 1.6 gitdb = 0.5.4
hexagonit.recipe.cmmi = 2.0
meld3 = 0.6.10 meld3 = 0.6.10
pycrypto = 2.6
rdiff-backup = 1.0.5 rdiff-backup = 1.0.5
slapos.cookbook = 0.71.1 slapos.recipe.build = 0.11.6
slapos.recipe.build = 0.11.5 slapos.recipe.cmmi = 0.1
slapos.recipe.template = 2.4.2 slapos.recipe.template = 2.4.2
slapos.toolbox = 0.34.0
smmap = 0.8.2
z3c.recipe.scripts = 1.0.1
# Required by: # Required by:
# slapos.core==0.33.1 # slapos.core==0.35.1
# slapos.toolbox==0.34.0
Flask = 0.9 Flask = 0.9
# Required by: # Required by:
# hexagonit.recipe.cmmi==1.6 # slapos.toolbox==0.34.0
hexagonit.recipe.download = 1.6nxd002 GitPython = 0.3.2.RC1
# Required by: # Required by:
# slapos.cookbook==0.71.1 # slapos.toolbox==0.34.0
atomize = 0.1.1
# Required by:
# slapos.toolbox==0.34.0
feedparser = 5.1.3
# Required by:
# slapos.cookbook==0.77.1
inotifyx = 0.2.0 inotifyx = 0.2.0
# Required by: # Required by:
# slapos.cookbook==0.71.1 # slapos.cookbook==0.77.1
# slapos.core==0.33.1 # slapos.core==0.35.1
# xml-marshaller==0.9.7 # xml-marshaller==0.9.7
lxml = 3.0.2 lxml = 3.1.2
# Required by: # Required by:
# slapos.cookbook==0.71.1 # slapos.cookbook==0.77.1
netaddr = 0.7.10 netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.33.1 # slapos.core==0.35.1
netifaces = 0.8 netifaces = 0.8
# Required by: # Required by:
# slapos.cookbook==0.71.1 # slapos.toolbox==0.34.0
pytz = 2012j paramiko = 1.10.1
# Required by: # Required by:
# slapos.cookbook==0.71.1 # slapos.toolbox==0.34.0
# slapos.core==0.33.1 psutil = 0.7.0
# Required by:
# slapos.core==0.35.1
pyflakes = 0.7
# Required by:
# slapos.cookbook==0.77.1
pytz = 2013b
# Required by:
# slapos.cookbook==0.77.1
# slapos.core==0.35.1
# slapos.toolbox==0.34.0
# zc.buildout==1.6.0-dev-SlapOS-010 # zc.buildout==1.6.0-dev-SlapOS-010
# zc.recipe.egg==1.3.2 # zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846 setuptools = 0.6c12dev-r88846
# Required by: # Required by:
# slapos.cookbook==0.71.1 # slapos.cookbook==0.77.1
slapos.core = 0.33.1 # slapos.toolbox==0.34.0
slapos.core = 0.35.1
# Required by: # Required by:
# slapos.core==0.33.1 # slapos.core==0.35.1
supervisor = 3.0b1 supervisor = 3.0b1
# Required by: # Required by:
# slapos.cookbook==0.71.1 # slapos.core==0.35.1
xml-marshaller = 0.9.7 unittest2 = 0.5.1
# Required by: # Required by:
# slapos.core==0.33.1 # slapos.cookbook==0.77.1
zope.interface = 4.0.3 # slapos.toolbox==0.34.0
xml-marshaller = 0.9.7
# Required by:
# slapos.core==0.35.1
zope.interface = 4.0.5
[networkcache] [networkcache]
# signature certificates of the following uploaders. # signature certificates of the following uploaders.
......
#############################
#
# Deploy jio instance
#
#############################
[buildout]
parts =
test-runner
phantomjs-wrapper
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
# Create all needed directories, depending on your needs
[directory]
recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc
script = $${:etc}/run/
service = $${:etc}/service
promise = $${:etc}/promise/
bin = $${buildout:directory}/bin/
[download-source]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
# Local development
[jio]
<= download-source
repository = ${jio-repository:location}
[test-runner]
recipe = slapos.cookbook:egg_test
run-test-suite = $${directory:bin}/runTestSuite
run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
test-list =
$${jio:location}
prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin:${buildout:bin-directory}
environment = environment
[environment]
CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -L${fontconfig:location}/lib -L${libexpat:location}/lib -L${freetype:location}/lib
PYTHONPATH = ${python-setuptools:location}
LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${libexpat:location}/lib:${freetype:location}/lib
[phantomjs-wrapper]
recipe = slapos.cookbook:wrapper
command-line = ${phantomjs:location}/bin/phantomjs
wrapper-path = $${directory:bin}/phantomjs
parameters_extra = true
\ No newline at end of file
[buildout]
extends =
../../stack/slapos.cfg
../../component/git/buildout.cfg
../../component/phantomjs/buildout.cfg
../../component/git/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/python-setuptools/buildout.cfg
# Local development
develop =
${:parts-directory}/slapos.cookbook-repository
parts =
slapos.cookbook-repository
slapos-cookbook
template
phantomjs
eggs
[eggs]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
slapos.cookbook
erp5.util
collective.recipe.template
entry-points =
runTestSuite=erp5.util.testsuite:runTestSuite
scripts =
runTestSuite
# Local development until new egg is published (extra parameters to slapos.cookbook:wrapper
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
forbid-download-cache = true
repository = http://git.erp5.org/repos/slapos.git
branch = master
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
# MD5 checksum can be skipped for development, but must be filled for production
md5sum = 1ef1bc6a3fb81300ce7139c512af96d7
mode = 0644
[jio-repository]
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
forbid-download-cache = true
repository = http://git.erp5.org/repos/jio.git
branch = master
[versions]
Jinja2 = 2.6
Werkzeug = 0.8.3
buildout-versions = 1.7
collective.recipe.template = 1.10
erp5.util = 0.4.34
hexagonit.recipe.cmmi = 2.0
lxml = 3.1.1
meld3 = 0.6.10
plone.recipe.command = 1.1
psutil = 0.6.1
slapos.cookbook = 0.76.0
slapos.recipe.build = 0.11.6
slapos.recipe.template = 2.4.2
# Required by:
# slapos.core==0.35.1
Flask = 0.9
# Required by:
# slapos.cookbook==0.76.0
inotifyx = 0.2.0
# Required by:
# slapos.cookbook==0.76.0
netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.8
# Required by:
# slapos.core==0.35.1
pyflakes = 0.6.1
# Required by:
# slapos.cookbook==0.76.0
pytz = 2013b
# Required by:
# collective.recipe.template==1.10
# erp5.util==0.4.33
# hexagonit.recipe.download==1.6nxd002
# slapos.cookbook==0.76.0
# slapos.core==0.35.1
# supervisor==3.0b1
# zc.buildout==1.6.0-dev-SlapOS-010
# zope.interface==4.0.5
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.cookbook==0.76.0
slapos.core = 0.35.1
# Required by:
# slapos.core==0.35.1
supervisor = 3.0b1
# Required by:
# slapos.core==0.35.1
unittest2 = 0.5.1
# Required by:
# slapos.cookbook==0.76.0
xml-marshaller = 0.9.7
# Required by:
# slapos.core==0.35.1
zope.interface = 4.0.5
...@@ -56,6 +56,7 @@ recipe = plone.recipe.command ...@@ -56,6 +56,7 @@ recipe = plone.recipe.command
destination = ${buildout:parts-directory}/${:_buildout_section_name_} destination = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = command =
export HOME=${:location};
rm -fr ${:destination} && rm -fr ${:destination} &&
mkdir -p ${:destination} && mkdir -p ${:destination} &&
cd ${:destination} && cd ${:destination} &&
...@@ -69,17 +70,10 @@ command = ...@@ -69,17 +70,10 @@ command =
[template-kvm] [template-kvm]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-kvm.cfg.in url = ${:_profile_base_location_}/instance-kvm.cfg.in
md5sum = c0320447308299ec9caaeece4187bc1f md5sum = 87197471aa93863c310204e8865b5ac1
output = ${buildout:directory}/template-kvm.cfg output = ${buildout:directory}/template-kvm.cfg
mode = 0644 mode = 0644
[template-kvmplus]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-kvmplus.cfg.in
md5sum = c8e92237eeda93caca1132b5202c3a02
output = ${buildout:directory}/template-kvmplus.cfg
mode = 0644
[template-nbd] [template-nbd]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-nbd.cfg.in url = ${:_profile_base_location_}/instance-nbd.cfg.in
...@@ -90,13 +84,13 @@ mode = 0644 ...@@ -90,13 +84,13 @@ mode = 0644
[template-frontend] [template-frontend]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-frontend.cfg.in url = ${:_profile_base_location_}/instance-frontend.cfg.in
md5sum = 73359b52013b1b65f75005e8698ed180 md5sum = cdb690495e9eb007d2b7d2f8e12f5c59
output = ${buildout:directory}/template-frontend.cfg output = ${buildout:directory}/template-frontend.cfg
mode = 0644 mode = 0644
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in url = ${:_profile_base_location_}/instance.cfg.in
md5sum = 68788763d23f70f24b9e575871c903a8 md5sum = 0a98e34aaec7097a84066c0665e3a49a
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
[buildout] [buildout]
extends = extends =
../../git/buildout.cfg ../../component/git/buildout.cfg
common.cfg common.cfg
parts += parts +=
slapos.cookbook-repository slapos.cookbook-repository
slapos.core-repository
slapos.toolbox-repository slapos.toolbox-repository
check-recipe check-recipe
develop = develop =
${:parts-directory}/slapos.cookbook-repository ${:parts-directory}/slapos.cookbook-repository
${:parts-directory}/slapos.toolbox-repository
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = http://git.erp5.org/repos/slapos.git
branch = slaprunner branch = kvm
git-executable = ${git:location}/bin/git
[slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git
branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
[check-recipe] [check-recipe]
...@@ -24,3 +30,4 @@ stop-on-error = true ...@@ -24,3 +30,4 @@ stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link && grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
...@@ -11,7 +11,8 @@ parts = ...@@ -11,7 +11,8 @@ parts =
cron-entry-logrotate cron-entry-logrotate
ca-frontend ca-frontend
certificate-authority certificate-authority
frontend-promise frontend-promise-ipv6
frontend-promise-ipv4
eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
...@@ -47,7 +48,8 @@ logrotate-entries = $${rootdirectory:etc}/logrotate.d ...@@ -47,7 +48,8 @@ logrotate-entries = $${rootdirectory:etc}/logrotate.d
recipe = slapos.cookbook:kvm.frontend recipe = slapos.cookbook:kvm.frontend
domain = $${ca-frontend:name} domain = $${ca-frontend:name}
# port = $${slap-parameter:port} # port = $${slap-parameter:port}
ip = $${slap-network-information:local-ipv4} ipv6 = $${slap-network-information:global-ipv6}
ipv4 = $${slap-network-information:local-ipv4}
port = $${slap-parameter:port} port = $${slap-parameter:port}
http-redirection = $${slap-parameter:http-redirection} http-redirection = $${slap-parameter:http-redirection}
ssl-key-path = $${ca-frontend:key-file} ssl-key-path = $${ca-frontend:key-file}
...@@ -60,10 +62,16 @@ node-binary = ${nodejs:location}/bin/node ...@@ -60,10 +62,16 @@ node-binary = ${nodejs:location}/bin/node
node-env = ${buildout:parts-directory}:${npm-modules:location}/node_modules node-env = ${buildout:parts-directory}:${npm-modules:location}/node_modules
shell-path = ${dash:location}/bin/dash shell-path = ${dash:location}/bin/dash
[frontend-promise] [frontend-promise-ipv6]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${basedirectory:promises}/frontend_promise path = $${basedirectory:promises}/frontend_promise
hostname = $${frontend-instance:ip} hostname = $${frontend-instance:ipv6}
port = $${frontend-instance:port}
[frontend-promise-ipv4]
recipe = slapos.cookbook:check_port_listening
path = $${basedirectory:promises}/frontend_promise
hostname = $${frontend-instance:ipv4}
port = $${frontend-instance:port} port = $${frontend-instance:port}
[certificate-authority] [certificate-authority]
...@@ -133,6 +141,7 @@ state-file = $${rootdirectory:srv}/logrotate.status ...@@ -133,6 +141,7 @@ state-file = $${rootdirectory:srv}/logrotate.status
# Default value if no port is specified # Default value if no port is specified
port = 4443 port = 4443
http-redirection = 0 http-redirection = 0
slave_instance_list =
# [logrotate-entry-frontend] # [logrotate-entry-frontend]
# <= logrotate # <= logrotate
......
...@@ -36,7 +36,7 @@ storage-path = $${directory:srv}/mac ...@@ -36,7 +36,7 @@ storage-path = $${directory:srv}/mac
[gen-passwd] [gen-passwd]
recipe = slapos.cookbook:generate.password recipe = slapos.cookbook:generate.password
storage-path = $${directory:srv}/passwd storage-path = $${directory:srv}/passwd
bytes = 4 bytes = 8
[kvm-instance] [kvm-instance]
# XXX-Cedric: change "KVM" recipe to simple "create wrappers". No need for this # XXX-Cedric: change "KVM" recipe to simple "create wrappers". No need for this
...@@ -135,7 +135,7 @@ key-file = $${slap-connection:key-file} ...@@ -135,7 +135,7 @@ key-file = $${slap-connection:key-file}
cert-file = $${slap-connection:cert-file} cert-file = $${slap-connection:cert-file}
computer-id = $${slap-connection:computer-id} computer-id = $${slap-connection:computer-id}
partition-id = $${slap-connection:partition-id} partition-id = $${slap-connection:partition-id}
name = SlaveFrontend name = VNC Frontend
software-type = $${slap-parameter:frontend-software-type} software-type = $${slap-parameter:frontend-software-type}
slave = true slave = true
config = host port config = host port
...@@ -162,7 +162,6 @@ curl_path = ${curl:location}/bin/curl ...@@ -162,7 +162,6 @@ curl_path = ${curl:location}/bin/curl
[slap-parameter] [slap-parameter]
# Default values if not specified # Default values if not specified
frontend-instance-guid = SOFTINST-11031
frontend-software-type = frontend frontend-software-type = frontend
frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg
......
#############################
#
# Instanciate kvm+
#
#############################
# Deprecated. Just specify amount of RAM / disk you want in instance parameter.
[buildout]
extends = ${template-kvm:output}
[slap-parameter]
ram-size = 2048
disk-size = 20
\ No newline at end of file
...@@ -10,7 +10,6 @@ offline = true ...@@ -10,7 +10,6 @@ offline = true
recipe = slapos.cookbook:softwaretype recipe = slapos.cookbook:softwaretype
default = ${template-kvm:output} default = ${template-kvm:output}
kvm = ${template-kvm:output} kvm = ${template-kvm:output}
kvm+ = ${template-kvmplus:output}
nbd = ${template-nbd:output} nbd = ${template-nbd:output}
frontend = ${template-frontend:output} frontend = ${template-frontend:output}
......
...@@ -392,6 +392,7 @@ initialization = ...@@ -392,6 +392,7 @@ initialization =
sys.path[:0] = sum(( sys.path[:0] = sum((
glob.glob(os.path.join(x, 'Products', '*', 'tests')) glob.glob(os.path.join(x, 'Products', '*', 'tests'))
for x in os.getenv('INSERT_PRODUCTS_PATH', '').split(os.pathsep)), []) for x in os.getenv('INSERT_PRODUCTS_PATH', '').split(os.pathsep)), [])
os.environ['CGI_PATH'] = '${w3-validator:location}/httpd/cgi-bin'
[test_suite_runner] [test_suite_runner]
# XXX: Workaround for fact ERP5Type is not an distribution and does not # XXX: Workaround for fact ERP5Type is not an distribution and does not
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
[buildout] [buildout]
# Developers need to add explicitely this part in their software profile # Developers need to add explicitely this part in their software profile
parts = slapos-cookbook # parts = slapos-cookbook
# Generate list of automatically chosen eggs version # Generate list of automatically chosen eggs version
extensions += extensions +=
...@@ -72,8 +72,10 @@ eggs = ...@@ -72,8 +72,10 @@ eggs =
zc.buildout = 1.6.0-dev-SlapOS-010 zc.buildout = 1.6.0-dev-SlapOS-010
# Use xz-friendly hexagonit.recipe.download # Use xz-friendly hexagonit.recipe.download
hexagonit.recipe.download = 1.6nxd002 hexagonit.recipe.download = 1.6nxd002
# zc.recipe.egg 2.0.0a is buggy # zc.recipe.egg 2.x is for Buildout 2
zc.recipe.egg = 1.3.2 zc.recipe.egg = 1.3.2
# Use own version of h.r.download to be able to open xz-like archives
hexagonit.recipe.download = 1.6nxd002
[networkcache] [networkcache]
download-cache-url = http://www.shacache.org/shacache download-cache-url = http://www.shacache.org/shacache
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment