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
9c43fca8
Commit
9c43fca8
authored
May 03, 2013
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix instance.cfg for apache frontend, no squid in recipe
parent
ab6f66b8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
47 deletions
+53
-47
slapos/recipe/apache_frontend/__init__.py
slapos/recipe/apache_frontend/__init__.py
+7
-7
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+29
-23
software/apache-frontend/instance.cfg
software/apache-frontend/instance.cfg
+17
-17
No files found.
slapos/recipe/apache_frontend/__init__.py
View file @
9c43fca8
...
@@ -272,13 +272,13 @@ class Recipe(BaseSlapRecipe):
...
@@ -272,13 +272,13 @@ class Recipe(BaseSlapRecipe):
service_name
=
"squid_%s"
%
reference
service_name
=
"squid_%s"
%
reference
squid_ip
=
self
.
getLocalIPv4Address
()
squid_ip
=
self
.
getLocalIPv4Address
()
stunnel_port
=
base_squid_port
+
1
stunnel_port
=
base_squid_port
+
1
self
.
installSquidCache
(
service_name
,
#
self.installSquidCache(service_name,
ip
=
squid_ip
,
#
ip=squid_ip,
port
=
base_squid_port
,
#
port=base_squid_port,
backend_host
=
squid_ip
,
#
backend_host=squid_ip,
backend_port
=
stunnel_port
,
#
backend_port=stunnel_port,
domain
=
domain
,
#
domain=domain,
size
=
"1G"
)
#
size="1G")
service_dict
[
service_name
]
=
dict
(
public_ip
=
squid_ip
,
service_dict
[
service_name
]
=
dict
(
public_ip
=
squid_ip
,
public_port
=
stunnel_port
,
public_port
=
stunnel_port
,
private_ip
=
slave_host
.
replace
(
"["
,
""
).
replace
(
"]"
,
""
),
private_ip
=
slave_host
.
replace
(
"["
,
""
).
replace
(
"]"
,
""
),
...
...
software/apache-frontend/common.cfg
View file @
9c43fca8
[buildout]
[buildout]
extends =
extends =
# dev Stuff
../../component/git/buildout.cfg
../../stack/slapos.cfg
../../component/binutils/buildout.cfg
../../component/binutils/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/apache/buildout.cfg
../../component/apache/buildout.cfg
../../component/gzip/buildout.cfg
../../component/gzip/buildout.cfg
../../component/stunnel/buildout.cfg
../../component/stunnel/buildout.cfg
../../component/varnish/buildout.cfg
../../component/dcron/buildout.cfg
../../component/dcron/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/squid/buildout.cfg
../../component/squid/buildout.cfg
../../stack/slapos.cfg
parts =
parts =
slapos-cookbook
template
template
binutils
binutils
apache-2.2
apache-2.2
apache-antiloris-apache-2.2
apache-antiloris-apache-2.2
stunnel
stunnel
varnish-2.1
dcron
dcron
logrotate
logrotate
rdiff-backup
rdiff-backup
squid
squid
## Buildoutish
# Development profile of apache-frontend.
# eggs
# Exactly the same as software.cfg, but fetch the slapos.cookbook
# instance-recipe-egg
# from git repository instead of fetching stable version,
#
# allowing to play with bleeding edge environment.
#[instance-recipe]
## Note: In case if specific instantiation recipe is used this is the place to
# You'll need to run buildout twice for this profile.
## put its name
slapos.cookbook-repository
#egg = slapos.cookbook
#module = apache.frontend
develop =
#
${:parts-directory}/slapos.cookbook-repository
#[instance-recipe-egg]
#recipe = zc.recipe.egg
[slapos.cookbook-repository]
#eggs = ${instance-recipe:egg}
recipe = slapos.recipe.build:gitclone
#
repository = http://git.erp5.org/repos/slapos.git
#[eggs]
branch = starteggs-frontend
#recipe = z3c.recipe.scripts
git-executable = ${git:location}/bin/git
#eggs =
# ${lxml-python:egg}
[check-recipe]
# slapos.toolbox
recipe = plone.recipe.command
#
stop-on-error = true
update-command = ${:command}
command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
[template]
[template]
# Default template for apache instance.
# Default template for apache instance.
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
...
software/apache-frontend/instance.cfg
View file @
9c43fca8
...
@@ -53,9 +53,9 @@ cert = $${slap_connection:cert_file}
...
@@ -53,9 +53,9 @@ cert = $${slap_connection:cert_file}
# All parameters are available through the configuration.XX syntax.
# All parameters are available through the configuration.XX syntax.
# All possible parameters should have a default.
# All possible parameters should have a default.
configuration.domain = "example.org"
configuration.domain = "example.org"
configuration.public-ipv4 =
configuration.public-ipv4 =
''
configuration.port = 4443
configuration.port = 4443
configuration.plain_http_port =
configuration.plain_http_port =
''
# Deploy Apache (old way, with monolithic recipe)
# Deploy Apache (old way, with monolithic recipe)
...
@@ -164,21 +164,21 @@ create = true
...
@@ -164,21 +164,21 @@ create = true
[squid-cache]
[squid-cache]
recipe = slapos.cookbook:squid
recipe = slapos.cookbook:squid
prepare-path = ${directory:service}/squid-prepare
prepare-path = $
$
{directory:service}/squid-prepare
wrapper-path = ${directory:service}/squid
wrapper-path = $
$
{directory:service}/squid
binary-path = ${squid:location}/sbin/squid
binary-path = ${squid:location}/sbin/squid
conf-path = ${directory:etc}/squid.cfg
conf-path = $
$
{directory:etc}/squid.cfg
cache-path = ${directory:squid-cache}
cache-path = $
$
{directory:squid-cache}
ip = $
{squid-softinst34784
:ip}
ip = $
${squid-hardcoded
:ip}
port = $
{squid-softinst34784
:port}
port = $
${squid-hardcoded
:port}
backend-ip = $
{squid-softinst34784
:backend-ip}
backend-ip = $
${squid-hardcoded
:backend-ip}
backend-port = $
{squid-softinst34784
:backend-port}
backend-port = $
${squid-hardcoded
:backend-port}
access-log-path = ${directory:log}/squid-access.log
access-log-path = $
$
{directory:log}/squid-access.log
cache-log-path = ${directory:log}/squid-cache.log
cache-log-path = $
$
{directory:log}/squid-cache.log
pid-filename-path = ${directory:run}/squid.pid
pid-filename-path = $
$
{directory:run}/squid.pid
[squid-
softinst34784
]
[squid-
hardcoded
]
ip =
'10.0.24.140'
ip =
10.0.24.140
port = 26010
port = 26010
backend-ip =
'10.0.24.140'
backend-ip =
10.0.24.140
backend-port = 26011
backend-port = 26011
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