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
Georgios Dagkakis
slapos
Commits
ab6f66b8
Commit
ab6f66b8
authored
May 02, 2013
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Temp commit before reverse
parent
00efd6cd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
129 additions
and
26 deletions
+129
-26
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+22
-22
software/apache-frontend/instance.cfg
software/apache-frontend/instance.cfg
+107
-4
No files found.
software/apache-frontend/common.cfg
View file @
ab6f66b8
...
@@ -26,30 +26,30 @@ parts =
...
@@ -26,30 +26,30 @@ parts =
rdiff-backup
rdiff-backup
squid
squid
# Buildoutish
#
#
Buildoutish
eggs
#
eggs
instance-recipe-egg
#
instance-recipe-egg
#
[instance-recipe]
#
[instance-recipe]
# Note: In case if specific instantiation recipe is used this is the place to
#
#
Note: In case if specific instantiation recipe is used this is the place to
# put its name
#
#
put its name
egg = slapos.cookbook
#
egg = slapos.cookbook
module = apache.frontend
#
module = apache.frontend
#
[instance-recipe-egg]
#
[instance-recipe-egg]
recipe = zc.recipe.egg
#
recipe = zc.recipe.egg
eggs = ${instance-recipe:egg}
#
eggs = ${instance-recipe:egg}
#
[eggs]
#
[eggs]
recipe = z3c.recipe.scripts
#
recipe = z3c.recipe.scripts
eggs =
#
eggs =
${lxml-python:egg}
#
${lxml-python:egg}
slapos.toolbox
#
slapos.toolbox
#
[template]
[template]
# Default template for apache instance.
# Default template for apache instance.
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum = 07e51c4be2c298db3bca151605698130
#
md5sum = 07e51c4be2c298db3bca151605698130
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
\ No newline at end of file
software/apache-frontend/instance.cfg
View file @
ab6f66b8
[buildout]
[buildout]
parts =
parts =
directory
directory
apache
configtest
configtest
logrotate
logrotate
cron
cron-entry-logrotate
ca-frontend
certificate-authority
squid-cache
logrotate-entry-apache
logrotate-entry-apache
apache
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
...
@@ -26,22 +31,50 @@ service = $${:etc}/service
...
@@ -26,22 +31,50 @@ service = $${:etc}/service
logrotate-backup = $${:backup}/logrotate
logrotate-backup = $${:backup}/logrotate
logrotate-entries = $${:etc}/logrotate.d
logrotate-entries = $${:etc}/logrotate.d
cron-entries = $${:etc}/cron.d
crontabs = $${:etc}/crontabs
cronstamps = $${:etc}/cronstamps
ca-dir = $${:srv}/ssl
squid-cache = $${:srv}/squid_cache
[instance-parameter]
# Fetches parameters defined in SlapOS Master for this instance.
# Always the same.
recipe = slapos.cookbook:slapconfiguration
computer = $${slap_connection:computer_id}
partition = $${slap_connection:partition_id}
url = $${slap_connection:server_url}
key = $${slap_connection:key_file}
cert = $${slap_connection:cert_file}
# Define default parameter(s) that will be used later, in case user didn't
# specify it
# All parameters are available through the configuration.XX syntax.
# All possible parameters should have a default.
configuration.domain = "example.org"
configuration.public-ipv4 =
configuration.port = 4443
configuration.plain_http_port =
# Deploy Apache (old way, with monolithic recipe)
# Deploy Apache (old way, with monolithic recipe)
[apache]
[apache]
recipe =
${instance-recipe:egg}:${instance-recipe:module}
recipe =
slapos.cookbook:apache.frontend
httpd_home = ${apache-2.2:location}
httpd_home = ${apache-2.2:location}
httpd_binary = ${apache-2.2:location}/bin/httpd
httpd_binary = ${apache-2.2:location}/bin/httpd
logrotate_binary = ${logrotate:location}/usr/sbin/logrotate
logrotate_binary = ${logrotate:location}/usr/sbin/logrotate
openssl_binary = ${openssl:location}/bin/openssl
openssl_binary = ${openssl:location}/bin/openssl
dcrond_binary = ${dcron:location}/sbin/crond
dcrond_binary = ${dcron:location}/sbin/crond
varnishd_binary = ${varnish-2.1:location}/sbin/varnishd
squid_binary = ${squid:location}/sbin/squid
squid_binary = ${squid:location}/sbin/squid
stunnel_binary = ${stunnel:location}/bin/stunnel
stunnel_binary = ${stunnel:location}/bin/stunnel
rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
gcc_binary = gcc
gcc_binary = gcc
binutils_directory = ${binutils:location}/bin/
binutils_directory = ${binutils:location}/bin/
ca_dir = $${certificate-authority:ca-dir}
cert_path = $${ca-frontend:cert-file}
key_path = $${ca-frontend:key-file}
ca_crl = $${certificate-authority:ca-crl}
access-log = $${directory:log}/frontend-apache-access.log
access-log = $${directory:log}/frontend-apache-access.log
error-log = $${directory:log}/frontend-apache-error.log
error-log = $${directory:log}/frontend-apache-error.log
pid-file = $${directory:run}/httpd.pid
pid-file = $${directory:run}/httpd.pid
...
@@ -53,6 +86,55 @@ recipe = slapos.cookbook:wrapper
...
@@ -53,6 +86,55 @@ recipe = slapos.cookbook:wrapper
command-line = $${apache:httpd_binary} -f $${directory:etc}/apache_frontend.conf -t
command-line = $${apache:httpd_binary} -f $${directory:etc}/apache_frontend.conf -t
wrapper-path = $${directory:bin}/apache-configtest
wrapper-path = $${directory:bin}/apache-configtest
[certificate-authority]
recipe = slapos.cookbook:certificate_authority
openssl-binary = ${openssl:location}/bin/openssl
ca-dir = $${directory:ca-dir}
requests-directory = $${cadirectory:requests}
wrapper = $${directory:service}/certificate_authority
ca-private = $${cadirectory:private}
ca-certs = $${cadirectory:certs}
ca-newcerts = $${cadirectory:newcerts}
ca-crl = $${cadirectory:crl}
[cadirectory]
recipe = slapos.cookbook:mkdirectory
requests = $${directory:ca-dir}/requests/
private = $${directory:ca-dir}/private/
certs = $${directory:ca-dir}/certs/
newcerts = $${directory:ca-dir}/newcerts/
crl = $${directory:ca-dir}/crl/
[ca-frontend]
<= certificate-authority
recipe = slapos.cookbook:certificate_authority.request
key-file = $${cadirectory:certs}/apache_frontend.key
cert-file = $${cadirectory:certs}/apache_frontend.crt
executable = $${directory:service}/apache_frontend
wrapper = $${directory:service}/apache_frontend
# Put domain name
name = $${instance-parameter:configuration.domain}
[cron]
recipe = slapos.cookbook:cron
dcrond-binary = ${dcron:location}/sbin/crond
cron-entries = $${directory:cron-entries}
crontabs = $${directory:crontabs}
cronstamps = $${directory:cronstamps}
catcher = $${cron-simplelogger:wrapper}
binary = $${directory:service}/crond
[cron-simplelogger]
recipe = slapos.cookbook:simplelogger
wrapper = $${directory:bin}/cron_simplelogger
log = $${directory:log}/cron.log
[cron-entry-logrotate]
<= cron
recipe = slapos.cookbook:cron.d
name = logrotate
frequency = 0 0 * * *
command = $${logrotate:wrapper}
# Deploy Logrotate
# Deploy Logrotate
[logrotate]
[logrotate]
...
@@ -79,3 +161,24 @@ post = ${buildout:bin-directory}/killpidfromfile $${apache:pid-file} SIGUSR1
...
@@ -79,3 +161,24 @@ post = ${buildout:bin-directory}/killpidfromfile $${apache:pid-file} SIGUSR1
sharedscripts = true
sharedscripts = true
notifempty = true
notifempty = true
create = true
create = true
[squid-cache]
recipe = slapos.cookbook:squid
prepare-path = ${directory:service}/squid-prepare
wrapper-path = ${directory:service}/squid
binary-path = ${squid:location}/sbin/squid
conf-path = ${directory:etc}/squid.cfg
cache-path = ${directory:squid-cache}
ip = ${squid-softinst34784:ip}
port = ${squid-softinst34784:port}
backend-ip = ${squid-softinst34784:backend-ip}
backend-port = ${squid-softinst34784:backend-port}
access-log-path = ${directory:log}/squid-access.log
cache-log-path = ${directory:log}/squid-cache.log
pid-filename-path = ${directory:run}/squid.pid
[squid-softinst34784]
ip = '10.0.24.140'
port = 26010
backend-ip = '10.0.24.140'
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