Commit f286011d authored by Marco Mariani's avatar Marco Mariani

moved apache, postgres cfgs in own directories, renamed part

directories->rootdirectory
parent cd974ce1
...@@ -64,7 +64,8 @@ environment = ...@@ -64,7 +64,8 @@ environment =
PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s 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 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_}
......
...@@ -47,14 +47,14 @@ mode = 0644 ...@@ -47,14 +47,14 @@ mode = 0644
[template-apache-php] [template-apache-php]
recipe = slapos.recipe.template 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 output = ${buildout:directory}/template-apache-php.cfg
#md5sum = #md5sum =
mode = 0644 mode = 0644
[template-postgres] [template-postgres]
recipe = slapos.recipe.template 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 output = ${buildout:directory}/template-postgres.cfg
#md5sum = #md5sum =
mode = 0644 mode = 0644
......
...@@ -23,18 +23,18 @@ key = $${slap-connection:key-file} ...@@ -23,18 +23,18 @@ key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file} cert = $${slap-connection:cert-file}
[directories] [rootdirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
bin = $${buildout:directory}/bin bin = $${buildout:directory}/bin
etc = $${buildout:directory}/etc etc = $${buildout:directory}/etc
services = $${directories:etc}/run/ services = $${rootdirectory:etc}/run/
promises = $${directories:etc}/promise/ promises = $${rootdirectory:etc}/promise/
var = $${buildout:directory}/var var = $${buildout:directory}/var
[symlinks] [symlinks]
recipe = cns.recipe.symlink recipe = cns.recipe.symlink
symlink_target = $${directories:bin} symlink_target = $${rootdirectory:bin}
symlink_base = ${postgresql:location}/bin symlink_base = ${postgresql:location}/bin
...@@ -48,15 +48,15 @@ user = postgres ...@@ -48,15 +48,15 @@ user = postgres
port = 5432 port = 5432
dbname = db dbname = db
# pgdata_directory is created by initdb, and should not exist beforehand. # pgdata_directory is created by initdb, and should not exist beforehand.
pgdata-directory = $${directories:var}/data pgdata-directory = $${rootdirectory:var}/data
services = $${directories:services} services = $${rootdirectory:services}
bin = $${directories:bin} bin = $${rootdirectory:bin}
# Deploy promises scripts # Deploy promises scripts
[postgres-promise] [postgres-promise]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directories:promises}/postgres path = $${rootdirectory:promises}/postgres
hostname = $${slap-network-information:global-ipv6} hostname = $${slap-network-information:global-ipv6}
port = $${postgres-instance:port} port = $${postgres-instance:port}
......
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