diff --git a/README.md b/README.md index 23bbe2c..8afabc2 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ ## phpMyAdmin -### ⚠️ Install +### ✔️ Install ### `wget -O pmainstall.sh https://sop.wtf/sh/pmainstall && bash pmainstall.sh` diff --git a/conf/pmaapache.conf b/conf/pmaapache.conf index 9593f44..3483a44 100644 --- a/conf/pmaapache.conf +++ b/conf/pmaapache.conf @@ -15,6 +15,6 @@ Listen 8080 ErrorLog ${APACHE_LOG_DIR}/phpmyadmin.error.log CustomLog ${APACHE_LOG_DIR}/phpmyadmin.access.log combined - + # Error log location should be in /var/log/apache2 \ No newline at end of file diff --git a/scripts/hockeypuckinstall.sh b/scripts/hockeypuckinstall.sh index 36a8002..2c347a7 100644 --- a/scripts/hockeypuckinstall.sh +++ b/scripts/hockeypuckinstall.sh @@ -16,7 +16,7 @@ do ;; esac done -sudo apt-get install bzr git mercurial go- -y +sudo apt-get install bzr git mercurial golang -y git clone https://github.com/hockeypuck/packaging /var/lib/hockeypuck cd packaging ./prepare.bash diff --git a/scripts/pmainstall.sh b/scripts/pmainstall.sh index 8791211..df862fd 100644 --- a/scripts/pmainstall.sh +++ b/scripts/pmainstall.sh @@ -22,9 +22,9 @@ done if [ "$go" == 'nginx' ]; then PHP_VER="8.2" sudo apt update && apt upgrade -y -sudo apt install software-properties-common -y && sudo add-apt-repository --yes ppa:ondrej/php && sudo apt install php$PHP_VER-fpm software-properties-common phpmyadmin php-mbstring php-zip php-gd php-json php-curl nginx -y +sudo apt-get install build-essential lsb-release software-properties-common -y +sudo add-apt-repository --yes ppa:ondrej/php && sudo apt install php$PHP_VER-fpm software-properties-common phpmyadmin php-mbstring php-zip php-gd php-json php-curl nginx-full -y sudo systemctl stop nginx -sudo apt remove php8.1-fpm php8.1-* -y sudo wget -O /etc/nginx/conf.d/phpmyadmin.conf https://git.oldgate.org/Sophia/thelinuxlist/raw/branch/main/conf/pmanginx.conf sudo systemctl enable nginx sudo systemctl start nginx @@ -53,17 +53,10 @@ fi if [ "$go" == 'apache' ]; then PHP_VER="8.2" sudo apt update && apt upgrade -y -sudo add-apt-repository --yes ppa:ondrej/php && apt install libapache2-mod-php$PHP_VER php$PHP_VER-fpm software-properties-common phpmyadmin php-mbstring php-zip php-gd php-json php-curl apache2 -y +sudo apt-get install build-essential lsb-release software-properties-common -y +sudo add-apt-repository --yes ppa:ondrej/php && apt install apache2 libapache2-mod-php$PHP_VER php$PHP_VER-fpm software-properties-common phpmyadmin php-mbstring php-zip php-gd php-json php-curl -y sudo systemctl stop apache2 -sudo apt remove php8.1-fpm php8.1-* -y sudo wget -O /etc/apache2/sites-enabled/phpmyadmin.conf https://git.oldgate.org/Sophia/thelinuxlist/raw/branch/main/conf/pmaapache.conf -sudo phpenmod mbstring -sudo a2dismod php$PHP_VER -sudo a2dismod mpm_prefork -sudo a2enmod mpm_event -sudo a2enmod proxy -sudo a2enmod proxy_fcgi -sudo a2enconf php$PHP_VER-fpm sudo systemctl restart php$PHP_VER-fpm sudo systemctl reload apache2 sudo systemctl enable apache2