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
Tatuya Kamada
slapos
Commits
0d172056
Commit
0d172056
authored
Mar 19, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
KVM frontend : Allow use of http server used to redirect to https
parent
1b852d63
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
slapos/recipe/generic_kvm_frontend/__init__.py
slapos/recipe/generic_kvm_frontend/__init__.py
+7
-1
software/kvm/instance-frontend.cfg
software/kvm/instance-frontend.cfg
+2
-2
software/kvm/software.cfg
software/kvm/software.cfg
+1
-1
No files found.
slapos/recipe/generic_kvm_frontend/__init__.py
View file @
0d172056
...
@@ -99,6 +99,12 @@ class Recipe(GenericSlapRecipe):
...
@@ -99,6 +99,12 @@ class Recipe(GenericSlapRecipe):
conf_file
=
self
.
createFile
(
self
.
options
[
'conf-path'
],
conf
.
read
())
conf_file
=
self
.
createFile
(
self
.
options
[
'conf-path'
],
conf
.
read
())
conf
.
close
()
conf
.
close
()
# Do we create http dummy server used to redirect to https?
if
self
.
options
[
'http-redirection'
]
in
GenericBaseRecipe
.
TRUE_VALUES
:
http_redirect_server
=
'1'
else
:
http_redirect_server
=
''
config
=
dict
(
config
=
dict
(
ip
=
self
.
options
[
'ip'
],
ip
=
self
.
options
[
'ip'
],
port
=
self
.
options
[
'port'
],
port
=
self
.
options
[
'port'
],
...
@@ -110,7 +116,7 @@ class Recipe(GenericSlapRecipe):
...
@@ -110,7 +116,7 @@ class Recipe(GenericSlapRecipe):
node_env
=
self
.
options
[
'node-env'
],
node_env
=
self
.
options
[
'node-env'
],
conf_path
=
conf_file
,
conf_path
=
conf_file
,
map_path
=
map_file
,
map_path
=
map_file
,
plain_http
=
''
,
plain_http
=
http_redirect_server
,
)
)
runner_path
=
self
.
createExecutable
(
runner_path
=
self
.
createExecutable
(
...
...
software/kvm/instance-frontend.cfg
View file @
0d172056
...
@@ -50,8 +50,7 @@ domain = $${ca-frontend:name}
...
@@ -50,8 +50,7 @@ domain = $${ca-frontend:name}
# port = $${slap-parameter:port}
# port = $${slap-parameter:port}
ip = $${slap-network-information:global-ipv6}
ip = $${slap-network-information:global-ipv6}
port = $${slap-parameter:port}
port = $${slap-parameter:port}
# http-port =
http-redirection = $${slap-parameter:http-redirection}
# https-port =
ssl-key-path = $${ca-frontend:key-file}
ssl-key-path = $${ca-frontend:key-file}
ssl-cert-path = $${ca-frontend:cert-file}
ssl-cert-path = $${ca-frontend:cert-file}
slave-instance-list = $${slap-parameter:slave_instance_list}
slave-instance-list = $${slap-parameter:slave_instance_list}
...
@@ -139,6 +138,7 @@ port = $${frontend-instance:port}
...
@@ -139,6 +138,7 @@ port = $${frontend-instance:port}
[slap-parameter]
[slap-parameter]
# Default value if no port is specified
# Default value if no port is specified
port = 4443
port = 4443
http-redirection = 0
# [logrotate-entry-frontend]
# [logrotate-entry-frontend]
# <= logrotate
# <= logrotate
...
...
software/kvm/software.cfg
View file @
0d172056
...
@@ -190,7 +190,7 @@ mode = 0644
...
@@ -190,7 +190,7 @@ mode = 0644
[template-frontend]
[template-frontend]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-frontend.cfg
url = ${:_profile_base_location_}/instance-frontend.cfg
md5sum =
f355d5cc6e3d473b9193c2f34e73f312
md5sum =
47e6b4f1c12d83b95bdf6b1e5dedd907
output = ${buildout:directory}/template-frontend.cfg
output = ${buildout:directory}/template-frontend.cfg
mode = 0644
mode = 0644
...
...
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