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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Lorenzo Martinico
slapos
Commits
5d0dfed4
Commit
5d0dfed4
authored
May 26, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Call zc.recipe.egg correctly.
Initialise once with slapos.recipebox. Do not use extras, as not required.
parent
3cd289f9
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
9 deletions
+5
-9
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/__init__.py
+1
-1
slapos/recipe/erp5testnode/__init__.py
slapos/recipe/erp5testnode/__init__.py
+1
-1
slapos/recipe/librecipe.py
slapos/recipe/librecipe.py
+1
-0
slapos/recipe/slaprunner/__init__.py
slapos/recipe/slaprunner/__init__.py
+0
-5
slapos/recipe/testnode/__init__.py
slapos/recipe/testnode/__init__.py
+1
-1
slapos/recipe/vifib.py
slapos/recipe/vifib.py
+1
-1
No files found.
slapos/recipe/erp5/__init__.py
View file @
5d0dfed4
...
@@ -46,7 +46,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -46,7 +46,7 @@ class Recipe(BaseSlapRecipe):
def
_install
(
self
):
def
_install
(
self
):
self
.
path_list
=
[]
self
.
path_list
=
[]
self
.
requirements
,
self
.
ws
=
self
.
egg
.
working_set
(
[
__name__
]
)
self
.
requirements
,
self
.
ws
=
self
.
egg
.
working_set
()
# self.cron_d is a directory, where cron jobs can be registered
# self.cron_d is a directory, where cron jobs can be registered
self
.
cron_d
=
self
.
installCrond
()
self
.
cron_d
=
self
.
installCrond
()
self
.
logrotate_d
,
self
.
logrotate_backup
=
self
.
installLogrotate
()
self
.
logrotate_d
,
self
.
logrotate_backup
=
self
.
installLogrotate
()
...
...
slapos/recipe/erp5testnode/__init__.py
View file @
5d0dfed4
...
@@ -159,7 +159,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -159,7 +159,7 @@ class Recipe(BaseSlapRecipe):
os
.
symlink
(
destination
,
link
)
os
.
symlink
(
destination
,
link
)
def
_install
(
self
):
def
_install
(
self
):
self
.
requirements
,
self
.
ws
=
self
.
egg
.
working_set
(
[
__name__
]
)
self
.
requirements
,
self
.
ws
=
self
.
egg
.
working_set
()
self
.
path_list
=
[]
self
.
path_list
=
[]
self
.
installSlapOs
()
self
.
installSlapOs
()
self
.
setupRunningWrapper
()
self
.
setupRunningWrapper
()
...
...
slapos/recipe/librecipe.py
View file @
5d0dfed4
...
@@ -39,6 +39,7 @@ class BaseSlapRecipe:
...
@@ -39,6 +39,7 @@ class BaseSlapRecipe:
def
__init__
(
self
,
buildout
,
name
,
options
):
def
__init__
(
self
,
buildout
,
name
,
options
):
"""Default initialisation"""
"""Default initialisation"""
self
.
name
=
name
self
.
name
=
name
options
[
'eggs'
]
=
'slapos.recipebox'
self
.
options
=
options
self
.
options
=
options
self
.
logger
=
logging
.
getLogger
(
self
.
name
)
self
.
logger
=
logging
.
getLogger
(
self
.
name
)
self
.
slap
=
slap
.
slap
()
self
.
slap
=
slap
.
slap
()
...
...
slapos/recipe/slaprunner/__init__.py
View file @
5d0dfed4
...
@@ -33,11 +33,6 @@ import zc.recipe.egg
...
@@ -33,11 +33,6 @@ import zc.recipe.egg
class
Recipe
(
BaseSlapRecipe
):
class
Recipe
(
BaseSlapRecipe
):
def
__init__
(
self
,
buildout
,
name
,
options
):
BaseSlapRecipe
.
__init__
(
self
,
buildout
,
name
,
options
)
options
[
'eggs'
]
=
'slapos.recipe.slaprunner'
self
.
egg
=
zc
.
recipe
.
egg
.
Scripts
(
buildout
,
name
,
options
)
def
_install
(
self
):
def
_install
(
self
):
self
.
path_list
=
[]
self
.
path_list
=
[]
self
.
requirements
,
self
.
ws
=
self
.
egg
.
working_set
()
self
.
requirements
,
self
.
ws
=
self
.
egg
.
working_set
()
...
...
slapos/recipe/testnode/__init__.py
View file @
5d0dfed4
...
@@ -187,7 +187,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -187,7 +187,7 @@ class Recipe(BaseSlapRecipe):
return
self
.
path_list
return
self
.
path_list
def
_install
(
self
):
def
_install
(
self
):
self
.
requirements
,
self
.
ws
=
self
.
egg
.
working_set
(
[
__name__
]
)
self
.
requirements
,
self
.
ws
=
self
.
egg
.
working_set
()
self
.
path_list
=
[]
self
.
path_list
=
[]
self
.
installSlapOs
()
self
.
installSlapOs
()
self
.
installLocalZip
()
self
.
installLocalZip
()
...
...
slapos/recipe/vifib.py
View file @
5d0dfed4
...
@@ -246,7 +246,7 @@ SSLCARevocationPath %(ca_crl)s"""
...
@@ -246,7 +246,7 @@ SSLCARevocationPath %(ca_crl)s"""
self
.
site_check_path
=
'/%s/getId'
%
self
.
site_id
self
.
site_check_path
=
'/%s/getId'
%
self
.
site_id
self
.
key_auth_path
=
'/%s/portal_slap'
%
self
.
site_id
self
.
key_auth_path
=
'/%s/portal_slap'
%
self
.
site_id
self
.
path_list
=
[]
self
.
path_list
=
[]
self
.
requirements
,
self
.
ws
=
self
.
egg
.
working_set
(
[
__name__
]
)
self
.
requirements
,
self
.
ws
=
self
.
egg
.
working_set
()
# self.cron_d is a directory, where cron jobs can be registered
# self.cron_d is a directory, where cron jobs can be registered
self
.
cron_d
=
self
.
installCrond
()
self
.
cron_d
=
self
.
installCrond
()
self
.
logrotate_d
,
self
.
logrotate_backup
=
self
.
installLogrotate
()
self
.
logrotate_d
,
self
.
logrotate_backup
=
self
.
installLogrotate
()
...
...
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