Update lamp: resolution of some inconsistency

slapos/recipe/lamp/__init__.py

@@ -167,16 +167,16 @@ class BaseRecipe(BaseSlapRecipe):
     rename_list = ""
     argument = [self.options['lampconfigure_directory'].strip()]
     if not self.options.has_key('file_token'):
-      argument = argument + ["-d", mysql_conf['mysql_database'], 
-                             "-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'], 
-                             "-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user'], 
-                             "--table", self.options['table_name'].strip(), "--cond", 
+      argument = argument + ["-d", mysql_conf['mysql_database'],
+                             "-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'],
+                             "-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user'],
+                             "--table", self.options['table_name'].strip(), "--cond",
                              self.options['constraint'].strip()]
     else:
       argument = argument + ["-f", self.options['file_token'].strip()]
     argument += ["-t", document_root]
     
-    if self.options.has_key('delete'):      
+    if self.options.has_key('delete'):
       delete = ["delete"]
       for fname in self.options['delete'].split(','):
         delete.append(fname.strip())
@@ -194,7 +194,7 @@ class BaseRecipe(BaseSlapRecipe):
           cmd += ["--chmod", self.options['rename_chmod'].strip()]
         rename.append(cmd + [fname[0].strip(), fname[1].strip()])
         rename_list += fname[0] + "=>" + fname[1] + " "
-    if self.options.has_key('chmod'):      
+    if self.options.has_key('chmod'):
       chmod = ["chmod ", self.options['mode'].strip()]
       for fname in self.options['chmod'].split(','):
         chmod.append(fname.strip())

software/zencart/template/zencart.inc.php.in

-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-
-?>