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
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
f9d79bd3
Commit
f9d79bd3
authored
Apr 15, 2014
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apache-frontend: add configuration promises and use slapos dash for scripts
parent
637eb6bc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
7 deletions
+31
-7
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+4
-2
software/apache-frontend/instance-apache-frontend.cfg
software/apache-frontend/instance-apache-frontend.cfg
+26
-4
software/apache-frontend/templates/wrapper.in
software/apache-frontend/templates/wrapper.in
+1
-1
No files found.
software/apache-frontend/common.cfg
View file @
f9d79bd3
...
@@ -4,6 +4,7 @@ extends =
...
@@ -4,6 +4,7 @@ extends =
../../component/git/buildout.cfg
../../component/git/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
../../component/dash/buildout.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
...
@@ -149,7 +150,8 @@ md5sum = c2314c3a9c3412a38d14b312d3df83c1
...
@@ -149,7 +150,8 @@ md5sum = c2314c3a9c3412a38d14b312d3df83c1
mode = 640
mode = 640
[template-wrapper]
[template-wrapper]
recipe = slapos.recipe.
build:download
recipe = slapos.recipe.
template
url = ${:_profile_base_location_}/templates/wrapper.in
url = ${:_profile_base_location_}/templates/wrapper.in
output = ${buildout:directory}/template-wrapper.cfg
mode = 0644
#md5sum = c2314c3a9c3412a38d14b312d3df83c1
#md5sum = c2314c3a9c3412a38d14b312d3df83c1
mode = 640
\ No newline at end of file
software/apache-frontend/instance-apache-frontend.cfg
View file @
f9d79bd3
...
@@ -21,6 +21,8 @@ parts =
...
@@ -21,6 +21,8 @@ parts =
promise-squid
promise-squid
dynamic-template-default-vh
dynamic-template-default-vh
not-found-html
not-found-html
promise-frontend-apache-configuration
promise-cached-apache-configuration
promise-apache-frontend-v4-https
promise-apache-frontend-v4-https
promise-apache-frontend-v4-http
promise-apache-frontend-v4-http
promise-apache-frontend-v6-https
promise-apache-frontend-v6-https
...
@@ -292,8 +294,10 @@ pid-file = $${directory:run}/httpd.pid
...
@@ -292,8 +294,10 @@ pid-file = $${directory:run}/httpd.pid
protected-path = /
protected-path = /
access-control-string = none
access-control-string = none
cached-rewrite-file = $${directory:etc}/apache_rewrite_cached.txt
cached-rewrite-file = $${directory:etc}/apache_rewrite_cached.txt
frontend-graceful-command = ${apache-2.2:location}/bin/httpd -Sf $${:frontend-configuration}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${:pid-file}); fi
frontend-configuration-verification = ${apache-2.2:location}/bin/httpd -Sf $${:frontend-configuration}
cached-graceful-command = ${apache-2.2:location}/bin/httpd -Sf $${:cached-configuration}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${apache-configuration:cache-pid-file}); fi
frontend-graceful-command = $${:frontend-configuration-verification}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${:pid-file}); fi
cached-configuration-verification = ${apache-2.2:location}/bin/httpd -Sf $${:cached-configuration}
cached-graceful-command = $${:cached-configuration-verification}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${apache-configuration:cache-pid-file}); fi
# Apache for cache configuration
# Apache for cache configuration
cache-access-log = $${directory:log}/frontend-apache-access-cached.log
cache-access-log = $${directory:log}/frontend-apache-access-cached.log
...
@@ -472,9 +476,10 @@ port = $${apache-configuration:cache-port}
...
@@ -472,9 +476,10 @@ port = $${apache-configuration:cache-port}
# End of Squid part
# End of Squid part
### Apaches Graceful and promises
[frontend-apache-graceful]
[frontend-apache-graceful]
< = jinja2-template-base
< = jinja2-template-base
template = ${template-wrapper:
targe
t}
template = ${template-wrapper:
outpu
t}
rendered = $${directory:etc-run}/frontend-apache-safe-graceful
rendered = $${directory:etc-run}/frontend-apache-safe-graceful
mode = 0700
mode = 0700
extra-context =
extra-context =
...
@@ -482,12 +487,29 @@ extra-context =
...
@@ -482,12 +487,29 @@ extra-context =
[cached-apache-graceful]
[cached-apache-graceful]
< = jinja2-template-base
< = jinja2-template-base
template = ${template-wrapper:
targe
t}
template = ${template-wrapper:
outpu
t}
rendered = $${directory:etc-run}/cached-apache-safe-graceful
rendered = $${directory:etc-run}/cached-apache-safe-graceful
mode = 0700
mode = 0700
extra-context =
extra-context =
key content apache-configuration:cached-graceful-command
key content apache-configuration:cached-graceful-command
# Promises checking configuration:
[promise-frontend-apache-configuration]
< = jinja2-template-base
template = ${template-wrapper:output}
rendered = $${directory:promise}/frontend-apache-configuration-promise
mode = 0700
extra-context =
key content apache-configuration:frontend-configuration-verification
[promise-cached-apache-configuration]
< = jinja2-template-base
template = ${template-wrapper:output}
rendered = $${directory:promise}/cached-apache-configuration-promise
mode = 0700
extra-context =
key content apache-configuration:cached-configuration-verification
[promise-apache-frontend-v4-https]
[promise-apache-frontend-v4-https]
recipe = slapos.cookbook:check_port_listening
recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/apache_frontend_ipv4_https
path = $${directory:promise}/apache_frontend_ipv4_https
...
...
software/apache-frontend/templates/wrapper.in
View file @
f9d79bd3
#!
/bin/sh
#!
${dash-output:dash}
{{ content }}
{{ content }}
\ No newline at end of file
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