| 1 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-isoqlog-2.2.1.old/createlinks smeserver-isoqlog-2.2.1/createlinks |
| 2 |
|
|
--- smeserver-isoqlog-2.2.1.old/createlinks 2022-07-29 01:45:37.412000000 -0400 |
| 3 |
jpp |
1.2 |
+++ smeserver-isoqlog-2.2.1/createlinks 2022-07-29 02:26:47.095000000 -0400 |
| 4 |
jpp |
1.1 |
@@ -6,14 +6,6 @@ |
| 5 |
|
|
|
| 6 |
|
|
# Start and stop links |
| 7 |
|
|
|
| 8 |
|
|
-service_link_enhanced("httpd-isoqlog", "S86", "7"); |
| 9 |
|
|
-service_link_enhanced("httpd-isoqlog", "K15", "6"); |
| 10 |
|
|
-service_link_enhanced("httpd-isoqlog", "K15", "0"); |
| 11 |
|
|
-service_link_enhanced("httpd-isoqlog", "K15", "1"); |
| 12 |
|
|
- |
| 13 |
|
|
-safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-isoqlog'); |
| 14 |
|
|
-safe_symlink("/var/service/httpd-isoqlog" , 'root/service/httpd-isoqlog'); |
| 15 |
|
|
- |
| 16 |
|
|
|
| 17 |
|
|
# Events links |
| 18 |
|
|
templates2events("/etc/httpd/isoqlog-conf/httpd.conf", qw(bootstrap-console-save conf-userpanel domain-modify domain-create)); |
| 19 |
jpp |
1.2 |
@@ -24,11 +16,21 @@ |
| 20 |
jpp |
1.1 |
safe_symlink("sigusr1", "root/etc/e-smith/events/domain-modify/services2adjust/httpd-isoqlog"); |
| 21 |
|
|
safe_symlink("sigusr1", "root/etc/e-smith/events/logrotate/services2adjust/httpd-isoqlog"); |
| 22 |
|
|
|
| 23 |
|
|
-# Create needed empty files |
| 24 |
|
|
-safe_touch("root/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/issoqlog_access_log"); |
| 25 |
|
|
-safe_touch("root/etc/e-smith/events/logrotate/logfiles2timestamp/var/log/httpd/isoqlog_error_log"); |
| 26 |
|
|
-safe_touch("root/var/service/httpd-isoqlog/down"); |
| 27 |
|
|
|
| 28 |
|
|
+my $event="smeserver-isoqlog-update"; |
| 29 |
|
|
+event_services($event, qw( |
| 30 |
|
|
+ httpd-isoqlog reload-or-restart |
| 31 |
|
|
+ httpd-e-smith reload-or-restart |
| 32 |
|
|
+)); |
| 33 |
|
|
+templates2events("/etc/httpd/conf/httpd.conf",$event); |
| 34 |
|
|
+templates2events("/etc/httpd/isoqlog-conf/httpd.conf",$event); |
| 35 |
|
|
+templates2events("/etc/isoqlog.domains",$event); |
| 36 |
|
|
+templates2events("/etc/isoqlog.conf",$event); |
| 37 |
|
|
+ |
| 38 |
|
|
+event_actions($event, qw( |
| 39 |
|
|
+ systemd-default 88 |
| 40 |
|
|
+ systemd-reload 89 |
| 41 |
|
|
+)); |
| 42 |
|
|
|
| 43 |
|
|
#-------------------------------------------------- |
| 44 |
|
|
# functions for manager panel |
| 45 |
|
|
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 |
| 46 |
|
|
--- 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 |
| 47 |
|
|
+++ 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 |
|
|
@@ -48,6 +48,11 @@ |
| 49 |
|
|
setenvif |
| 50 |
|
|
ssl |
| 51 |
|
|
cgi |
| 52 |
|
|
+ mpm_prefork |
| 53 |
|
|
+ unixd |
| 54 |
|
|
+ authn_core |
| 55 |
|
|
+ authz_core |
| 56 |
|
|
+ systemd |
| 57 |
|
|
)) |
| 58 |
|
|
{ |
| 59 |
|
|
next unless -f "/usr/lib/httpd/modules/mod_${_}.so" || |
| 60 |
|
|
@@ -110,7 +115,6 @@ |
| 61 |
|
|
AddIconByType (IMG,/icons/image2.gif) image/* |
| 62 |
|
|
AddIconByType (SND,/icons/sound2.gif) audio/* |
| 63 |
|
|
AddIconByType (VID,/icons/movie.gif) video/* |
| 64 |
|
|
-DefaultType text/plain |
| 65 |
|
|
TypesConfig /etc/mime.types |
| 66 |
|
|
|
| 67 |
|
|
AddEncoding x-compress Z |
| 68 |
|
|
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 |
| 69 |
|
|
--- smeserver-isoqlog-2.2.1.old/root/usr/lib/systemd/system/httpd-isoqlog.service 1969-12-31 19:00:00.000000000 -0500 |
| 70 |
|
|
+++ smeserver-isoqlog-2.2.1/root/usr/lib/systemd/system/httpd-isoqlog.service 2022-07-29 02:17:15.157000000 -0400 |
| 71 |
|
|
@@ -0,0 +1,25 @@ |
| 72 |
|
|
+[Unit] |
| 73 |
|
|
+Description=httpd-isoqlog The Koozali SME Server isoqlog web service |
| 74 |
|
|
+After=network.target remote-fs.target |
| 75 |
|
|
+Documentation=man:httpd(8) |
| 76 |
|
|
+Documentation=man:apachectl(8) |
| 77 |
|
|
+ |
| 78 |
|
|
+[Service] |
| 79 |
|
|
+Type=notify |
| 80 |
|
|
+EnvironmentFile=/etc/sysconfig/httpd |
| 81 |
|
|
+ExecStartPre=/sbin/e-smith/service-status httpd-isoqlog |
| 82 |
|
|
+ExecStartPre=/sbin/e-smith/expand-template /etc/httpd/isoqlog-conf/httpd.conf |
| 83 |
|
|
+ExecStart=/usr/sbin/httpd -f /etc/httpd/isoqlog-conf/httpd.conf -DFOREGROUND |
| 84 |
|
|
+ExecReload=/usr/sbin/httpd -f /etc/httpd/isoqlog-conf/httpd.conf -k graceful |
| 85 |
|
|
+ExecStop=/bin/kill -WINCH ${MAINPID} |
| 86 |
|
|
+# We want systemd to give httpd some time to finish gracefully, but still want |
| 87 |
|
|
+# it to kill httpd after TimeoutStopSec if something went wrong during the |
| 88 |
|
|
+# graceful stop. Normally, Systemd sends SIGTERM signal right after the |
| 89 |
|
|
+# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give |
| 90 |
|
|
+# httpd time to finish. |
| 91 |
|
|
+KillSignal=SIGCONT |
| 92 |
|
|
+PrivateTmp=true |
| 93 |
|
|
+ |
| 94 |
|
|
+[Install] |
| 95 |
|
|
+WantedBy=sme-server.target |
| 96 |
|
|
+ |
Parent Directory
| 
Revision Log
| 
Revision Graph
