From 02415b7a2cb18d02ae3a5c5ef7a7301f6c18e345 Mon Sep 17 00:00:00 2001 From: Patrick Marchand Date: Tue, 27 Aug 2019 10:53:12 -0400 Subject: [PATCH] Missed a few instances of multi-php checks during merge --- webapps/evoadmin-web/templates/config.local.php.j2 | 2 +- webapps/evoadmin-web/templates/sudoers.j2 | 2 +- webapps/evoadmin-web/templates/web-add.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/evoadmin-web/templates/config.local.php.j2 b/webapps/evoadmin-web/templates/config.local.php.j2 index 0584675c..6be9ffca 100644 --- a/webapps/evoadmin-web/templates/config.local.php.j2 +++ b/webapps/evoadmin-web/templates/config.local.php.j2 @@ -10,6 +10,6 @@ $localconf['cluster'] = FALSE; $oriconf['logins'] = array(); //$oriconf['logins']['foo'] = 'd5d3c723fb82cb0078f399888af78204234535ec2ef3da56710fdd51f90d2477'; //$oriconf['logins']['bar'] = '7938c84d6e43d1659612a7ea7c1101ed02e52751bb64597a8c20ebaba8ba4303'; -{% if evoadmin_multi_php == True %} +{% if evoadmin_multi_php %} $localconf['php_versions'] = array(56, 70, 73); {% endif %} diff --git a/webapps/evoadmin-web/templates/sudoers.j2 b/webapps/evoadmin-web/templates/sudoers.j2 index 0634f7fc..6a02ed50 100644 --- a/webapps/evoadmin-web/templates/sudoers.j2 +++ b/webapps/evoadmin-web/templates/sudoers.j2 @@ -1,7 +1,7 @@ User_Alias EVOADMIN = www-evoadmin Cmnd_Alias EVOADMIN_WEB = {{ evoadmin_scripts_dir | mandatory }}/web-*.sh, {{ evoadmin_scripts_dir | mandatory }}/ftpadmin.sh, {{ evoadmin_scripts_dir | mandatory }}/dbadmin.sh EVOADMIN ALL=NOPASSWD: EVOADMIN_WEB -{% if evoadmin_multi_php == True %} +{% if evoadmin_multi_php %} Defaults env_keep += "LOGNAME PWD" ALL ALL = NOPASSWD: /usr/local/bin/phpContainer {% endif %} diff --git a/webapps/evoadmin-web/templates/web-add.conf.j2 b/webapps/evoadmin-web/templates/web-add.conf.j2 index 4bc41ad8..04335c13 100644 --- a/webapps/evoadmin-web/templates/web-add.conf.j2 +++ b/webapps/evoadmin-web/templates/web-add.conf.j2 @@ -1,5 +1,5 @@ CONTACT_MAIL="{{ evoadmin_contact_email or general_alert_email | mandatory }}" WWWBOUNCE_MAIL="{{ evoadmin_bounce_email or general_alert_email | mandatory }}" -{% if evoadmin_multi_php == True %} +{% if evoadmin_multi_php %} PHP_VERSIONS=(56 70 73) {% endif %}