From d2380db06b6a4f36c82ede605111552762970194 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Fri, 31 Mar 2023 11:16:46 +0200
Subject: [PATCH] misc

---
 assets/nginx-phpmyadmin.conf |  2 +-
 assets/urbackup.service      |  2 +-
 bin/lemp.sh                  | 36 ++++++++++++++++++++----------------
 bin/webhook.sh               |  2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/assets/nginx-phpmyadmin.conf b/assets/nginx-phpmyadmin.conf
index f5f486f..1060f3a 100644
--- a/assets/nginx-phpmyadmin.conf
+++ b/assets/nginx-phpmyadmin.conf
@@ -22,7 +22,7 @@ server {
     }
 
     location ~ \.php$ {
-      fastcgi_pass unix:/run/php/php7.3-fpm.sock;
+      fastcgi_pass unix:/run/php/php7.4-fpm.sock;
       fastcgi_index index.php;
       include fastcgi_params;
       fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
diff --git a/assets/urbackup.service b/assets/urbackup.service
index 4b0de01..02e3980 100644
--- a/assets/urbackup.service
+++ b/assets/urbackup.service
@@ -5,7 +5,7 @@ ConditionPathExists=/usr/local/sbin/urbackupclientbackend
 [Service]
 Type=forking
 ExecStart=/usr/local/sbin/urbackupclientbackend -d
-PIDFile = /var/run/urbackup_srv.pid
+PIDFile = /run/urbackup_srv.pid
 TimeoutSec=0
 
 [Install]
diff --git a/bin/lemp.sh b/bin/lemp.sh
index 06b9376..f045045 100755
--- a/bin/lemp.sh
+++ b/bin/lemp.sh
@@ -48,6 +48,10 @@ sleep 3
 apt-get --yes install php7.4-fpm php7.4-mysql php7.4-opcache php7.4-curl php7.4-mbstring php7.4-zip php7.4-xml php7.4-gd php-memcached php7.4-imagick php7.4-apcu
 # php7.4-mcrypt  ??
 
+apt-get --yes install php8.1-fpm php8.1-mysql php8.1-opcache php8.1-curl php8.1-mbstring php8.1-zip php8.1-xml php8.1-gd php-memcached php8.1-imagick php8.1-apcu php8.1-redis php8.1-bz2 php8.1-bcmath
+
+# apt-get --yes install php8.2-fpm php8.2-mysql php8.2-opcache php8.2-curl php8.2-mbstring php8.2-zip php8.2-xml php8.2-gd php-memcached php8.2-imagick php8.2-apcu php8.2-redis php8.2-bz2 php8.2-bcmath
+
 mv /etc/php/7.4/fpm/php.ini /etc/php/7.4/fpm/php.ini.back
 cp "$_assets"/php7.4-fpm.ini /etc/php/7.4/fpm/php.ini
 
@@ -136,24 +140,24 @@ if [ "$installmysql" = "yes" ]; then
   ##### Try 'cp --help' for more information.
 
   # TODO no pma package available :(
-  # apt-get --yes install phpmyadmin
-  # ln -s /usr/share/phpmyadmin /var/www/html/
-  # cp "$_assets"/nginx-phpmyadmin.conf > /etc/nginx/sites-available/phpmyadmin.conf
-  # ln -s /etc/nginx/sites-available/phpmyadmin.conf /etc/nginx/sites-enabled/phpmyadmin.conf
-  # echo -e "\033[92;1mphpMyAdmin installed\033[Om"
-  # echo -e "\033[92;1mYou can access it at yourip/phpmyadmin\033[Om"
+  apt-get --yes install phpmyadmin
+  ln -s /usr/share/phpmyadmin /var/www/html/
+  cp "$_assets"/nginx-phpmyadmin.conf /etc/nginx/sites-available/phpmyadmin.conf
+    
+  echo -e "\033[92;1mphpMyAdmin installed\033[Om"
+  echo -e "\033[92;1mYou can access it at yourip/phpmyadmin\033[Om"
 
   # install from source
-  apt-get --yes install php-{mbstring,zip,gd,xml,pear,gettext,cgi}
-  cd /var/www/html/
-  wget https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-all-languages.zip
-  unzip phpMyAdmin-latest-all-languages.zip
-  mv phpMyAdmin-*-all-languages pma
-  rm phpMyAdmin-latest-all-languages.zip
-  # cp "$_assets"/nginx-phpmyadmin.conf > /etc/nginx/sites-available/phpmyadmin.conf
-  # ln -s /etc/nginx/sites-available/phpmyadmin.conf /etc/nginx/sites-enabled/phpmyadmin.conf
-  echo -e "\033[92;1mphpMyAdmin installed\033[Om"
-  echo -e "\033[92;1mYou can access it at yourip/pma\033[Om"
+  # apt-get --yes install php-{mbstring,zip,gd,xml,pear,gettext,cgi}
+  # cd /var/www/html/
+  # wget https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-all-languages.zip
+  # unzip phpMyAdmin-latest-all-languages.zip
+  # mv phpMyAdmin-*-all-languages pma
+  # rm phpMyAdmin-latest-all-languages.zip
+  # # cp "$_assets"/nginx-phpmyadmin.conf > /etc/nginx/sites-available/phpmyadmin.conf
+  # # ln -s /etc/nginx/sites-available/phpmyadmin.conf /etc/nginx/sites-enabled/phpmyadmin.conf
+  # echo -e "\033[92;1mphpMyAdmin installed\033[Om"
+  # echo -e "\033[92;1mYou can access it at yourip/pma\033[Om"
 fi
 
 
diff --git a/bin/webhook.sh b/bin/webhook.sh
index 126f823..a05371e 100755
--- a/bin/webhook.sh
+++ b/bin/webhook.sh
@@ -91,7 +91,7 @@ git --git-dir=/home/"$user"/git-repositories/"$_domain.git" remote add origin "$
 
 # hook deploy script
 cp -f "$_assets"/webhook-deploy.sh /home/"$user"/webhook_deploy_"$_id".sh
-sed -i -r "s/DOMAIN/$_domain/g" /home/"$user"/webhook_deploy_"$_domain".sh
+sed -i -r "s/DOMAIN/$_domain/g" /home/"$user"/webhook_deploy_"$_id".sh
 chowm $user:$user /home/"$user"/webhook_deploy_"$_id".sh
 chmod +x /home/"$user"/webhook_deploy_"$_id".sh