| 1 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-phpki-ng-0.3.old/createlinks smeserver-phpki-ng-0.3/createlinks |
| 2 |
|
|
--- smeserver-phpki-ng-0.3.old/createlinks 2022-11-18 14:02:45.809000000 -0500 |
| 3 |
|
|
+++ smeserver-phpki-ng-0.3/createlinks 2022-11-18 14:23:22.521000000 -0500 |
| 4 |
|
|
@@ -17,6 +17,7 @@ |
| 5 |
|
|
panel_link("phpki", 'manager'); |
| 6 |
|
|
|
| 7 |
|
|
# Events links |
| 8 |
|
|
+event_link("phpki-fixtakey, qw(bootstrap-console-save post-upgrade), "50"); |
| 9 |
|
|
event_link("phpki-fixownership", qw(bootstrap-console-save post-upgrade), "02"); |
| 10 |
|
|
templates2events("/etc/httpd/pki-conf/httpd.conf", qw(bootstrap-console-save conf-userpanel domain-modify)); |
| 11 |
|
|
safe_symlink("sigusr1", "root/etc/e-smith/events/conf-userpanel/services2adjust/httpd-pki"); |
| 12 |
|
|
@@ -46,6 +47,7 @@ |
| 13 |
|
|
|
| 14 |
|
|
#action specific to this package |
| 15 |
|
|
event_link("phpki-fixownership", $event, "02"); |
| 16 |
|
|
+event_link("phpki-fixtakey, $event, "50"); |
| 17 |
|
|
#event_link("conf-timezone", $event, "30"); |
| 18 |
|
|
#services we need to restart |
| 19 |
|
|
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-pki"); |
| 20 |
|
|
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 |
| 21 |
|
|
--- smeserver-phpki-ng-0.3.old/root/etc/e-smith/events/actions/phpki-fixtakey 1969-12-31 19:00:00.000000000 -0500 |
| 22 |
|
|
+++ smeserver-phpki-ng-0.3/root/etc/e-smith/events/actions/phpki-fixtakey 2022-11-18 14:22:04.178000000 -0500 |
| 23 |
|
|
@@ -0,0 +1,8 @@ |
| 24 |
|
|
+#!/bin/bash |
| 25 |
|
|
+ |
| 26 |
|
|
+if [[ -f /opt/phpki/phpki-store/CA/private/cakey.pem && ! -f /opt/phpki/phpki-store/CA/private/takey.pem ]] |
| 27 |
|
|
+then |
| 28 |
|
|
+ echo "creating missing takey.pem" |
| 29 |
|
|
+ runuser -u phpki -- openvpn --genkey --secret /opt/phpki/phpki-store/CA/private/takey.pem |
| 30 |
|
|
+fi |
| 31 |
|
|
+ |
| 32 |
|
|
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 |
| 33 |
|
|
--- 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 |
| 34 |
|
|
+++ 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 |
| 35 |
|
|
@@ -10,7 +10,7 @@ |
| 36 |
|
|
my $key = 'phpki'; |
| 37 |
|
|
my $pool_name = lc $key; |
| 38 |
|
|
my $include_path = ".:/usr/share/pear-addons:/usr/share/pear:/usr/share/pear-data:/usr/share/php"; |
| 39 |
|
|
- my $open_basedir = "/opt/phpki:/var/lib/php/phpki:$include_path"; |
| 40 |
jpp |
1.2 |
+ my $open_basedir = "/opt/phpki:/var/lib/php/phpki:/usr/sbin/openvpn:/usr/bin/which:/usr/bin/cat:/usr/bin/egrep:$include_path"; |
| 41 |
jpp |
1.1 |
my $disabled_functions = 'show_source,dl,passthru' |
| 42 |
|
|
; |
| 43 |
|
|
# Format vars |
Parent Directory
| 
Revision Log
| 
Revision Graph
