From 7e8b20a5ae900d0f518d58da1acf68515923fe4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Tue, 31 Jan 2012 10:45:50 +0100 Subject: [PATCH] Update lamp-template to work with tutorials --- software/lamp-template/instance.cfg | 4 ++-- software/lamp-template/software.cfg | 2 +- software/lamp-template/template/phpmyadmin.inc.php.in | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/software/lamp-template/instance.cfg b/software/lamp-template/instance.cfg index bf66021a3..fffebea8f 100644 --- a/software/lamp-template/instance.cfg +++ b/software/lamp-template/instance.cfg @@ -7,8 +7,8 @@ parts = instance [instance] recipe = ${instance-recipe:egg}:${instance-recipe:module} source = ${application:location} -#template = ${application-template:location}/${application-template:filename} -#configuration = ${application-configuration:location} +template = ${application-template:location}/${application-template:filename} +configuration = ${application-configuration:location} httpd_binary = ${apache:location}/bin/httpd mysql_binary = ${mariadb:location}/bin/mysql diff --git a/software/lamp-template/software.cfg b/software/lamp-template/software.cfg index eb1084fa8..a27faf278 100644 --- a/software/lamp-template/software.cfg +++ b/software/lamp-template/software.cfg @@ -61,7 +61,7 @@ buildout-versions = 1.7 hexagonit.recipe.cmmi = 1.5.0 meld3 = 0.6.8 plone.recipe.command = 1.1 -slapos.cookbook = 0.38 +slapos.cookbook = 0.20 slapos.recipe.build = 0.7 slapos.recipe.download = 1.0.dev-r4053 slapos.recipe.template = 2.2 diff --git a/software/lamp-template/template/phpmyadmin.inc.php.in b/software/lamp-template/template/phpmyadmin.inc.php.in index 0c39feef3..0b2354f35 100644 --- a/software/lamp-template/template/phpmyadmin.inc.php.in +++ b/software/lamp-template/template/phpmyadmin.inc.php.in @@ -1,7 +1,7 @@ <?php $cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ -$i = 0; -$i++; +$i = 1; + /* Server parameters */ $cfg['Servers'][$i]['host'] = 'Put here mysql host template key'; $cfg['Servers'][$i]['port'] = 'Put here mysql port template key'; -- 2.30.9