Commit 16d6b022 authored by Marco Mariani's avatar Marco Mariani

renamed template -> instance, etc.

parent fd82a299
...@@ -107,28 +107,6 @@ logrotate-entries = $${directory:logrotate-entries} ...@@ -107,28 +107,6 @@ 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
[logrotate-entry-apache]
<= logrotate
recipe = slapos.cookbook:logrotate.d
name = apache
log = $${apache-php:error-log} $${apache-php:access-log}
frequency = daily
rotate-num = 30
sharedscripts = true
notifempty = true
create = true
[logrotate-entry-stunnel]
<= logrotate
recipe = slapos.cookbook:logrotate.d
name = stunnel
log = $${stunnel:log-file}
frequency = daily
rotate-num = 30
notifempty = true
create = true
post = $${stunnel:post-rotate-script}
#---------------- #----------------
#-- #--
...@@ -150,6 +128,17 @@ pid-file = $${basedirectory:run}/stunnel.pid ...@@ -150,6 +128,17 @@ pid-file = $${basedirectory:run}/stunnel.pid
wrapper = $${rootdirectory:bin}/raw_stunnel wrapper = $${rootdirectory:bin}/raw_stunnel
post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
[logrotate-entry-stunnel]
<= logrotate
recipe = slapos.cookbook:logrotate.d
name = stunnel
log = $${stunnel:log-file}
frequency = daily
rotate-num = 30
notifempty = true
create = true
post = $${stunnel:post-rotate-script}
#---------------- #----------------
#-- #--
...@@ -226,6 +215,17 @@ mysql-database = $${postgres-urlparse:path} ...@@ -226,6 +215,17 @@ mysql-database = $${postgres-urlparse:path}
mysql-host = $${stunnel:local-host} mysql-host = $${stunnel:local-host}
mysql-port = $${stunnel:local-port} mysql-port = $${stunnel:local-port}
[logrotate-entry-apache]
<= logrotate
recipe = slapos.cookbook:logrotate.d
name = apache
log = $${apache-php:error-log} $${apache-php:access-log}
frequency = daily
rotate-num = 30
sharedscripts = true
notifempty = true
create = true
#---------------- #----------------
#-- #--
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
parts = parts =
apache-php-postgres apache-php-postgres
eggs eggs
template instance
psycopg2 psycopg2
template-apache-php instance-apache-php
template-postgres instance-postgres
extends = extends =
../../component/apache/buildout.cfg ../../component/apache/buildout.cfg
...@@ -20,14 +20,6 @@ extends = ...@@ -20,14 +20,6 @@ extends =
../slapos.cfg ../slapos.cfg
[eggs]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
${psycopg2:egg}
slapos.toolbox
cns.recipe.symlink
#---------------- #----------------
#-- Application-specific part (maarch, etc.) #-- Application-specific part (maarch, etc.)
...@@ -40,37 +32,28 @@ strip-top-level-dir = true ...@@ -40,37 +32,28 @@ strip-top-level-dir = true
#---------------- #----------------
#-- Instance-level buildout profiles. #-- Instance-level buildout profiles.
[template] [instance]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/instance.cfg
md5sum = fad4fe349039b9bac5f95322af1b8f5a md5sum = fad4fe349039b9bac5f95322af1b8f5a
mode = 0644 mode = 0644
[template-apache-php] [instance-apache-php]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/template-apache-php.cfg output = ${buildout:directory}/instance-apache-php.cfg
md5sum = a21a91aae8bf693c2ab189969ffacaac md5sum = fb34918c73ba242ffc08dfd7745367b3
mode = 0644 mode = 0644
[template-postgres] [instance-postgres]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/postgres/instance-postgres.cfg.in url = ${:_profile_base_location_}/postgres/instance-postgres.cfg.in
output = ${buildout:directory}/template-postgres.cfg output = ${buildout:directory}/instance-postgres.cfg
md5sum = b1f8fefaa8df0914df10f7b52b816886 md5sum = 1dd96699e54575d8787295a4c29f1ddb
mode = 0644 mode = 0644
#----------------
#-- Dummy parts in case no application configuration file is needed
[application-template]
filename =
location =
[application-configuration]
location =
#---------------- #----------------
...@@ -107,4 +90,22 @@ path = ...@@ -107,4 +90,22 @@ path =
part-list = part-list =
#---------------- #----------------
#-- Dummy parts in case no application configuration file is needed
[application-template]
filename =
location =
[application-configuration]
location =
#----------------
[eggs]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
${psycopg2:egg}
slapos.toolbox
cns.recipe.symlink
File moved
...@@ -40,7 +40,7 @@ cronstamps = $${rootdirectory:etc}/cronstamps ...@@ -40,7 +40,7 @@ cronstamps = $${rootdirectory:etc}/cronstamps
#---------------- #----------------
#-- #--
#-- Deploy cron and configure it. #-- Deploy cron.
[cron] [cron]
recipe = slapos.cookbook:cron recipe = slapos.cookbook:cron
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment