stack/lamp: allow more custom configurations

stack/lamp/buildout.cfg

@@ -68,7 +68,8 @@ db-name = lamp
 db-user = lamp
 # Publish default lamp slave frontend url
 default-frontend = True
-
+# Use php7 or php8 in apache
+enable-php8 = False
 
 [composer]
 recipe = slapos.recipe.build:download
@@ -106,7 +107,9 @@ command =
   INSTAL_DIR=${composer:location}/bin
   PATH=${apache-php:location}/bin:$PATH
   mkdir -p $INSTAL_DIR
-  php ${composer:location}/composer-setup.php --install-dir=$INSTAL_DIR --filename=composer-bin
+  php ${composer:location}/composer-setup.php --install-dir=$INSTAL_DIR \
+  --filename=composer-bin ${:custom-args}
+custom-args =
 stop-on-error = true
 update-command = ${:command}
 
@@ -133,6 +136,7 @@ context =
     key application_archive_root application:archive-root
     key application_deployment_part_list custom-application-deployment:part-list
     key application_deployment_publish_list custom-application-deployment:publish-list
+    key application_deployment_php8 custom-application-deployment:enable-php8
     key apache_location apache:location
     key apache_php_location apache-php:location
     key bash_location bash:location

stack/lamp/buildout.hash.cfg

@@ -14,11 +14,11 @@
 # not need these here).
 [lamp-instance]
 filename = instance.cfg.in
-md5sum = 8940540752d7eef8dc625a31393ca14e
+md5sum = dceee17902b7424f995ab023200a6b4e
 
 [instance-apache-php]
 filename = instance-apache-php.cfg.in
-md5sum = 765372ad68b61f117f666f30f0ad153f
+md5sum = a85e0ddd77b7944367f46344f8b90df4
 
 [instance-lamp]
 filename = instance-lamp.cfg.jinja2.in

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

@@ -143,6 +143,9 @@ php-ini-dir = ${directory:php-ini-dir}
 cert-file = ${ca-directory:certs}/httpd.crt
 key-file = ${ca-directory:certs}/httpd.key
 apache-config-dir = ${directory:apache.d}
+{% if parameter_dict['application-enable-php8'] -%}
+enable-php8 = !py!True
+{% endif -%}
 
 [lamp-apache-httpd]
 recipe = slapos.recipe.template:jinja2

stack/lamp/instance.cfg.in

@@ -65,6 +65,7 @@ application-location = {{ application_location }}/{{ application_archive_root }}
 application-location = {{ application_location }}
 {% endif %}
 application-part-list = {{ application_deployment_part_list }}
+application-enable-php8 = !py!{{ application_deployment_php8 }}
 template-apache-conf = {{ template_apache_conf }}
 apache-location = {{ apache_location }}
 apache-php-location = {{ apache_php_location }}