diff -Nur e-smith-apache-2.6.0.old/createlinks e-smith-apache-2.6.0/createlinks --- e-smith-apache-2.6.0.old/createlinks 2016-02-04 13:27:55.000000000 -0500 +++ e-smith-apache-2.6.0/createlinks 2020-12-10 21:39:23.603000000 -0500 @@ -1,6 +1,14 @@ #!/usr/bin/perl -w use esmith::Build::CreateLinks qw(:all); +#-------------------------------------------------- +# actions for e-smith-apache-update +#-------------------------------------------------- +my $event = "e-smith-apache-update"; +templates2events("/etc/httpd/conf/httpd.conf", $event); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +event_link("systemd-reload", $event, "89"); +event_link("systemd-default", $event, "88"); #-------------------------------------------------- # actions for console-save event @@ -25,7 +33,7 @@ $event = "domain-create"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for domain-delete event @@ -34,7 +42,7 @@ $event = "domain-delete"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for domain-modify event @@ -43,7 +51,7 @@ $event = "domain-modify"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for host-create event @@ -52,7 +60,7 @@ $event = "host-create"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for host-delete event @@ -61,7 +69,7 @@ $event = "host-delete"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for host-modify event @@ -70,7 +78,7 @@ $event = "host-modify"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for ibay-create event @@ -79,7 +87,7 @@ $event = "ibay-create"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for ibay-delete event @@ -88,7 +96,7 @@ $event = "ibay-delete"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for ibay-modify event @@ -98,7 +106,7 @@ $event = "ibay-modify"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for ibay-modify-servers event @@ -108,7 +116,7 @@ $event = "ibay-modify-servers"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for network-create event @@ -117,7 +125,7 @@ $event = "network-create"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for network-delete event @@ -126,7 +134,7 @@ $event = "network-delete"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for remoteaccess-update event @@ -135,7 +143,7 @@ $event = "remoteaccess-update"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for email-update event @@ -144,7 +152,7 @@ $event = "email-update"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for logrotate event @@ -152,7 +160,7 @@ $event = "logrotate"; -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); #-------------------------------------------------- # actions for ssl-update event @@ -160,16 +168,8 @@ $event = "ssl-update"; templates2events("/etc/httpd/conf/httpd.conf", $event); -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); - -#-------------------------------------------------- -# set up daemontools -#-------------------------------------------------- +safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); -safe_symlink("daemontools", "root/etc/rc.d/init.d/httpd-e-smith"); -service_link_enhanced("httpd-e-smith", "S86", "7"); -service_link_enhanced("httpd-e-smith", "K15", "6"); -service_link_enhanced("httpd-e-smith", "K15", "0"); # Set up generic logfile timestamp renaming/symlinking diff -Nur e-smith-apache-2.6.0.old/root/sbin/e-smith/systemd/httpd-e-smith-prepare e-smith-apache-2.6.0/root/sbin/e-smith/systemd/httpd-e-smith-prepare --- e-smith-apache-2.6.0.old/root/sbin/e-smith/systemd/httpd-e-smith-prepare 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-apache-2.6.0/root/sbin/e-smith/systemd/httpd-e-smith-prepare 2020-12-09 23:51:58.296000000 -0500 @@ -0,0 +1,13 @@ +#!/bin/sh +#---------------------------------------------------------------------- +# copyright (C) 1999-2005 Mitel Networks Corporation +#---------------------------------------------------------------------- + +if ! test -e /home/e-smith/files/ibays/Primary/html +then + # Make sure that DocumentRoot directory exists + mkdir -p /home/e-smith/files/ibays/Primary/html + chown admin.shared /home/e-smith/files/ibays/Primary/html + chmod 02750 /home/e-smith/files/ibays/Primary/html +fi + diff -Nur e-smith-apache-2.6.0.old/root/usr/lib/systemd/system/httpd-e-smith.service e-smith-apache-2.6.0/root/usr/lib/systemd/system/httpd-e-smith.service --- e-smith-apache-2.6.0.old/root/usr/lib/systemd/system/httpd-e-smith.service 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-apache-2.6.0/root/usr/lib/systemd/system/httpd-e-smith.service 2020-12-09 23:52:30.379000000 -0500 @@ -0,0 +1,26 @@ +[Unit] +Description=httpd-e-smith The Koozali SME Server Apache HTTP Service +After=network.target remote-fs.target nss-lookup.target +Documentation=man:httpd(8) +Documentation=man:apachectl(8) + +[Service] +Type=notify +EnvironmentFile=/etc/sysconfig/httpd +ExecStartPre=/sbin/e-smith/service-status httpd-e-smith +ExecStartPre=/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf +ExecStartPre=/sbin/e-smith/systemd/httpd-e-smith-prepare +ExecStart=/usr/sbin/httpd -f /etc/httpd/conf/httpd.conf -DFOREGROUND +ExecReload=/usr/sbin/httpd -f /etc/httpd/conf/httpd.conf -k graceful +ExecStop=/bin/kill -WINCH ${MAINPID} +# We want systemd to give httpd some time to finish gracefully, but still want +# it to kill httpd after TimeoutStopSec if something went wrong during the +# graceful stop. Normally, Systemd sends SIGTERM signal right after the +# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give +# httpd time to finish. +KillSignal=SIGCONT +PrivateTmp=true + +[Install] +WantedBy=sme-server.target +