[freeside-commits] branch master updated. eca9fd0d0f2594489cf4a85a0669caeeb51328ec

[Ivan Kohler]

The branch, master has been updated
       via  eca9fd0d0f2594489cf4a85a0669caeeb51328ec (commit)
      from  eabe4bcb022bfede9c0f9393109976293cbfd9c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eca9fd0d0f2594489cf4a85a0669caeeb51328ec
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Jul 16 09:01:05 2024 -0700

    systemd: start apache after postgresql

diff --git a/Makefile b/Makefile
index 3a6012849..1a6725dea 100644
--- a/Makefile
+++ b/Makefile
@@ -291,8 +291,8 @@ install-apache:
 	[ -d ${APACHE_CONF} ] && [ -x /usr/sbin/a2enconf ] && ( /usr/sbin/a2enconf freeside-base2.4 ) || true
 	[ -d ${APACHE_CONF} ] && [ -x /usr/sbin/a2disconf ] && ( /usr/sbin/a2disconf freeside-base2 ) || true
 	[ -d ${APACHE_CONF} ] && [ -x /usr/sbin/a2enconf ] && [ ${RT_ENABLED} -eq 1 ] && ( /usr/sbin/a2enconf freeside-rt ) || true
-	[ -x /usr/sbin/systemctl ] && mkdir /etc/systemd/system/apache.d/ || true
-	[ -x /usr/sbin/systemctl ] && ( install -o root -m 755 init.d/systemd-apache-override.conf /etc/systemd/system/apache2.d/override.conf && /usr/sbin/systemctl daemon-reload ) || true
+	[ -x /usr/bin/systemctl ] && mkdir /etc/systemd/system/apache.service.d/ || true
+	[ -x /usr/bin/systemctl ] && ( install -o root -m 755 init.d/systemd-apache-override.conf /etc/systemd/system/apache2.service.d/override.conf && /usr/bin/systemctl daemon-reload ) || true
 
 install-selfservice:
 	[ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
diff --git a/debian/freeside-webui.dirs b/debian/freeside-webui.dirs
index 216d42de8..c66d55a23 100644
--- a/debian/freeside-webui.dirs
+++ b/debian/freeside-webui.dirs
@@ -1,2 +1,2 @@
 /usr/local/etc/freeside/profile
-/etc/systemd/system/apache2.d
+/etc/systemd/system/apache2.service.d
diff --git a/debian/rules b/debian/rules
index 928e589eb..b3240880a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,7 +133,7 @@ install-stamp: build-stamp
 
 	install -d $(FREESIDE_DOCUMENT_ROOT)
 	install -d $(TMP)-webui/usr/local/etc/freeside/
-	install -d $(TMP)-webui/etc/systemd/system/apache2.d/
+	install -d $(TMP)-webui/etc/systemd/system/apache2.service.d/
 	install -d $(TMP)/usr/local/etc/freeside/
 #	install -d $(TMP)-lib/usr/bin
 
@@ -176,7 +176,7 @@ install-stamp: build-stamp
 # Create Apache configurations
 	install -d $(APACHE_CONF)
 	$(MAKE) -e DESTDIR=$(APACHE_CONF) install-apache
-	install -o root -m 755 init.d/systemd-apache-override.conf $(TMP)-webui/etc/systemd/system/apache2.d/override.conf
+	install -o root -m 755 init.d/systemd-apache-override.conf $(TMP)-webui/etc/systemd/system/apache2.service.d/override.conf
 
         #Hack the build dir out of apache config
 

-----------------------------------------------------------------------

Summary of changes:
 Makefile                   | 4 ++--
 debian/freeside-webui.dirs | 2 +-
 debian/rules               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)