From 7bc3188cb327c9b92bd2223f1823085b3e5f2d97 Mon Sep 17 00:00:00 2001
From: Matthew Saunders Brown <matthewsaundersbrown@gmail.com>
Date: Fri, 3 Mar 2023 10:42:13 -0800
Subject: [PATCH] misc

---
 bin/vhost-user-del.sh                      | 2 +-
 etc/apache2/conf-available/phpMyAdmin.conf | 2 +-
 install.sh                                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/vhost-user-del.sh b/bin/vhost-user-del.sh
index 72a41f1..066d09a 100755
--- a/bin/vhost-user-del.sh
+++ b/bin/vhost-user-del.sh
@@ -95,7 +95,7 @@ fi
 
 # remove jailkit socket if it exists
 if grep -q "\[/usr/jails/$username/dev/log\]" /etc/jailkit/jk_socketd.ini; then
-  sed -i '/\/usr\/jails\/$username\/dev\/log/,+3 d' /etc/jailkit/jk_socketd.ini
+  sed -i "/\/usr\/jails\/$username\/dev\/log/,+3 d" /etc/jailkit/jk_socketd.ini
   killall jk_socketd
   jk_socketd
 fi
diff --git a/etc/apache2/conf-available/phpMyAdmin.conf b/etc/apache2/conf-available/phpMyAdmin.conf
index e6e3ed3..6e82830 100644
--- a/etc/apache2/conf-available/phpMyAdmin.conf
+++ b/etc/apache2/conf-available/phpMyAdmin.conf
@@ -14,6 +14,6 @@ SetExternalAuthMethod pwauth pipe
 # this is to force the default fpm, so we don't end up trying to use a virtualhosts jailed fpm which won't work
 <Directory "/srv/www/html/phpMyAdmin">
   <FilesMatch ".+\.ph(ar|p|tml)$">
-    SetHandler "proxy:unix:/run/php/php8.1-fpm.sock|fcgi://localhost"
+    SetHandler "proxy:unix:/etc/alternatives/php-fpm.sock|fcgi://localhost"
   </FilesMatch>
 </Directory>
diff --git a/install.sh b/install.sh
index 8e5e3e4..92aee20 100755
--- a/install.sh
+++ b/install.sh
@@ -180,7 +180,7 @@ sed -i "s|paths = perl, /usr/lib/perl, /usr/lib/perl5, /usr/share/perl, /usr/sha
 echo "" >> /etc/jailkit/jk_init.ini
 echo "[shellstack]" >> /etc/jailkit/jk_init.ini
 echo "comment = full featured shell for vhost-stack jails" >> /etc/jailkit/jk_init.ini
-echo "paths = curl, dircolors, du, env, git, groups, mysql, mysqldump, /etc/bash_completion, /etc/bash_completion.d/, /usr/share/bash-completion/, /etc/ssl/certs/, /etc/nanorc, /usr/local/libexec/command-not-found-handle, /usr/share/nano/, /usr/share/zoneinfo/, /usr/local/bin/composer, /usr/local/bin/wp, /usr/local/sbin/mini_sendmail" >> /etc/jailkit/jk_init.ini
+echo "paths = curl, diff, dircolors, du, env, git, groups, mysql, mysqldump, /etc/bash_completion, /etc/bash_completion.d/, /usr/share/bash-completion/, /etc/ssl/certs/, /etc/nanorc, /usr/local/libexec/command-not-found-handle, /usr/share/nano/, /usr/share/zoneinfo/, /usr/local/bin/composer, /usr/local/bin/wp, /usr/local/sbin/mini_sendmail" >> /etc/jailkit/jk_init.ini
 echo "includesections = extendedshell, netutils, logbasics, apacheutils, php" >> /etc/jailkit/jk_init.ini
 echo "" >> /etc/jailkit/jk_init.ini
 echo "[php]" >> /etc/jailkit/jk_init.ini