From 846f8bc41d8e9693227b90ba2181172941617b70 Mon Sep 17 00:00:00 2001
From: Matthew Saunders Brown <matthewsaundersbrown@gmail.com>
Date: Fri, 14 Jun 2024 12:41:43 -0700
Subject: [PATCH] remove old code, rearrange reload

---
 install.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/install.sh b/install.sh
index e58285f..9091c4c 100755
--- a/install.sh
+++ b/install.sh
@@ -132,12 +132,6 @@ sed -i "s|session.gc_probability = 0|session.gc_probability = 1|g" /etc/php/$php
 sed -i "s|session.gc_probability = 0|session.gc_probability = 1|g" /etc/php/$phpVersion/cli/php.ini
 # Configure PHP-FPM to use "ondemand"
 sed -i "s|pm = dynamic|pm = ondemand|g" /etc/php/$phpVersion/fpm/pool.d/www.conf
-systemctl reload apache2
-##   configure overrides
-#   sed -i "s|^user = www-data|user = $USERNAME|g" /etc/php/7.2/fpm/pool.d/www.conf
-#   sed -i "s|^group = www-data|group = $USERNAME|g" /etc/php/7.2/fpm/pool.d/www.conf
-systemctl reload php$phpVersion-fpm
-systemctl enable --now vhost-reload-php.path
 
 if [ -d /srv/www ]; then
   if [ -d /var/www ]; then
@@ -160,6 +154,10 @@ else
   install --owner=vhost --group=vhost --mode=755 --directory /srv/www/html
 fi
 
+systemctl reload apache2
+systemctl reload php$phpVersion-fpm
+systemctl enable --now vhost-reload-php.path
+
 # Webalizer
 DEBIAN_FRONTEND=noninteractive apt-get -y install webalizer
 cp etc/logrotate.d/apache2 /etc/logrotate.d/apache2