Browse Source

Fix phpmyadmin mysqli_real_connect

lj2007331@gmail.com 6 years ago
parent
commit
6f95da7f4d
4 changed files with 5 additions and 1 deletions
  1. 1 0
      include/phpmyadmin.sh
  2. 1 0
      include/upgrade_phpmyadmin.sh
  3. 1 1
      versions.txt
  4. 2 0
      vhost.sh

+ 1 - 0
include/phpmyadmin.sh

@@ -23,6 +23,7 @@ Install_phpMyAdmin() {
   mkdir ${wwwroot_dir}/default/phpMyAdmin/{upload,save}
   sed -i "s@UploadDir.*@UploadDir'\] = 'upload';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
   sed -i "s@SaveDir.*@SaveDir'\] = 'save';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
+  sed -i "s@host'\].*@host'\] = '127.0.0.1';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
   sed -i "s@blowfish_secret.*;@blowfish_secret\'\] = \'$(cat /dev/urandom | head -1 | base64 | head -c 45)\';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
   chown -R ${run_user}.${run_user} ${wwwroot_dir}/default/phpMyAdmin
   popd

+ 1 - 0
include/upgrade_phpmyadmin.sh

@@ -42,6 +42,7 @@ Upgrade_phpMyAdmin() {
     mkdir ${wwwroot_dir}/default/phpMyAdmin/{upload,save}
     sed -i "s@UploadDir.*@UploadDir'\] = 'upload';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
     sed -i "s@SaveDir.*@SaveDir'\] = 'save';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
+    sed -i "s@host'\].*@host'\] = '127.0.0.1';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
     sed -i "s@blowfish_secret.*;@blowfish_secret\'\] = \'$(cat /dev/urandom | head -1 | base64 | head -c 45)\';@" ${wwwroot_dir}/default/phpMyAdmin/config.inc.php
     chown -R ${run_user}.${run_user} ${wwwroot_dir}/default/phpMyAdmin
     echo "You have ${CMSG}successfully${CEND} upgrade from ${CWARNING}$OLD_phpmyadmin_ver${CEND} to ${CWARNING}$NEW_phpmyadmin_ver${CEND}"

+ 1 - 1
versions.txt

@@ -62,7 +62,7 @@ mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 libsodium_ver=1.0.16
 argon2_ver=20171227
-imagemagick_ver=6.9.10-14
+imagemagick_ver=6.9.10-15
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.30
 gmagick_for_php7_ver=2.0.5RC1

+ 2 - 0
vhost.sh

@@ -202,6 +202,7 @@ If you enter '.', the field will be left blank.
         ${web_install_dir}/sbin/nginx -s reload
       fi
       if [ "${apache_ssl_flag}" == 'y' ]; then
+        [ "$(${apache_install_dir}/bin/apachectl -v | awk -F'.' /version/'{print $2}')" == '4' ] && Apache_grant='Require all granted'
         [ ! -d ${apache_install_dir}/conf/vhost ] && mkdir ${apache_install_dir}/conf/vhost
         cat > ${apache_install_dir}/conf/vhost/${domain}.conf << EOF
 <VirtualHost *:80>
@@ -292,6 +293,7 @@ What Are You Doing?
     popd > /dev/null
     popd > /dev/null
   fi
+  [ -e ~/.acme.sh/account.conf ] && sed -i '/^CERT_HOME=/d' ~/.acme.sh/account.conf
   if [[ "${Domian_Mode}" =~ ^[2-3]$ ]] || [ "${ARG1}" == 'dnsapi' ]; then
     if [ -e "${web_install_dir}/sbin/nginx" ]; then
       nginx_ssl_flag=y