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
Vincent Bechu
slapos
Commits
8471096d
Commit
8471096d
authored
Jun 06, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kumofs : working set
parent
93464bc8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
slapos/recipe/kumofs/__init__.py
slapos/recipe/kumofs/__init__.py
+9
-10
slapos/recipe/kumofs/template/stunnel.conf.in
slapos/recipe/kumofs/template/stunnel.conf.in
+2
-2
No files found.
slapos/recipe/kumofs/__init__.py
View file @
8471096d
...
...
@@ -47,16 +47,15 @@ class Recipe(BaseSlapRecipe):
ca_conf
=
self
.
installCertificateAuthority
()
key
,
certificate
=
self
.
requestCertificate
(
'Login Based Access'
)
stunnel_conf
=
self
.
installStunnel
(
self
.
getGlobalIPv6Address
(),
12345
,
kumo_conf
[
'kumo_gateway_port'
],
stunnel_conf
=
self
.
installStunnel
(
self
.
getGlobalIPv6Address
(),
self
.
getLocalIPv4Address
(),
12345
,
kumo_conf
[
'kumo_gateway_port'
],
certificate
,
key
,
ca_conf
[
'ca_crl'
],
ca_conf
[
'certificate_authority_path'
])
self
.
linkBinary
()
self
.
setConnectionDict
(
dict
(
kumofs_local_ip
=
kumo_conf
[
'kumo_gateway_ip'
],
stunnel_ip
=
stunnel_conf
[
'ipv6'
],
stunnel_port
=
stunnel_conf
[
'port'
],
stunnel_ip
=
stunnel_conf
[
'public_ip'
],
stunnel_port
=
stunnel_conf
[
'public_port'
],
))
return
self
.
path_list
...
...
@@ -199,23 +198,23 @@ class Recipe(BaseSlapRecipe):
parser
.
write
(
open
(
os
.
path
.
join
(
self
.
ca_request_dir
,
hash
),
'w'
))
return
key
,
certificate
def
installStunnel
(
self
,
ip
,
port
,
external
_port
,
def
installStunnel
(
self
,
public_ip
,
private_ip
,
public_port
,
private
_port
,
ca_certificate
,
key
,
ca_crl
,
ca_path
):
"""Installs stunnel"""
template_filename
=
self
.
getTemplateFilename
(
'stunnel.conf.in'
)
log
=
os
.
path
.
join
(
self
.
log_directory
,
'stunnel.log'
)
pid_file
=
os
.
path
.
join
(
self
.
run_directory
,
'stunnel.pid'
)
stunnel_conf
=
dict
(
ipv6
=
ip
,
ipv4
=
self
.
getLocalIPv4Address
()
,
p
ort
=
port
,
public_ip
=
public_
ip
,
private_ip
=
private_ip
,
p
ublic_port
=
public_
port
,
pid_file
=
pid_file
,
log
=
log
,
cert
=
ca_certificate
,
key
=
key
,
ca_crl
=
ca_crl
,
ca_path
=
ca_path
,
external_port
=
external
_port
,
private_port
=
private
_port
,
)
stunnel_conf_path
=
self
.
createConfigurationFile
(
"stunnel.conf"
,
self
.
substituteTemplate
(
template_filename
,
...
...
slapos/recipe/kumofs/template/stunnel.conf.in
View file @
8471096d
...
...
@@ -9,5 +9,5 @@ cert = %(cert)s
;key = /etc/ssl/certs/stunnel.pem
[mysqls]
accept = %(
ipv6)s:%(
port)s
connect = %(
ipv4)s:%(external
_port)s
accept = %(
public_ip)s:%(public_
port)s
connect = %(
private_ip)s:%(private
_port)s
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