Revove unused apache module, rename env to environment in librecipe

slapos/recipe/apachephp/__init__.py

@@ -99,7 +99,7 @@ class Recipe(GenericBaseRecipe):
                                      self.options['httpd-conf'],
                                      '-DFOREGROUND'
                                      ],
-                                 env=self.environ)
+                                 environment=self.environ)
     path_list.append(wrapper)
 
     secret_key_filename = os.path.join(self.buildout['buildout']['directory'],

slapos/recipe/apachephp/template/apache.in

@@ -54,7 +54,3 @@ LoadModule headers_module modules/mod_headers.so
 LoadModule dir_module modules/mod_dir.so
 LoadModule php5_module modules/libphp5.so
 LoadModule alias_module modules/mod_alias.so
-LoadModule auth_basic_module modules/mod_auth_basic.so
-LoadModule authz_user_module modules/mod_authz_user.so
-LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule authn_core_module modules/mod_authn_core.so

slapos/recipe/librecipe/generic.py

@@ -128,7 +128,7 @@ class GenericBaseRecipe(object):
     return script
 
   def createWrapper(self, name, command, parameters, comments=[],
-        parameters_extra=False, env=None):
+        parameters_extra=False, environment=None):
     """
     Creates a very simple (one command) shell script for process replacement.
     Takes care of quoting.
@@ -139,9 +139,9 @@ class GenericBaseRecipe(object):
     for comment in comments:
       lines.append('# %s' % comment)
 
-    if env:
-      for key in env:
-        lines.append('export %s=%s' % (key, env[key]))
+    if environment:
+      for key in environment:
+        lines.append('export %s=%s' % (key, environment[key]))
 
     lines.append('exec %s' % shlex.quote(command))