/[smecontribs]/rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng-0.3-bz12293.patch
ViewVC logotype

Annotation of /rpms/smeserver-phpki-ng/contribs10/smeserver-phpki-ng-0.3-bz12293.patch

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


Revision 1.1 - (hide annotations) (download)
Wed Dec 28 20:40:05 2022 UTC (17 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-phpki-ng-0_3-21_el7_sme, smeserver-phpki-ng-0_3-22_el7_sme, HEAD
* Wed Dec 28 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-21.sme
- fix chop isntead of chomp for config.php [SME: 12293]
  fix PATH not right for exec

* Sat Dec 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-19.sme
- small fixes for config.php and httpd

1 jpp 1.1 diff -Nur --no-dereference smeserver-phpki-ng-0.3.old/root/etc/e-smith/events/actions/phpki-fixownership smeserver-phpki-ng-0.3/root/etc/e-smith/events/actions/phpki-fixownership
2     --- smeserver-phpki-ng-0.3.old/root/etc/e-smith/events/actions/phpki-fixownership 2022-12-28 14:12:04.589000000 -0500
3     +++ smeserver-phpki-ng-0.3/root/etc/e-smith/events/actions/phpki-fixownership 2022-12-28 14:39:53.565000000 -0500
4     @@ -3,6 +3,7 @@
5     chown root:phpki /opt/phpki/html/config.php
6     chown root:phpki /opt/phpki/html/openssl.cnf
7     chown phpki:phpki -R /opt/phpki/phpki-store*
8     +chown root:phpki /opt/phpki/html/ca
9    
10     chmod +x /opt/phpki/html/
11     chmod +x /opt/phpki/html/ca
12     diff -Nur --no-dereference smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20pki smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20pki
13     --- smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20pki 2022-12-28 14:12:04.596000000 -0500
14     +++ smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20pki 2022-12-28 14:59:59.653000000 -0500
15     @@ -9,7 +9,7 @@
16     return unless ($status eq 'enabled' && $version eq $PHP_VERSION);
17     my $key = 'phpki';
18     my $pool_name = lc $key;
19     - my $include_path = ".:/usr/share/pear-addons:/usr/share/pear:/usr/share/pear-data:/usr/share/php";
20     + my $include_path = ".:/usr/share/pear-addons:/usr/share/pear:/usr/share/pear-data:/usr/share/php:/usr/sbin/:/usr/bin:/opt/phpki/html:/opt/phpki/html/include";
21     my $open_basedir = "/opt/phpki:/var/lib/php/phpki:/usr/sbin/openvpn:/usr/bin/which:/usr/bin/cat:/usr/bin/egrep:$include_path";
22     my $disabled_functions = 'show_source,dl,passthru'
23     ;
24     @@ -59,6 +59,9 @@
25     php_flag[register_globals] = off
26     php_flag[register_long_arrays] = on
27    
28     +; Needed so shell_exec does it right
29     +env[PATH] = $include_path
30     +
31     _EOF
32    
33    
34     diff -Nur --no-dereference smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates.metadata/opt/phpki/html/config.php smeserver-phpki-ng-0.3/root/etc/e-smith/templates.metadata/opt/phpki/html/config.php
35     --- smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates.metadata/opt/phpki/html/config.php 2022-12-28 14:12:04.609000000 -0500
36     +++ smeserver-phpki-ng-0.3/root/etc/e-smith/templates.metadata/opt/phpki/html/config.php 2022-12-28 14:15:06.085000000 -0500
37     @@ -1 +1,3 @@
38     FILTER=sub { $_[0] =~ /^\s*$/ ? '' : $_[0] }
39     +GID='phpki'
40     +PERMS=0660

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