diff -Nur --no-dereference smeserver-phpki-ng-0.3.old/createlinks smeserver-phpki-ng-0.3/createlinks --- smeserver-phpki-ng-0.3.old/createlinks 2022-11-18 14:02:45.809000000 -0500 +++ smeserver-phpki-ng-0.3/createlinks 2022-11-18 14:23:22.521000000 -0500 @@ -17,6 +17,7 @@ panel_link("phpki", 'manager'); # Events links +event_link("phpki-fixtakey", qw(bootstrap-console-save post-upgrade), "50"); event_link("phpki-fixownership", qw(bootstrap-console-save post-upgrade), "02"); templates2events("/etc/httpd/pki-conf/httpd.conf", qw(bootstrap-console-save conf-userpanel domain-modify)); safe_symlink("sigusr1", "root/etc/e-smith/events/conf-userpanel/services2adjust/httpd-pki"); @@ -46,6 +47,7 @@ #action specific to this package event_link("phpki-fixownership", $event, "02"); +event_link("phpki-fixtakey", $event, "50"); #event_link("conf-timezone", $event, "30"); #services we need to restart safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-pki"); diff -Nur --no-dereference smeserver-phpki-ng-0.3.old/root/etc/e-smith/events/actions/phpki-fixtakey smeserver-phpki-ng-0.3/root/etc/e-smith/events/actions/phpki-fixtakey --- smeserver-phpki-ng-0.3.old/root/etc/e-smith/events/actions/phpki-fixtakey 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-phpki-ng-0.3/root/etc/e-smith/events/actions/phpki-fixtakey 2022-11-18 14:22:04.178000000 -0500 @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ -f /opt/phpki/phpki-store/CA/private/cakey.pem && ! -f /opt/phpki/phpki-store/CA/private/takey.pem ]] +then + echo "creating missing takey.pem" + runuser -u phpki -- openvpn --genkey --secret /opt/phpki/phpki-store/CA/private/takey.pem +fi + 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 --- smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20pki 2022-11-18 14:02:45.790000000 -0500 +++ smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20pki 2022-11-18 14:07:57.859000000 -0500 @@ -10,7 +10,7 @@ my $key = 'phpki'; my $pool_name = lc $key; my $include_path = ".:/usr/share/pear-addons:/usr/share/pear:/usr/share/pear-data:/usr/share/php"; - my $open_basedir = "/opt/phpki:/var/lib/php/phpki:$include_path"; + my $open_basedir = "/opt/phpki:/var/lib/php/phpki:/usr/sbin/openvpn:/usr/bin/which:/usr/bin/cat:/usr/bin/egrep:$include_path"; my $disabled_functions = 'show_source,dl,passthru' ; # Format vars