Commit edc83f79 authored by Alain Takoudjou's avatar Alain Takoudjou

stack/lamp: allow more custom configurations

parent 14d13a6b
...@@ -68,7 +68,8 @@ db-name = lamp ...@@ -68,7 +68,8 @@ db-name = lamp
db-user = lamp db-user = lamp
# Publish default lamp slave frontend url # Publish default lamp slave frontend url
default-frontend = True default-frontend = True
# Use php7 or php8 in apache
enable-php8 = False
[composer] [composer]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
...@@ -106,7 +107,9 @@ command = ...@@ -106,7 +107,9 @@ command =
INSTAL_DIR=${composer:location}/bin INSTAL_DIR=${composer:location}/bin
PATH=${apache-php:location}/bin:$PATH PATH=${apache-php:location}/bin:$PATH
mkdir -p $INSTAL_DIR 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 stop-on-error = true
update-command = ${:command} update-command = ${:command}
...@@ -133,6 +136,7 @@ context = ...@@ -133,6 +136,7 @@ context =
key application_archive_root application:archive-root key application_archive_root application:archive-root
key application_deployment_part_list custom-application-deployment:part-list key application_deployment_part_list custom-application-deployment:part-list
key application_deployment_publish_list custom-application-deployment:publish-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_location apache:location
key apache_php_location apache-php:location key apache_php_location apache-php:location
key bash_location bash:location key bash_location bash:location
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
# not need these here). # not need these here).
[lamp-instance] [lamp-instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 8940540752d7eef8dc625a31393ca14e md5sum = dceee17902b7424f995ab023200a6b4e
[instance-apache-php] [instance-apache-php]
filename = instance-apache-php.cfg.in filename = instance-apache-php.cfg.in
md5sum = 765372ad68b61f117f666f30f0ad153f md5sum = a85e0ddd77b7944367f46344f8b90df4
[instance-lamp] [instance-lamp]
filename = instance-lamp.cfg.jinja2.in filename = instance-lamp.cfg.jinja2.in
......
...@@ -143,6 +143,9 @@ php-ini-dir = ${directory:php-ini-dir} ...@@ -143,6 +143,9 @@ php-ini-dir = ${directory:php-ini-dir}
cert-file = ${ca-directory:certs}/httpd.crt cert-file = ${ca-directory:certs}/httpd.crt
key-file = ${ca-directory:certs}/httpd.key key-file = ${ca-directory:certs}/httpd.key
apache-config-dir = ${directory:apache.d} apache-config-dir = ${directory:apache.d}
{% if parameter_dict['application-enable-php8'] -%}
enable-php8 = !py!True
{% endif -%}
[lamp-apache-httpd] [lamp-apache-httpd]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
......
...@@ -65,6 +65,7 @@ application-location = {{ application_location }}/{{ application_archive_root }} ...@@ -65,6 +65,7 @@ application-location = {{ application_location }}/{{ application_archive_root }}
application-location = {{ application_location }} application-location = {{ application_location }}
{% endif %} {% endif %}
application-part-list = {{ application_deployment_part_list }} application-part-list = {{ application_deployment_part_list }}
application-enable-php8 = !py!{{ application_deployment_php8 }}
template-apache-conf = {{ template_apache_conf }} template-apache-conf = {{ template_apache_conf }}
apache-location = {{ apache_location }} apache-location = {{ apache_location }}
apache-php-location = {{ apache_php_location }} apache-php-location = {{ apache_php_location }}
......
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