Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
106
Merge Requests
106
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
89d3c7a4
Commit
89d3c7a4
authored
Feb 15, 2013
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revove unused apache module, rename env to environment in librecipe
parent
ddd14a3a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
9 deletions
+5
-9
slapos/recipe/apachephp/__init__.py
slapos/recipe/apachephp/__init__.py
+1
-1
slapos/recipe/apachephp/template/apache.in
slapos/recipe/apachephp/template/apache.in
+0
-4
slapos/recipe/librecipe/generic.py
slapos/recipe/librecipe/generic.py
+4
-4
No files found.
slapos/recipe/apachephp/__init__.py
View file @
89d3c7a4
...
...
@@ -99,7 +99,7 @@ class Recipe(GenericBaseRecipe):
self
.
options
[
'httpd-conf'
],
'-DFOREGROUND'
],
env
=
self
.
environ
)
env
ironment
=
self
.
environ
)
path_list
.
append
(
wrapper
)
secret_key_filename
=
os
.
path
.
join
(
self
.
buildout
[
'buildout'
][
'directory'
],
...
...
slapos/recipe/apachephp/template/apache.in
View file @
89d3c7a4
...
...
@@ -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
View file @
89d3c7a4
...
...
@@ -128,7 +128,7 @@ class GenericBaseRecipe(object):
return
script
def
createWrapper
(
self
,
name
,
command
,
parameters
,
comments
=
[],
parameters_extra
=
False
,
env
=
None
):
parameters_extra
=
False
,
env
ironment
=
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
env
ironment
:
for
key
in
env
ironment
:
lines
.
append
(
'export %s=%s'
%
(
key
,
env
ironment
[
key
]))
lines
.
append
(
'exec %s'
%
shlex
.
quote
(
command
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment