moved apache, postgres cfgs in own directories, renamed part

directories->rootdirectory

component/apache-php/buildout.cfg

@@ -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/buildout.cfg

@@ -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

@@ -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}