evolix/evoadmin-web
22
0
Fork 1
Code Issues 31 Pull requests 4 Releases 1 Wiki Activity

Merge branch 'master' of https://gitea.evolix.org/evolix/evoadmin-web

Browse source
This commit is contained in:
Tristan 2019-03-15 16:44:47 +01:00
parent b296421022 52c7cfb888
commit 2a183351db
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/web-add.sh
View file

@ -369,6 +369,8 @@ create_www_account() {
for php_version in "${PHP_VERSIONS[@]}"; do for php_version in "${PHP_VERSIONS[@]}"; do
if [ "$php_version" = "70" ]; then if [ "$php_version" = "70" ]; then
pool_path="/etc/php/7.0/fpm/pool.d/" pool_path="/etc/php/7.0/fpm/pool.d/"
elif [ "$php_version" = "73" ]; then
pool_path="/etc/php/7.3/fpm/pool.d/"
else else
pool_path="/etc/php5/fpm/pool.d/" pool_path="/etc/php5/fpm/pool.d/"
fi fi
@ -527,6 +529,9 @@ EOT
if [ "$php_version" = "70" ]; then if [ "$php_version" = "70" ]; then
initscript_path="/etc/init.d/php7.0-fpm" initscript_path="/etc/init.d/php7.0-fpm"
binary="php-fpm7.0" binary="php-fpm7.0"
elif [ "$php_version" = "73" ]; then
initscript_path="/etc/init.d/php7.3-fpm"
binary="php-fpm7.3"
else else
initscript_path="/etc/init.d/php5-fpm" initscript_path="/etc/init.d/php5-fpm"
binary="php5-fpm" binary="php5-fpm"
@ -627,10 +632,13 @@ op_del() {
apache2ctl configtest apache2ctl configtest
for php_version in "${PHP_VERSIONS[@]}"; do for php_version in "${PHP_VERSIONS[@]}"; do
if [ "$php_version" = "70" ]; then if [ "$php_version" = "70" ]; then
phpfpm_dir="/etc/php5/fpm/pool.d/"
initscript_path="/etc/init.d/php7.0-fpm"
else
phpfpm_dir="/etc/php/7.0/fpm/pool.d/" 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" initscript_path="/etc/init.d/php5-fpm"
fi fi
rm /var/lib/lxc/php"${php_version}"/rootfs/${phpfpm_dir}/"${login}".conf rm /var/lib/lxc/php"${php_version}"/rootfs/${phpfpm_dir}/"${login}".conf

4
tpl/auth.tpl.php
View file

@ -5,7 +5,7 @@
* *
* Copyright (c) 2009 Evolix - Tous droits reserves * 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 <reg@evolix.fr> * @author Gregory Colpart <reg@evolix.fr>
* @author Thomas Martin <tmartin@evolix.fr> * @author Thomas Martin <tmartin@evolix.fr>
@ -17,7 +17,7 @@
<br/><br/> <br/><br/>
<form method="POST"> <form method="POST">
<table width="300" align="center"> <table align="center">
<tr> <tr>
<td align="right">Utilisateur : &nbsp;</td> <td align="right">Utilisateur : &nbsp;</td>
<td align="left"><input type="text" name="login" /></td> <td align="left"><input type="text" name="login" /></td>