From 12190efb4c452a6d293f4ed8c0069b09075535f5 Mon Sep 17 00:00:00 2001
From: noogen <tom@noogen.net>
Date: Tue, 21 May 2019 09:51:11 -0500
Subject: [PATCH] fix new temp folder

---
 rootfs/sysprepz/admin/bin/my-startup.sh       | 5 +++++
 rootfs/sysprepz/apache2-templates/php71fpm.sh | 3 ++-
 rootfs/sysprepz/apache2-templates/php72fpm.sh | 3 ++-
 rootfs/sysprepz/apache2-templates/php73fpm.sh | 3 ++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/rootfs/sysprepz/admin/bin/my-startup.sh b/rootfs/sysprepz/admin/bin/my-startup.sh
index 4ce4f55..41e4305 100755
--- a/rootfs/sysprepz/admin/bin/my-startup.sh
+++ b/rootfs/sysprepz/admin/bin/my-startup.sh
@@ -8,6 +8,11 @@ cd /etc/init.d/
 ./apache2 start
 ./mysql start
 
+# delete old php-fpm running file on restart
+rm -f /var/run/vesta*.sock
+rm -f /var/run/vesta*.pid
+rm -f /var/run/nginx.pid
+
 # delete defult postgres admindb if not use, then comment out the line below
 ./postgresql start
 ./nginx start
diff --git a/rootfs/sysprepz/apache2-templates/php71fpm.sh b/rootfs/sysprepz/apache2-templates/php71fpm.sh
index 8a0df8b..84bdd71 100755
--- a/rootfs/sysprepz/apache2-templates/php71fpm.sh
+++ b/rootfs/sysprepz/apache2-templates/php71fpm.sh
@@ -60,7 +60,8 @@ echo "$fpm_conf" > $fpm_conf_file
 chown $user:$user $fpm_conf_file
 chmod -f 751 $fpm_conf_file
 mkdir -p /home/$user/web/$domain/tmp/cache
-rm -rf /home/$user/web/$domain/tmp/cache
+rm -rf /home/$user/web/$domain/tmp/*
+chown $user:$user /home/$user/web/$domain/tmp
 mkdir -p /home/$user/web/$domain/tmp/cache
 chown -R www-data:www-data /home/$user/web/$domain/tmp/cache
 
diff --git a/rootfs/sysprepz/apache2-templates/php72fpm.sh b/rootfs/sysprepz/apache2-templates/php72fpm.sh
index 6939ea8..1672f6f 100755
--- a/rootfs/sysprepz/apache2-templates/php72fpm.sh
+++ b/rootfs/sysprepz/apache2-templates/php72fpm.sh
@@ -60,7 +60,8 @@ echo "$fpm_conf" > $fpm_conf_file
 chown $user:$user $fpm_conf_file
 chmod -f 751 $fpm_conf_file
 mkdir -p /home/$user/web/$domain/tmp/cache
-rm -rf /home/$user/web/$domain/tmp/cache
+rm -rf /home/$user/web/$domain/tmp/*
+chown $user:$user /home/$user/web/$domain/tmp
 mkdir -p /home/$user/web/$domain/tmp/cache
 chown -R www-data:www-data /home/$user/web/$domain/tmp/cache
 
diff --git a/rootfs/sysprepz/apache2-templates/php73fpm.sh b/rootfs/sysprepz/apache2-templates/php73fpm.sh
index 5db8552..9934e56 100755
--- a/rootfs/sysprepz/apache2-templates/php73fpm.sh
+++ b/rootfs/sysprepz/apache2-templates/php73fpm.sh
@@ -60,7 +60,8 @@ echo "$fpm_conf" > $fpm_conf_file
 chown $user:$user $fpm_conf_file
 chmod -f 751 $fpm_conf_file
 mkdir -p /home/$user/web/$domain/tmp/cache
-rm -rf /home/$user/web/$domain/tmp/cache
+rm -rf /home/$user/web/$domain/tmp/*
+chown $user:$user /home/$user/web/$domain/tmp
 mkdir -p /home/$user/web/$domain/tmp/cache
 chown -R www-data:www-data /home/$user/web/$domain/tmp/cache