Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
9f09f2da
Commit
9f09f2da
authored
Mar 16, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to pass CA parameters from section.
Keep them simple, as section keys are local.
parent
3cf69261
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
slapos/recipe/certificate_authority/__init__.py
slapos/recipe/certificate_authority/__init__.py
+8
-7
No files found.
slapos/recipe/certificate_authority/__init__.py
View file @
9f09f2da
...
@@ -45,13 +45,14 @@ class Recipe(GenericBaseRecipe):
...
@@ -45,13 +45,14 @@ class Recipe(GenericBaseRecipe):
def
install
(
self
):
def
install
(
self
):
path_list
=
[]
path_list
=
[]
# XXX: We gotta find better a way to get these options
ca_country_code
=
self
.
options
.
get
(
'country-code'
,
'XX'
)
ca_country_code
=
'XX'
ca_email
=
self
.
options
.
get
(
'email'
,
'xx@example.com'
)
ca_email
=
'xx@example.com'
# XXX-BBB: State by mistake has been configured as string "('State',)"
ca_state
=
'State'
,
# string, so keep this for backward compatibility of existing
ca_city
=
'City'
# automatically setup CAs
ca_company
=
'Company'
ca_state
=
self
.
options
.
get
(
'state'
,
"('State',)"
)
# XXX: end
ca_city
=
self
.
options
.
get
(
'city'
,
'City'
)
ca_company
=
self
.
options
.
get
(
'company'
,
'Company'
)
self
.
setPath
()
self
.
setPath
()
...
...
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