/[smecontribs]/rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-Update-httpd-for-php-fpw-and-add-unit-file.patch
ViewVC logotype

Contents of /rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-Update-httpd-for-php-fpw-and-add-unit-file.patch

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


Revision 1.1 - (show annotations) (download)
Sun Nov 29 19:04:34 2020 UTC (3 years, 5 months ago) by brianr
Branch: MAIN
CVS Tags: smeserver-phpmyadmin-4_0_10_2-8_el7_sme, smeserver-phpmyadmin-4_0_10_2-5_el7_sme, smeserver-phpmyadmin-4_0_10_2-14_el7_sme, smeserver-phpmyadmin-4_0_10_2-12_el7_sme, smeserver-phpmyadmin-4_0_10_2-10_el7_sme, smeserver-phpmyadmin-4_0_10_2-9_el7_sme, smeserver-phpmyadmin-4_0_10_2-13_el7_sme, smeserver-phpmyadmin-4_0_10_2-11_el7_sme, smeserver-phpmyadmin-4_0_10_2-6_el7_sme, smeserver-phpmyadmin-4_0_10_2-7_el7_sme, HEAD
* Sun Nov 29 2020 Brian Read <brianr@bjsystems.co.uk> 4.0.10.2-5.sme
- Change httpd frament to php-fpw and add in .unit.ini to set php vars  [SME: 11043]

1 diff -urN smeserver-phpmyadmin-4.0.10.2.old/createlinks smeserver-phpmyadmin-4.0.10.2/createlinks
2 --- smeserver-phpmyadmin-4.0.10.2.old/createlinks 2014-10-03 21:31:08.000000000 +0100
3 +++ smeserver-phpmyadmin-4.0.10.2/createlinks 2020-11-29 18:33:04.162944984 +0000
4 @@ -13,6 +13,7 @@
5
6 for my $event (qw(
7 phpmyadmin-update
8 + smeserver-phpmyadmin-update
9 ))
10 {
11 templates2events("/etc/httpd/conf/httpd.conf", $event);
12 @@ -24,3 +25,5 @@
13 # PHP header and footer
14 safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/template-begin");
15 safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/template-end");
16 +
17 +
18 diff -urN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias
19 --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2014-10-03 21:31:08.000000000 +0100
20 +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2020-11-29 17:09:08.716671079 +0000
21 @@ -67,15 +67,20 @@
22 $OUT .= qq(
23 Satisfy all
24 AddType application/x-httpd-php .php .php3
25 - php_flag magic_quotes_gpc on
26 - php_flag track_vars on
27 - php_admin_value open_basedir /usr/share/php:/usr/share/phpMyAdmin:/etc/phpMyAdmin:/var/lib/phpMyAdmin
28 - php_admin_value session.save_path /var/lib/phpMyAdmin/tmp
29 - php_admin_value post_max_size $postmaxsize
30 - php_admin_value upload_max_filesize $uploadmaxsize
31 - php_admin_value memory_limit $memorylimit
32 - php_admin_flag session.use_trans_sid 0
33 - php_admin_value upload_tmp_dir /var/lib/phpMyAdmin/tmp
34 +
35 +<FilesMatch .php\$\>
36 + SetHandler "proxy:unix:/var/run/php-fpm/php71.sock|fcgi://localhost"
37 +</FilesMatch>
38 +
39 + #php_flag magic_quotes_gpc on
40 + #php_flag track_vars on
41 + #php_admin_value open_basedir /usr/share/php:/usr/share/phpMyAdmin:/etc/phpMyAdmin:/var/lib/phpMyAdmin
42 + #php_admin_value session.save_path /var/lib/phpMyAdmin/tmp
43 + #php_admin_value post_max_size $postmaxsize
44 + #php_admin_value upload_max_filesize $uploadmaxsize
45 + #php_admin_value memory_limit $memorylimit
46 + #php_admin_flag session.use_trans_sid 0
47 + #php_admin_value upload_tmp_dir /var/lib/phpMyAdmin/tmp
48 </Directory>
49
50
51 diff -urN smeserver-phpmyadmin-4.0.10.2.old/root/usr/share/phpMyAdmin/.unit.ini smeserver-phpmyadmin-4.0.10.2/root/usr/share/phpMyAdmin/.unit.ini
52 --- smeserver-phpmyadmin-4.0.10.2.old/root/usr/share/phpMyAdmin/.unit.ini 1970-01-01 01:00:00.000000000 +0100
53 +++ smeserver-phpmyadmin-4.0.10.2/root/usr/share/phpMyAdmin/.unit.ini 2020-11-29 16:29:01.995912286 +0000
54 @@ -0,0 +1,10 @@
55 +magic_quotes_gpc= on
56 +track_vars= on
57 +#open_basedir=/usr/share/php:/usr/share/phpMyAdmin:/etc/phpMyAdmin:/var/lib/phpMyAdmin
58 +session.save_path=/var/lib/phpMyAdmin/tmp
59 +post_max_size=100M
60 +upload_max_filesize=100M
61 +memory_limit=500M
62 +session.use_trans_sid=0
63 +upload_tmp_dir=/var/lib/phpMyAdmin/tmp
64 +

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed