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
Lorenzo Martinico
slapos
Commits
1e984809
Commit
1e984809
authored
Aug 04, 2011
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add path of varnish binary and fix parentheses
parent
cf0991c8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
slapos/recipe/apache/__init__.py
slapos/recipe/apache/__init__.py
+6
-8
No files found.
slapos/recipe/apache/__init__.py
View file @
1e984809
...
@@ -266,27 +266,25 @@ class Recipe(BaseSlapRecipe):
...
@@ -266,27 +266,25 @@ class Recipe(BaseSlapRecipe):
directory
=
directory
,
directory
=
directory
,
pid
=
"%s/varnish.pid"
%
directory
,
pid
=
"%s/varnish.pid"
%
directory
,
port
=
"%s:%s"
%
(
ip
,
port
),
port
=
"%s:%s"
%
(
ip
,
port
),
varnishd_binary
=
self
.
options
[
"varnishd_binary"
],
control_port
=
"%s:%s"
%
(
ip
,
control_port
),
control_port
=
"%s:%s"
%
(
ip
,
control_port
),
storage
=
"file,%s/storage.bin,%s"
%
(
directory
,
size
))
storage
=
"file,%s/storage.bin,%s"
%
(
directory
,
size
))
config_file
=
self
.
createConfigurationFile
(
"%s.conf"
%
name
,
config_file
=
self
.
createConfigurationFile
(
"%s.conf"
%
name
,
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'varnish.vcl.in'
),
'varnish.vcl.in'
,
dict
(
dict
(
backend_host
=
backend_host
,
backend_port
=
backend_port
)))
backend_host
=
backend_host
,
backend_port
=
backend_port
))))
varnish_config
[
"configuration_file"
]
=
config_file
varnish_config
[
"configuration_file"
]
=
config_file
self
.
path_list
.
append
(
self
.
createRunningWrapper
(
'varnishd'
,
self
.
path_list
.
append
(
self
.
createRunningWrapper
(
'varnishd'
,
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'varnishd.in'
),
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'varnishd.in'
),
config
)))
varnish_
config
)))
return
varnish_config
return
varnish_config
def
installStunnel
(
self
,
service_dict
,
ca_certificate
,
key
,
ca_crl
,
ca_path
):
def
installStunnel
(
self
,
service_dict
,
ca_certificate
,
key
,
ca_crl
,
ca_path
):
"""Installs stunnel
"""Installs stunnel
service_dict =
\
service_dict =
{ name: (public_ip, private_ip, public_port, private_port),}
{ name: (public_ip, private_ip, public_port, private_port),}
"""
"""
template_filename
=
self
.
getTemplateFilename
(
'stunnel.conf.in'
)
template_filename
=
self
.
getTemplateFilename
(
'stunnel.conf.in'
)
template_entry_filename
=
self
.
getTemplateFilename
(
'stunnel.conf.entry.in'
)
template_entry_filename
=
self
.
getTemplateFilename
(
'stunnel.conf.entry.in'
)
...
...
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