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
Gwenaël Samain
slapos
Commits
2af0d2de
Commit
2af0d2de
authored
Jan 09, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/wprtubackup' into kvm
parents
dfd766cf
d9c14ee5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
10 deletions
+1
-10
slapos/recipe/librecipe/genericslap.py
slapos/recipe/librecipe/genericslap.py
+0
-9
slapos/recipe/softwaretype.py
slapos/recipe/softwaretype.py
+1
-1
No files found.
slapos/recipe/librecipe/genericslap.py
View file @
2af0d2de
...
@@ -47,15 +47,6 @@ class GenericSlapRecipe(GenericBaseRecipe):
...
@@ -47,15 +47,6 @@ class GenericSlapRecipe(GenericBaseRecipe):
self
.
key_file
=
slap_connection
.
get
(
'key-file'
)
self
.
key_file
=
slap_connection
.
get
(
'key-file'
)
self
.
cert_file
=
slap_connection
.
get
(
'cert-file'
)
self
.
cert_file
=
slap_connection
.
get
(
'cert-file'
)
# setup auto uninstall/install
self
.
_setupAutoInstallUninstall
()
def
_setupAutoInstallUninstall
(
self
):
"""By default SlapOS recipes are reinstalled each time"""
# Note: It is possible to create in future subclass which will do no-op in
# this method
self
.
options
[
'slapos-timestamp'
]
=
str
(
time
.
time
())
def
install
(
self
):
def
install
(
self
):
self
.
slap
.
initializeConnection
(
self
.
server_url
,
self
.
key_file
,
self
.
slap
.
initializeConnection
(
self
.
server_url
,
self
.
key_file
,
self
.
cert_file
)
self
.
cert_file
)
...
...
slapos/recipe/softwaretype.py
View file @
2af0d2de
...
@@ -132,7 +132,7 @@ class Recipe:
...
@@ -132,7 +132,7 @@ class Recipe:
work_directory
=
os
.
path
.
abspath
(
self
.
buildout
[
'buildout'
][
work_directory
=
os
.
path
.
abspath
(
self
.
buildout
[
'buildout'
][
'directory'
])
'directory'
])
buildout_filename
=
os
.
path
.
join
(
work_directory
,
buildout_filename
=
os
.
path
.
join
(
work_directory
,
'buildout-%s.cfg'
%
s
oftware_typ
e
)
'buildout-%s.cfg'
%
s
elf
.
nam
e
)
with
open
(
buildout_filename
,
'w'
)
as
buildout_file
:
with
open
(
buildout_filename
,
'w'
)
as
buildout_file
:
buildout
.
write
(
buildout_file
)
buildout
.
write
(
buildout_file
)
...
...
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