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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhifan huang
slapos
Commits
17611b09
Commit
17611b09
authored
Oct 04, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved apache, postgres cfgs in own directories, renamed part
directories->rootdirectory
parent
c5150f56
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
component/apache-php/buildout.cfg
component/apache-php/buildout.cfg
+2
-1
stack/lapp/apache/instance-apache-php.cfg.in
stack/lapp/apache/instance-apache-php.cfg.in
+0
-0
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+2
-2
stack/lapp/postgres/instance-postgres.cfg.in
stack/lapp/postgres/instance-postgres.cfg.in
+8
-8
No files found.
component/apache-php/buildout.cfg
View file @
17611b09
...
...
@@ -64,7 +64,8 @@ environment =
PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
TMPDIR=${:location}
TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
...
...
stack/lapp/instance-apache-php.cfg.in
→
stack/lapp/
apache/
instance-apache-php.cfg.in
View file @
17611b09
File moved
stack/lapp/buildout.cfg
View file @
17611b09
...
...
@@ -47,14 +47,14 @@ mode = 0644
[template-apache-php]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apache-php.cfg.in
url = ${:_profile_base_location_}/
apache/
instance-apache-php.cfg.in
output = ${buildout:directory}/template-apache-php.cfg
#md5sum =
mode = 0644
[template-postgres]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-postgres.cfg.in
url = ${:_profile_base_location_}/
postgres/
instance-postgres.cfg.in
output = ${buildout:directory}/template-postgres.cfg
#md5sum =
mode = 0644
...
...
stack/lapp/instance-postgres.cfg.in
→
stack/lapp/
postgres/
instance-postgres.cfg.in
View file @
17611b09
...
...
@@ -23,18 +23,18 @@ key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file}
[
directories
]
[
rootdirectory
]
recipe = slapos.cookbook:mkdirectory
bin = $${buildout:directory}/bin
etc = $${buildout:directory}/etc
services = $${
directories
:etc}/run/
promises = $${
directories
:etc}/promise/
services = $${
rootdirectory
:etc}/run/
promises = $${
rootdirectory
:etc}/promise/
var = $${buildout:directory}/var
[symlinks]
recipe = cns.recipe.symlink
symlink_target = $${
directories
:bin}
symlink_target = $${
rootdirectory
:bin}
symlink_base = ${postgresql:location}/bin
...
...
@@ -48,15 +48,15 @@ user = postgres
port = 5432
dbname = db
# pgdata_directory is created by initdb, and should not exist beforehand.
pgdata-directory = $${
directories
:var}/data
services = $${
directories
:services}
bin = $${
directories
:bin}
pgdata-directory = $${
rootdirectory
:var}/data
services = $${
rootdirectory
:services}
bin = $${
rootdirectory
:bin}
# Deploy promises scripts
[postgres-promise]
recipe = slapos.cookbook:check_port_listening
path = $${
directories
:promises}/postgres
path = $${
rootdirectory
:promises}/postgres
hostname = $${slap-network-information:global-ipv6}
port = $${postgres-instance:port}
...
...
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