Merge branch 'lamp' into master:
authorAlain Takoudjou <talino@tiolive.com>
Thu, 20 Oct 2011 14:29:00 +0000 (15:29 +0100)
committerAlain Takoudjou <talino@tiolive.com>
Thu, 20 Oct 2011 14:29:00 +0000 (15:29 +0100)
commita7886396315605f1a5951a2ea7780b9651c58a7c
tree86f24d8ca5fa7e345e5c872d129b9799828d22d3
parent5676ddf8581e0028ed7718d9f7af7bc150ffae62
Merge branch 'lamp' into master:

commit 9486fa3d33ed70722df0ab78cf0d60f4b1bcab4b
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 12:51:52 2011 +0100

    Add documentation for lamp recipe

commit cb684d1170c04ff6ad193b25fb181c71ccded042
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 11:07:40 2011 +0100

    Add PunBB [Forum] software release

commit 1b2209ee64fea3854c4a8d0f9c7be1badaf2addb
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 10:24:25 2011 +0100

    Add B2evolution [blog] software release

commit adf2972b4678b47ef8b4debdeecaf08536d131d3
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 10:19:01 2011 +0100

    Restore lamp-template/software.cfg after the merge of lamp with master

commit 9b07d7c1a64b6ff346bfe444664787ff60886033
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Wed Oct 19 15:35:46 2011 +0100

    Restore lamp.cfg

commit 4804e7aa0c1f99aad61732955f9da4a486f6aed0
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Wed Oct 19 15:31:37 2011 +0100

    Add comment and fix indentation
slapos/recipe/README.lamp.txt [new file with mode: 0644]
slapos/recipe/lamp/__init__.py
slapos/recipe/lamp/runner.py
software/b2evolution/instance.cfg [new file with mode: 0644]
software/b2evolution/software.cfg [copied from software/lamp-template/software.cfg with 65% similarity]
software/b2evolution/template/b2evolution.inc.php.in [new file with mode: 0644]
software/lamp-template/software.cfg
software/punbb/instance.cfg [new file with mode: 0644]
software/punbb/software.cfg [copied from software/lamp-template/software.cfg with 71% similarity]
software/punbb/template/punbb.inc.php.in [new file with mode: 0644]
stack/lamp.cfg