removed empty, unused configuration file, simplified buildout

software/maarch/development.cfg

@@ -61,7 +61,7 @@ command =
   grep parts ${buildout:develop-eggs-directory}/slapos.recipe.maarch.egg-link
 
 
-# Unpin versions, in case it has been pinned in software.cfg
+# Unpin versions, in case they have been pinned in software.cfg
 [versions]
 slapos.cookbook =
 slapos.toolbox =

software/maarch/instance-custom.cfg.in

@@ -9,7 +9,7 @@ db_dbname = $${postgres-urlparse:path}
 db_username = $${postgres-urlparse:username}
 db_password = $${postgres-urlparse:password}
 language = en
-php_ini_dir = $${directory:php-ini-dir}
+php_ini = $${directory:php-ini-dir}/php.ini
 root_docservers = $${buildout:directory}/srv/docservers
 dependency = $${apache-php:recipe}
 

software/maarch/software.cfg

@@ -59,25 +59,6 @@ url = http://downloads.sourceforge.net/project/maarch/Maarch%20Entreprise/Maarch
 md5sum = 5c2c859dee9d0dde3ba959474fd5fc86
 
 
-#----------------
-#--
-#-- We don't need this static configuration file.
-#-- An empty file is provided because it is required by the lapp stack.
-#--
-
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/config.php.in
-md5sum = d41d8cd98f00b204e9800998ecf8427e
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-
-[application-configuration]
-location = config.php
-
-
 #----------------
 #--
 #-- Define parts that will be executed later, in the instance.
@@ -91,7 +72,7 @@ part-list = maarch-configuration
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-custom.cfg.in
 output = ${buildout:directory}/instance-custom.cfg
-md5sum = 28f6ad42b73806901ac2cd4ec563d73b
+md5sum = 22d8e4d8bb1a5b1c42c6cfb42ee490a0
 mode = 0644
 
 

stack/lapp/apache/instance-apache-php.cfg.in

@@ -194,8 +194,6 @@ url = $${request-postgres:connection-url}
 [apache-php]
 recipe = slapos.cookbook:apachephp
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 
 htdocs = $${rootdirectory:srv}/www/
 pid-file = $${basedirectory:run}/apache.pid
@@ -212,11 +210,6 @@ wrapper = $${basedirectory:services}/apache
 
 httpd-binary = ${apache:location}/bin/httpd
 
-mysql-username = $${postgres-urlparse:username}
-mysql-password = $${postgres-urlparse:password}
-mysql-database = $${postgres-urlparse:path}
-mysql-host = $${stunnel:local-host}
-mysql-port = $${stunnel:local-port}
 
 [logrotate-entry-apache]
 <= logrotate

stack/lapp/buildout.cfg

@@ -57,7 +57,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = 3e4b7c176a7de23843f77261d88dd0b8
+md5sum = 72b70452d1c077cfcd0f268181506b8e
 mode = 0644
 
 [instance-apache-backup]