Decouple ip/port from apache-php section so that we actually can request the...

Decouple ip/port from apache-php section so that we actually can request the frontend before deploying apache.

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

@@ -187,6 +187,15 @@ recipe = slapos.cookbook:urlparse
 url = $${request-mariadb:connection-url}
 
 
+
+#----------------
+#--
+#-- Common network parameters
+[apache-network-configuration]
+listening-ip = $${slap-network-information:global-ipv6}
+listening-port = 8080
+
+
 #----------------
 #--
 #-- Deploy Apache + PHP application.
@@ -200,8 +209,8 @@ configuration = ${application-configuration:location}
 htdocs = $${directory:www}
 pid-file = $${basedirectory:run}/apache.pid
 lock-file = $${basedirectory:run}/apache.lock
-ip = $${slap-network-information:global-ipv6}
-port = 8080
+ip = $${apache-network-configuration:listening-ip}
+port = $${apache-network-configuration:listening-port}
 url = http://[$${:ip}]:$${:port}/
 error-log = $${directory:httpd-log}/error.log
 access-log = $${directory:httpd-log}/access.log
@@ -242,7 +251,7 @@ name = Frontend
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
 slave = true
 config = url custom_domain
-config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
+config-url = http://[$${apache-network-configuration:listening-ip}]:$${apache-network-configuration:listening-port}/
 return = site_url
 config-custom_domain = $${slap-parameter:domain}
 

stack/lamp/buildout.cfg

@@ -74,7 +74,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 = 296ba845c8ffe75fbc6352dd0e8ce836
+md5sum = 3e2d71d3684aac3e52d2f55794df96bf
 mode = 0644
 
 [instance-apache-import]