/[smecontribs]/rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-Update-httpd-createlinks-and-adduser.ini.patch
ViewVC logotype

Annotation of /rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-Update-httpd-createlinks-and-adduser.ini.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Mon Dec 7 15:26:42 2020 UTC (3 years, 10 months ago) by brianr
Branch: MAIN
CVS Tags: smeserver-zabbix-server-0_1-22_el7_sme, smeserver-zabbix-server-0_1-25_el7_sme, smeserver-zabbix-server-0_1-24_el7_sme, smeserver-zabbix-server-0_1-21_el7_sme, smeserver-zabbix-server-0_1-20_el7_sme, smeserver-zabbix-server-0_1-23_el7_sme 
* Mon Dec 07 2020 Brian Read <brianr@bjsystems.co.uk> 0.1-20.sme
- Import to SME10 tree [SME: 11232]
- Update createlinks for systemd
- Update httpd.conf for php-fpw
- Add .user.ini for php-admin-flags that where in httpd.conf
1 brianr 1.1 diff -urN smeserver-zabbix-server-0.1.old/createlinks smeserver-zabbix-server-0.1/createlinks
2     --- smeserver-zabbix-server-0.1.old/createlinks 2020-12-04 18:37:16.201582185 +0000
3     +++ smeserver-zabbix-server-0.1/createlinks 2020-12-07 11:21:06.077132534 +0000
4     @@ -30,8 +30,27 @@
5     # Bash header
6     safe_symlink("/etc/e-smith/templates-default/template-begin-shell", "root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/template-begin");
7    
8     -# Start and stop links
9     -service_link_enhanced("zabbix-server", "S99", "7");
10     -service_link_enhanced("zabbix-server", "K10", "6");
11     -service_link_enhanced("zabbix-server", "K10", "0");
12     +# Start and stop links - sysV
13     +#service_link_enhanced("zabbix-server", "S99", "7");
14     +#service_link_enhanced("zabbix-server", "K10", "6");
15     +#service_link_enhanced("zabbix-server", "K10", "0");
16     +
17     +#Systemd start stop
18     +# rpm update action (invoked by yum on install and update
19     +$contrib = "smeserver-zabbix-server";
20     +event_actions("$contrib-update", qw(
21     + systemd-default 10
22     +));
23     +
24     +event_templates("$contrib-update", qw(
25     + /etc/httpd/conf/httpd.conf
26     + /etc/crontab
27     + /etc/systemd/system-preset/49-koozali.preset
28     +
29     +));
30     +
31     +event_services("$contrib-update", qw(
32     + httpd-e-smith sigusr1
33     + php-fpm reload
34     +));
35    
36     diff -urN smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/smeserver-zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/smeserver-zabbix-server
37     --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/smeserver-zabbix-server 1970-01-01 01:00:00.000000000 +0100
38     +++ smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/smeserver-zabbix-server 2020-12-07 11:25:41.447841355 +0000
39     @@ -0,0 +1,3 @@
40     +systemctl daemon-reload
41     +systemsctl preset-all
42     +systemsctl restart zabbix-server
43     diff -urN smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/zabbix-server
44     --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/zabbix-server 2020-12-04 18:37:16.201582185 +0000
45     +++ smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/zabbix-server 2020-12-07 11:15:14.182670946 +0000
46     @@ -1,7 +1,7 @@
47     #!/bin/bash
48     # restart mysql.init
49     -/sbin/service zabbix-server stop 1>/dev/null
50     -/sbin/service mysql.init restart 1>/dev/null
51     -/sbin/service zabbix-server start 1>/dev/null
52     +#/sbin/service zabbix-server stop 1>/dev/null
53     +#/sbin/service mysql.init restart 1>/dev/null
54     +#/sbin/service zabbix-server start 1>/dev/null
55     exit 0
56    
57     diff -urN smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web
58     --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web 2020-12-04 18:37:16.202582195 +0000
59     +++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web 2020-12-07 12:59:47.180308044 +0000
60     @@ -18,13 +18,18 @@
61     <Directory "/usr/share/zabbix">
62     SSLRequireSSL on
63     Options FollowSymLinks
64     - AddType application/x-httpd-php .php
65     - php_admin_value max_execution_time 600
66     - php_admin_value max_input_time 600
67     - php_admin_value memory_limit 256M
68     - php_admin_value date.timezone $tz
69     - php_admin_value post_max_size 32M
70     - php_admin_value always_populate_raw_post_data -1
71     +
72     +<FilesMatch .php>
73     + SetHandler "proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost"
74     +</FilesMatch>
75     +
76     + #AddType application/x-httpd-php .php
77     + #php_admin_value max_execution_time 600
78     + #php_admin_value max_input_time 600
79     + #php_admin_value memory_limit 256M
80     + #php_admin_value date.timezone $tz
81     + #php_admin_value post_max_size 32M
82     + #php_admin_value always_populate_raw_post_data -1
83     AllowOverride None
84     Order allow,deny
85     Allow from $access
86     diff -urN smeserver-zabbix-server-0.1.old/root/usr/share/zabbix/.user.ini smeserver-zabbix-server-0.1/root/usr/share/zabbix/.user.ini
87     --- smeserver-zabbix-server-0.1.old/root/usr/share/zabbix/.user.ini 1970-01-01 01:00:00.000000000 +0100
88     +++ smeserver-zabbix-server-0.1/root/usr/share/zabbix/.user.ini 2020-12-07 11:39:40.120200294 +0000
89     @@ -0,0 +1,6 @@
90     +max_execution_time=600
91     +max_input_time=600
92     +memory_limit=256M
93     +date.timezone=$tz
94     +post_max_size=32M
95     +always_populate_raw_post_data=-1
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed