summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2024-07-15 14:04:10 -0700
committerIvan Kohler <ivan@freeside.biz>2024-07-15 14:04:10 -0700
commitd7d595017893aa3c4ffa23ca56d85de1dd68e5ed (patch)
tree607b1d0ccabdb1559ec41d28c8377c18d536a8f0 /debian
parent400a6a7ef33be86a658c9b18ebd66acd65a0e9af (diff)
systemd: start apache after postgresql
Diffstat (limited to 'debian')
-rw-r--r--debian/freeside-webui.dirs1
-rw-r--r--debian/freeside-webui.postinst3
-rwxr-xr-xdebian/rules4
3 files changed, 4 insertions, 4 deletions
diff --git a/debian/freeside-webui.dirs b/debian/freeside-webui.dirs
index 550c17514..216d42de8 100644
--- a/debian/freeside-webui.dirs
+++ b/debian/freeside-webui.dirs
@@ -1 +1,2 @@
/usr/local/etc/freeside/profile
+/etc/systemd/system/apache2.d
diff --git a/debian/freeside-webui.postinst b/debian/freeside-webui.postinst
index c5ea87978..50bdff2db 100644
--- a/debian/freeside-webui.postinst
+++ b/debian/freeside-webui.postinst
@@ -8,8 +8,7 @@ rm -fr /usr/local/etc/freeside/masondata/*
/usr/sbin/a2enmod mpm_prefork
#/usr/sbin/service restart apache2
-#XXX systemd equivalent (start apache after postgres)
-/sbin/insserv -d
+/usr/bin/systemctl daemon-reload
exit 0
diff --git a/debian/rules b/debian/rules
index 88a0dfb97..928e589eb 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/insserv/overrides/
+ install -d $(TMP)-webui/etc/systemd/system/apache2.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/insserv-override-apache2 $(TMP)-webui/etc/insserv/overrides/apache2
+ install -o root -m 755 init.d/systemd-apache-override.conf $(TMP)-webui/etc/systemd/system/apache2.d/override.conf
#Hack the build dir out of apache config