diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2024-07-16 09:01:11 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2024-07-16 09:01:11 -0700 |
| commit | 9d1df83528a94357dca0fea708af08bae05bc402 (patch) | |
| tree | 9c6a2eb4a141b138594ca4c7f9b4f9941db1241f | |
| parent | 4cb1136ca8397497cb05916b1e1f35a4650d030d (diff) | |
systemd: start apache after postgresqlFREESIDE_3_BRANCH
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | debian/freeside-webui.dirs | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -298,8 +298,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 ed8c6cac5..b8c544b4c 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 $(FREESIDE_CACHE)/masondata #MASONDATA # 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 |