diff -Nur --no-dereference smeserver-isoqlog-2.2.1.old/createlinks smeserver-isoqlog-2.2.1/createlinks --- smeserver-isoqlog-2.2.1.old/createlinks 2022-07-29 01:45:37.412000000 -0400 +++ smeserver-isoqlog-2.2.1/createlinks 2022-07-29 02:20:17.939000000 -0400 @@ -6,14 +6,6 @@ # Start and stop links -service_link_enhanced("httpd-isoqlog", "S86", "7"); -service_link_enhanced("httpd-isoqlog", "K15", "6"); -service_link_enhanced("httpd-isoqlog", "K15", "0"); -service_link_enhanced("httpd-isoqlog", "K15", "1"); - -safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-isoqlog'); -safe_symlink("/var/service/httpd-isoqlog" , 'root/service/httpd-isoqlog'); - # Events links templates2events("/etc/httpd/isoqlog-conf/httpd.conf", qw(bootstrap-console-save conf-userpanel domain-modify domain-create)); @@ -24,11 +16,22 @@ safe_symlink("sigusr1", "root/etc/e-smith/events/domain-modify/services2adjust/httpd-isoqlog"); safe_symlink("sigusr1", "root/etc/e-smith/events/logrotate/services2adjust/httpd-isoqlog"); -# Create needed empty files -safe_touch("root/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/issoqlog_access_log"); -safe_touch("root/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/isoqlog_error_log"); -safe_touch("root/var/service/httpd-isoqlog/down"); +my $event="smeserver-isoqlog-update"; +safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/httpd-isoqlog"); +event_services($event, qw( + httpd-isoqlog reload-or-restart + httpd-e-smith reload-or-restart +)); +templates2events("/etc/httpd/conf/httpd.conf",$event); +templates2events("/etc/httpd/isoqlog-conf/httpd.conf",$event); +templates2events("/etc/isoqlog.domains",$event); +templates2events("/etc/isoqlog.conf",$event); + +event_actions($event, qw( + systemd-default 88 + systemd-reload 89 +)); #-------------------------------------------------- # functions for manager panel diff -Nur --no-dereference smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/20Modules smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/20Modules --- smeserver-isoqlog-2.2.1.old/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/20Modules 2012-08-21 03:28:16.000000000 -0400 +++ smeserver-isoqlog-2.2.1/root/etc/e-smith/templates/etc/httpd/isoqlog-conf/httpd.conf/20Modules 2022-07-29 02:17:15.378000000 -0400 @@ -48,6 +48,11 @@ setenvif ssl cgi + mpm_prefork + unixd + authn_core + authz_core + systemd )) { next unless -f "/usr/lib/httpd/modules/mod_${_}.so" || @@ -110,7 +115,6 @@ AddIconByType (IMG,/icons/image2.gif) image/* AddIconByType (SND,/icons/sound2.gif) audio/* AddIconByType (VID,/icons/movie.gif) video/* -DefaultType text/plain TypesConfig /etc/mime.types AddEncoding x-compress Z diff -Nur --no-dereference smeserver-isoqlog-2.2.1.old/root/usr/lib/systemd/system/httpd-isoqlog.service smeserver-isoqlog-2.2.1/root/usr/lib/systemd/system/httpd-isoqlog.service --- smeserver-isoqlog-2.2.1.old/root/usr/lib/systemd/system/httpd-isoqlog.service 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-isoqlog-2.2.1/root/usr/lib/systemd/system/httpd-isoqlog.service 2022-07-29 02:17:15.157000000 -0400 @@ -0,0 +1,25 @@ +[Unit] +Description=httpd-isoqlog The Koozali SME Server isoqlog web service +After=network.target remote-fs.target +Documentation=man:httpd(8) +Documentation=man:apachectl(8) + +[Service] +Type=notify +EnvironmentFile=/etc/sysconfig/httpd +ExecStartPre=/sbin/e-smith/service-status httpd-isoqlog +ExecStartPre=/sbin/e-smith/expand-template /etc/httpd/isoqlog-conf/httpd.conf +ExecStart=/usr/sbin/httpd -f /etc/httpd/isoqlog-conf/httpd.conf -DFOREGROUND +ExecReload=/usr/sbin/httpd -f /etc/httpd/isoqlog-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 +