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
Boxiang Sun
slapos
Commits
73031170
Commit
73031170
authored
Nov 19, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved sections, comments
parent
fd82a299
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
46 deletions
+47
-46
stack/lapp/apache/instance-apache-php.cfg.in
stack/lapp/apache/instance-apache-php.cfg.in
+22
-22
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+24
-23
stack/lapp/instance.cfg.in
stack/lapp/instance.cfg.in
+0
-0
stack/lapp/postgres/instance-postgres.cfg.in
stack/lapp/postgres/instance-postgres.cfg.in
+1
-1
No files found.
stack/lapp/apache/instance-apache-php.cfg.in
View file @
73031170
...
@@ -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
#----------------
#----------------
#--
#--
...
...
stack/lapp/buildout.cfg
View file @
73031170
...
@@ -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.)
...
@@ -42,35 +34,26 @@ strip-top-level-dir = true
...
@@ -42,35 +34,26 @@ strip-top-level-dir = true
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
.in
output = ${buildout:directory}/
templat
e.cfg
output = ${buildout:directory}/
instanc
e.cfg
md5sum = fad4fe349039b9bac5f95322af1b8f5a
md5sum = fad4fe349039b9bac5f95322af1b8f5a
mode = 0644
mode = 0644
[template-apache-php]
[template-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}/
templat
e-apache-php.cfg
output = ${buildout:directory}/
instanc
e-apache-php.cfg
md5sum =
a21a91aae8bf693c2ab189969ffacaac
md5sum =
fb34918c73ba242ffc08dfd7745367b3
mode = 0644
mode = 0644
[template-postgres]
[template-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}/
templat
e-postgres.cfg
output = ${buildout:directory}/
instanc
e-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
stack/lapp/instance.cfg
→
stack/lapp/instance.cfg
.in
View file @
73031170
File moved
stack/lapp/postgres/instance-postgres.cfg.in
View file @
73031170
...
@@ -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
...
...
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