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
Cédric Le Ninivin
slapos
Commits
810b7640
Commit
810b7640
authored
Mar 29, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Jinja2-ify instance-varnish.cfg .
parent
0026f37b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
129 additions
and
6 deletions
+129
-6
software/erp5/instance-varnish.cfg.in
software/erp5/instance-varnish.cfg.in
+118
-0
software/erp5/instance.cfg
software/erp5/instance.cfg
+1
-1
software/erp5/software.cfg
software/erp5/software.cfg
+10
-5
No files found.
software/erp5/instance-varnish.cfg
→
software/erp5/instance-varnish.cfg
.in
View file @
810b7640
...
@@ -7,112 +7,112 @@ parts =
...
@@ -7,112 +7,112 @@ parts =
cron-entry-logrotate
cron-entry-logrotate
cron-entry-web-checker
cron-entry-web-checker
eggs-directory =
${buildout:eggs-directory
}
eggs-directory =
{{ eggs_directory }
}
develop-eggs-directory =
${buildout:develop-eggs-directory
}
develop-eggs-directory =
{{ develop_eggs_directory }
}
offline = true
offline = true
[publish-varnish-connection-information]
[publish-varnish-connection-information]
recipe = slapos.cookbook:publishurl
recipe = slapos.cookbook:publishurl
url = http://$
${varnish-instance:ip}:$
${varnish-instance:server-port}/
url = http://$
{varnish-instance:ip}:
${varnish-instance:server-port}/
[varnish-instance]
[varnish-instance]
recipe = slapos.cookbook:generic.varnish
recipe = slapos.cookbook:generic.varnish
# Network options
# Network options
ip = $
$
{slap-network-information:local-ipv4}
ip = ${slap-network-information:local-ipv4}
server-port = 6001
server-port = 6001
manager-port = 6002
manager-port = 6002
# Paths: Running wrappers
# Paths: Running wrappers
varnishd-wrapper = $
$
{basedirectory:services}/varnishd
varnishd-wrapper = ${basedirectory:services}/varnishd
varnishlog-wrapper = $
$
{rootdirectory:bin}/varnishlog
varnishlog-wrapper = ${rootdirectory:bin}/varnishlog
# Binary information
# Binary information
varnishd-binary =
${varnish:location
}/sbin/varnishd
varnishd-binary =
{{ varnish_location }
}/sbin/varnishd
varnishlog-binary =
${varnish:location
}/bin/varnishlog
varnishlog-binary =
{{ varnish_location }
}/bin/varnishlog
shell-path =
${dash:location
}/bin/dash
shell-path =
{{ dash_location }
}/bin/dash
# Configuration by VCL
# Configuration by VCL
vcl-file = $
$
{rootdirectory:etc}/default.vcl
vcl-file = ${rootdirectory:etc}/default.vcl
pid-file = $
$
{basedirectory:run}/varnishd.pid
pid-file = ${basedirectory:run}/varnishd.pid
varnish-data = $
$
{directory:varnish-data}
varnish-data = ${directory:varnish-data}
# this will pass at -n option
# this will pass at -n option
varnish-instance-name = $
$
{directory:varnish-instance}
varnish-instance-name = ${directory:varnish-instance}
web-checker =
${buildout:bin-directory
}/web_checker_utility
web-checker =
{{ bin_directory }
}/web_checker_utility
[cron-entry-web-checker]
[cron-entry-web-checker]
<= cron
<= cron
recipe = slapos.cookbook:cron.d
recipe = slapos.cookbook:cron.d
name = web-checker
name = web-checker
frequency = 0 0 * * *
frequency = 0 0 * * *
command = $
${varnish-instance:web-checker} $
${web-checker:web-checker-config}
command = $
{varnish-instance:web-checker}
${web-checker:web-checker-config}
[web-checker]
[web-checker]
recipe = slapos.cookbook:webchecker
recipe = slapos.cookbook:webchecker
web-checker-config = $
$
{rootdirectory:etc}/web_checker.cfg
web-checker-config = ${rootdirectory:etc}/web_checker.cfg
web-checker-working-directory = $
$
{directory:web-checker}
web-checker-working-directory = ${directory:web-checker}
# for now frontend-url is varnish, it will replace with the real front-end one.
# for now frontend-url is varnish, it will replace with the real front-end one.
frontend-url = $
${varnish-instance:ip}:$
${varnish-instance:server-port}
frontend-url = $
{varnish-instance:ip}:
${varnish-instance:server-port}
wget-binary-path =
${wget:location
}/bin/wget
wget-binary-path =
{{ wget_location }
}/bin/wget
varnishlog-binary-path = $
$
{varnish-instance:varnishlog-wrapper}
varnishlog-binary-path = ${varnish-instance:varnishlog-wrapper}
web-checker-log = $
$
{basedirectory:log}/web-checker.log
web-checker-log = ${basedirectory:log}/web-checker.log
[cron]
[cron]
recipe = slapos.cookbook:cron
recipe = slapos.cookbook:cron
dcrond-binary =
${dcron:location
}/sbin/crond
dcrond-binary =
{{ dcron_location }
}/sbin/crond
cron-entries = $
$
{directory:cron-entries}
cron-entries = ${directory:cron-entries}
crontabs = $
$
{directory:crontabs}
crontabs = ${directory:crontabs}
cronstamps = $
$
{directory:cronstamps}
cronstamps = ${directory:cronstamps}
binary = $
$
{basedirectory:services}/crond
binary = ${basedirectory:services}/crond
catcher = $
$
{cron-simplelogger:wrapper}
catcher = ${cron-simplelogger:wrapper}
[cron-simplelogger]
[cron-simplelogger]
recipe = slapos.cookbook:simplelogger
recipe = slapos.cookbook:simplelogger
wrapper = $
$
{rootdirectory:bin}/cron_simplelogger
wrapper = ${rootdirectory:bin}/cron_simplelogger
log = $
$
{basedirectory:log}/cron.log
log = ${basedirectory:log}/cron.log
[cron-entry-logrotate]
[cron-entry-logrotate]
<= cron
<= cron
recipe = slapos.cookbook:cron.d
recipe = slapos.cookbook:cron.d
name = logrotate
name = logrotate
frequency = 0 0 * * *
frequency = 0 0 * * *
command = $
$
{logrotate:wrapper}
command = ${logrotate:wrapper}
[logrotate]
[logrotate]
recipe = slapos.cookbook:logrotate
recipe = slapos.cookbook:logrotate
# Binaries
# Binaries
logrotate-binary =
${logrotate:location
}/usr/sbin/logrotate
logrotate-binary =
{{ logrotate_location }
}/usr/sbin/logrotate
gzip-binary =
${gzip:location
}/bin/gzip
gzip-binary =
{{ gzip_location }
}/bin/gzip
gunzip-binary =
${gzip:location
}/bin/gunzip
gunzip-binary =
{{ gzip_location }
}/bin/gunzip
# Directories
# Directories
wrapper = $
$
{rootdirectory:bin}/logrotate
wrapper = ${rootdirectory:bin}/logrotate
conf = $
$
{rootdirectory:etc}/logrotate.conf
conf = ${rootdirectory:etc}/logrotate.conf
logrotate-entries = $
$
{directory:logrotate-entries}
logrotate-entries = ${directory:logrotate-entries}
backup = $
$
{directory:logrotate-backup}
backup = ${directory:logrotate-backup}
state-file = $
$
{rootdirectory:srv}/logrotate.status
state-file = ${rootdirectory:srv}/logrotate.status
[basedirectory]
[basedirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
services = $
$
{rootdirectory:etc}/run
services = ${rootdirectory:etc}/run
run = $
$
{rootdirectory:var}/run
run = ${rootdirectory:var}/run
backup = $
$
{rootdirectory:srv}/backup
backup = ${rootdirectory:srv}/backup
log = $
$
{rootdirectory:var}/log
log = ${rootdirectory:var}/log
backup = $
$
{rootdirectory:srv}/backup
backup = ${rootdirectory:srv}/backup
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
varnish-data = $
$
{rootdirectory:srv}/varnish
varnish-data = ${rootdirectory:srv}/varnish
varnish-instance = $
$
{directory:varnish-data}/instance
varnish-instance = ${directory:varnish-data}/instance
cron-entries = $
$
{rootdirectory:etc}/cron.d
cron-entries = ${rootdirectory:etc}/cron.d
crontabs = $
$
{rootdirectory:etc}/crontabs
crontabs = ${rootdirectory:etc}/crontabs
cronstamps = $
$
{rootdirectory:etc}/cronstamps
cronstamps = ${rootdirectory:etc}/cronstamps
logrotate-backup = $
$
{basedirectory:backup}/logrotate
logrotate-backup = ${basedirectory:backup}/logrotate
logrotate-entries = $
$
{rootdirectory:etc}/logrotate.d
logrotate-entries = ${rootdirectory:etc}/logrotate.d
web-checker = $
$
{rootdirectory:srv}/web-checker
web-checker = ${rootdirectory:srv}/web-checker
[rootdirectory]
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
etc = $
$
{buildout:directory}/etc
etc = ${buildout:directory}/etc
var = $
$
{buildout:directory}/var
var = ${buildout:directory}/var
srv = $
$
{buildout:directory}/srv
srv = ${buildout:directory}/srv
bin = $
$
{buildout:directory}/bin
bin = ${buildout:directory}/bin
software/erp5/instance.cfg
View file @
810b7640
...
@@ -33,7 +33,7 @@ zope = ${template-zope:output}
...
@@ -33,7 +33,7 @@ zope = ${template-zope:output}
mariadb = ${template-mariadb:output}
mariadb = ${template-mariadb:output}
sphinx = ${template-sphinx:output}
sphinx = ${template-sphinx:output}
tidstorage = $${dynamic-template-tidstorage:output}
tidstorage = $${dynamic-template-tidstorage:output}
varnish = ${template-varnish:
output
}
varnish = ${template-varnish:
rendered
}
[slap-connection]
[slap-connection]
# part to migrate to new - separated words
# part to migrate to new - separated words
...
...
software/erp5/software.cfg
View file @
810b7640
...
@@ -156,11 +156,16 @@ output = ${buildout:directory}/template-snippet-backend.cfg
...
@@ -156,11 +156,16 @@ output = ${buildout:directory}/template-snippet-backend.cfg
mode = 0644
mode = 0644
[template-varnish]
[template-varnish]
recipe = slapos.recipe.template
< = template-jinja2-base
url = ${:_profile_base_location_}/instance-varnish.cfg
filename = instance-varnish.cfg
md5sum = 70fb0ccadf0d6723ddb0fe55a1549ca5
md5sum = 1e1b1ade6a60d2eb803ac075a753d360
output = ${buildout:directory}/template-varnish.cfg
extra-context =
mode = 0644
key dash_location dash:location
key dcron_location dcron:location
key gzip_location gzip:location
key logrotate_location logrotate:location
key varnish_location varnish:location
key wget_location wget:location
[networkcache]
[networkcache]
# signature certificates of the following uploaders.
# signature certificates of the following uploaders.
...
...
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