| 1 |
diff -urN smeserver-bandwidthd-2.0.1.2.old/createlinks smeserver-bandwidthd-2.0.1.2/createlinks |
| 2 |
--- smeserver-bandwidthd-2.0.1.2.old/createlinks 2014-06-16 16:52:43.000000000 +0100 |
| 3 |
+++ smeserver-bandwidthd-2.0.1.2/createlinks 2020-11-20 09:18:09.072861435 +0000 |
| 4 |
@@ -1,4 +1,4 @@ |
| 5 |
-#!/usr/bin/perl -w |
| 6 |
+#! /usr/bin/perl -w |
| 7 |
|
| 8 |
use esmith::Build::CreateLinks qw(:all); |
| 9 |
|
| 10 |
@@ -18,12 +18,30 @@ |
| 11 |
safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/mysql.init"); |
| 12 |
|
| 13 |
# links for rc.d from init.d |
| 14 |
- service_link_enhanced("bandwidthd", "S85", "7"); |
| 15 |
- service_link_enhanced("bandwidthd", "K45", "6"); |
| 16 |
- service_link_enhanced("bandwidthd", "K45", "0"); |
| 17 |
- service_link_enhanced("bandwidthd", "K45", "1"); |
| 18 |
+# service_link_enhanced("bandwidthd", "S85", "7"); |
| 19 |
+# service_link_enhanced("bandwidthd", "K45", "6"); |
| 20 |
+# service_link_enhanced("bandwidthd", "K45", "0"); |
| 21 |
+# service_link_enhanced("bandwidthd", "K45", "1"); |
| 22 |
|
| 23 |
|
| 24 |
safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/var/www/bandwidthd/phphtdocs/config.conf/template-begin"); |
| 25 |
safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/var/www/bandwidthd/phphtdocs/config.conf/template-end"); |
| 26 |
-safe_symlink("../../../functions/bandwidthd", "root/etc/e-smith/web/panels/manager/cgi-bin/bandwidthd"); |
| 27 |
+safe_symlink("../../../functions/wrapper", "root/etc/e-smith/web/panels/manager/cgi-bin/bandwidthd"); |
| 28 |
+ |
| 29 |
+# rpm update action (invoked by yum on install and update |
| 30 |
+event_actions("smeserver-bandwidthd-update", qw( |
| 31 |
+ bandwidthd-enable 20 |
| 32 |
+ bandwidthd-start 30 |
| 33 |
+)); |
| 34 |
+ |
| 35 |
+event_templates("smeserver-bandwidthd-update", qw( |
| 36 |
+ /etc/httpd/conf/httpd.conf |
| 37 |
+ /etc/crontab |
| 38 |
+)); |
| 39 |
+ |
| 40 |
+event_services("smeserver-bandwidthd-update", qw( |
| 41 |
+ httpd-e-smith sigusr1 |
| 42 |
+ php-fpm reload |
| 43 |
+)); |
| 44 |
+ |
| 45 |
+ |
| 46 |
diff -urN smeserver-bandwidthd-2.0.1.2.old/root/etc/e-smith/events/actions/bandwidthd-enable smeserver-bandwidthd-2.0.1.2/root/etc/e-smith/events/actions/bandwidthd-enable |
| 47 |
--- smeserver-bandwidthd-2.0.1.2.old/root/etc/e-smith/events/actions/bandwidthd-enable 1970-01-01 01:00:00.000000000 +0100 |
| 48 |
+++ smeserver-bandwidthd-2.0.1.2/root/etc/e-smith/events/actions/bandwidthd-enable 2020-11-19 16:04:39.431994277 +0000 |
| 49 |
@@ -0,0 +1,2 @@ |
| 50 |
+#/bin/sh |
| 51 |
+systemctl enable bandwidthd.service |
| 52 |
diff -urN smeserver-bandwidthd-2.0.1.2.old/root/etc/e-smith/events/actions/bandwidthd-start smeserver-bandwidthd-2.0.1.2/root/etc/e-smith/events/actions/bandwidthd-start |
| 53 |
--- smeserver-bandwidthd-2.0.1.2.old/root/etc/e-smith/events/actions/bandwidthd-start 1970-01-01 01:00:00.000000000 +0100 |
| 54 |
+++ smeserver-bandwidthd-2.0.1.2/root/etc/e-smith/events/actions/bandwidthd-start 2020-11-19 16:05:31.800491288 +0000 |
| 55 |
@@ -0,0 +1,2 @@ |
| 56 |
+#!/bin/sh |
| 57 |
+systemctl start bandwidthd.service |
| 58 |
diff -urN smeserver-bandwidthd-2.0.1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86bandwidthd smeserver-bandwidthd-2.0.1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86bandwidthd |
| 59 |
--- smeserver-bandwidthd-2.0.1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86bandwidthd 2014-06-16 16:52:43.000000000 +0100 |
| 60 |
+++ smeserver-bandwidthd-2.0.1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86bandwidthd 2020-11-19 14:28:41.550736403 +0000 |
| 61 |
@@ -59,8 +59,14 @@ |
| 62 |
$OUT .= "\n"; |
| 63 |
$OUT .= "<Directory /var/www/bandwidthd/htdocs>\n"; |
| 64 |
$OUT .= " AddType application/x-httpd-php .php .conf\n"; |
| 65 |
- $OUT .= " php_admin_value open_basedir /var/www/bandwidthd/htdocs\n"; |
| 66 |
- $OUT .= " SSLRequireSSL\n"; |
| 67 |
+ |
| 68 |
+ #$OUT .= " AddType application/x-httpd-php .php .conf\n"; |
| 69 |
+ #$OUT .= " php_admin_value open_basedir /var/www/bandwidthd/htdocs\n"; |
| 70 |
+ |
| 71 |
+ $OUT .= "<FilesMatch \.php\$\>\n"; |
| 72 |
+ $OUT .= "SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost\"\n"; |
| 73 |
+ $OUT .= "</FilesMatch>\n"; |
| 74 |
+ |
| 75 |
$OUT .= " Options None\n"; |
| 76 |
$OUT .= " order deny,allow\n"; |
| 77 |
$OUT .= " deny from all\n"; |
| 78 |
@@ -94,8 +100,15 @@ |
| 79 |
|
| 80 |
$OUT .= "\n"; |
| 81 |
$OUT .= "<Directory /var/www/bandwidthd/phphtdocs>\n"; |
| 82 |
- $OUT .= " AddType application/x-httpd-php .php .conf\n"; |
| 83 |
- $OUT .= " php_admin_value open_basedir /var/www/bandwidthd/phphtdocs\n"; |
| 84 |
+ |
| 85 |
+ #$OUT .= " AddType application/x-httpd-php .php .conf\n"; |
| 86 |
+ #$OUT .= " php_admin_value open_basedir /var/www/bandwidthd/htdocs\n"; |
| 87 |
+ |
| 88 |
+ $OUT .= "<FilesMatch \.php\$\>\n"; |
| 89 |
+ $OUT .= "SetHandler \"proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost\"\n"; |
| 90 |
+ $OUT .= "</FilesMatch>\n"; |
| 91 |
+ |
| 92 |
+ |
| 93 |
$OUT .= " SSLRequireSSL\n"; |
| 94 |
$OUT .= " Options None\n"; |
| 95 |
$OUT .= " order deny,allow\n"; |
Parent Directory
| 
Revision Log
| 
Revision Graph
