From f669c3f7939501e00a7513a4d0d85b8b1969e33d Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Thu, 14 Mar 2019 14:30:12 +0100 Subject: [PATCH 1/3] Remove the width on the login page --- tpl/auth.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tpl/auth.tpl.php b/tpl/auth.tpl.php index 414e1a5..dceb185 100644 --- a/tpl/auth.tpl.php +++ b/tpl/auth.tpl.php @@ -5,7 +5,7 @@ * * Copyright (c) 2009 Evolix - Tous droits reserves * - * vim: expandtab softtabstop=4 tabstop=4 shiftwidth=4 showtabline=2 + * vim: expandtab softtabstop=4 tabstop=4 shiftwidth=4 showtabline=2 * * @author Gregory Colpart * @author Thomas Martin @@ -17,7 +17,7 @@

- +
From 614de20c3416fc78863f5afd7b1d47f738c04690 Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Fri, 15 Mar 2019 16:42:13 +0100 Subject: [PATCH 2/3] Fix deletion using wrong path --- scripts/web-add.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/web-add.sh b/scripts/web-add.sh index 88883ac..5cb12a0 100755 --- a/scripts/web-add.sh +++ b/scripts/web-add.sh @@ -627,10 +627,10 @@ op_del() { apache2ctl configtest for php_version in "${PHP_VERSIONS[@]}"; do if [ "$php_version" = "70" ]; then - phpfpm_dir="/etc/php5/fpm/pool.d/" + phpfpm_dir="/etc/php/7.0/fpm/pool.d/" initscript_path="/etc/init.d/php7.0-fpm" else - phpfpm_dir="/etc/php/7.0/fpm/pool.d/" + phpfpm_dir="/etc/php5/fpm/pool.d/" initscript_path="/etc/init.d/php5-fpm" fi rm /var/lib/lxc/php"${php_version}"/rootfs/${phpfpm_dir}/"${login}".conf From 52c7cfb8880493afd383ebf175e51f4dd36f57b1 Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Fri, 15 Mar 2019 16:44:42 +0100 Subject: [PATCH 3/3] Support express de containers PHP7.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (pas très joli... oui :/) --- scripts/web-add.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/web-add.sh b/scripts/web-add.sh index 5cb12a0..9ae93e6 100755 --- a/scripts/web-add.sh +++ b/scripts/web-add.sh @@ -369,6 +369,8 @@ create_www_account() { for php_version in "${PHP_VERSIONS[@]}"; do if [ "$php_version" = "70" ]; then pool_path="/etc/php/7.0/fpm/pool.d/" + elif [ "$php_version" = "73" ]; then + pool_path="/etc/php/7.3/fpm/pool.d/" else pool_path="/etc/php5/fpm/pool.d/" fi @@ -527,6 +529,9 @@ EOT if [ "$php_version" = "70" ]; then initscript_path="/etc/init.d/php7.0-fpm" binary="php-fpm7.0" + elif [ "$php_version" = "73" ]; then + initscript_path="/etc/init.d/php7.3-fpm" + binary="php-fpm7.3" else initscript_path="/etc/init.d/php5-fpm" binary="php5-fpm" @@ -629,6 +634,9 @@ op_del() { if [ "$php_version" = "70" ]; then phpfpm_dir="/etc/php/7.0/fpm/pool.d/" initscript_path="/etc/init.d/php7.0-fpm" + elif [ "$php_version" = "73" ]; then + phpfpm_dir="/etc/php/7.3/fpm/pool.d/" + initscript_path="/etc/init.d/php7.3-fpm" else phpfpm_dir="/etc/php5/fpm/pool.d/" initscript_path="/etc/init.d/php5-fpm"
Utilisateur :