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
Roque
slapos
Commits
102da483
Commit
102da483
authored
Jan 25, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/webdav'
parents
9af739e0
225885d2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
10 deletions
+14
-10
slapos/recipe/davstorage/__init__.py
slapos/recipe/davstorage/__init__.py
+14
-10
No files found.
slapos/recipe/davstorage/__init__.py
View file @
102da483
...
@@ -109,10 +109,13 @@ class Recipe(BaseSlapRecipe):
...
@@ -109,10 +109,13 @@ class Recipe(BaseSlapRecipe):
def
createCertificate
(
self
,
size
=
1024
,
subject
=
'/C=FR/L=Marcq-en-Baroeul/O=Nexedi'
):
def
createCertificate
(
self
,
size
=
1024
,
subject
=
'/C=FR/L=Marcq-en-Baroeul/O=Nexedi'
):
key_file
=
os
.
path
.
join
(
self
.
etc_directory
,
'httpd.key'
)
key_file
=
os
.
path
.
join
(
self
.
etc_directory
,
'httpd.key'
)
self
.
path_list
.
append
(
key_file
)
certificate_file
=
os
.
path
.
join
(
self
.
etc_directory
,
'httpd.crt'
)
certificate_file
=
os
.
path
.
join
(
self
.
etc_directory
,
'httpd.crt'
)
self
.
path_list
.
append
(
certificate_file
)
files
=
[
key_file
,
certificate_file
,
]
if
not
all
([
os
.
path
.
exists
(
f
)
for
f
in
files
]):
for
f
in
files
:
if
os
.
path
.
exists
(
f
):
os
.
unlink
(
f
)
subprocess
.
check_call
([
self
.
options
[
'openssl_binary'
],
subprocess
.
check_call
([
self
.
options
[
'openssl_binary'
],
'req'
,
'-x509'
,
'-nodes'
,
'req'
,
'-x509'
,
'-nodes'
,
...
@@ -121,5 +124,6 @@ class Recipe(BaseSlapRecipe):
...
@@ -121,5 +124,6 @@ class Recipe(BaseSlapRecipe):
'-out'
,
certificate_file
,
'-out'
,
certificate_file
,
'-keyout'
,
key_file
'-keyout'
,
key_file
])
])
return
dict
(
key
=
key_file
,
return
dict
(
key
=
key_file
,
certificate
=
certificate_file
)
certificate
=
certificate_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