diff -Nur smeserver-phpki-ng-0.3.old/createlinks smeserver-phpki-ng-0.3/createlinks
--- smeserver-phpki-ng-0.3.old/createlinks 2021-02-25 00:13:06.336000000 -0500
+++ smeserver-phpki-ng-0.3/createlinks 2021-02-25 01:38:34.722000000 -0500
@@ -36,6 +36,7 @@
/etc/systemd/system-preset/49-koozali.preset
/etc/httpd/conf/httpd.conf
/etc/httpd/pki-conf/httpd.conf
+ /etc/opt/remi/php73/php-fpm.d/www.conf
))
{
@@ -51,4 +52,4 @@
#services we need to restart
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-pki");
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
-
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/php73-php-fpm");
diff -Nur smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules
--- smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules 2021-02-25 00:13:06.337000000 -0500
+++ smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/20Modules 2021-02-25 01:28:38.119000000 -0500
@@ -10,10 +10,8 @@
ServerRoot /etc/httpd
ServerTokens ProductOnly
-User www
-Group www
-#User phpki
-#Group phpki
+User phpki
+Group phpki
ErrorLog /var/log/httpd/pki_error_log
LogLevel warn
@@ -30,7 +28,6 @@
autoindex
dir
asis
-# imap
imagemap
actions
userdir
@@ -38,9 +35,6 @@
proxy_http
alias
rewrite
-# access
-# authz_host
-# authz_user
auth
auth_anon
auth_digest
@@ -55,6 +49,7 @@
access_compat
authn_core
authz_core
+ authz_user
proxy_ajp
proxy_connect
proxy_express
@@ -70,26 +65,10 @@
$OUT .= "LoadModule ${_}_module modules/mod_${_}.so\n";
}
-if (exists $php{status} and $php{status} eq "enabled"){
- my $modphp = '4';
- if ( -r "/usr/lib/httpd/modules/libphp5.so" || -r "/usr/lib64/httpd/modules/libphp5.so" ){
- $modphp = '5';
- }
- $OUT .= "LoadModule php".$modphp."_module modules/libphp".$modphp.".so\n";
-}
-
+$OUT .= "# we do not use php module anymore, but php-fpm";
$OUT .=<<"HERE";
-
- AddIcon /icons/php4.gif .php3 .php4 .php .phtml
- AddIcon /icons/phps.gif .phps
-
-
-
- AddIcon /icons/php5.gif .php3 .php4 .php5 .php .phtml
- AddIcon /icons/phps.gif .phps
-
PidFile /var/run/httpd-pki.pid
@@ -125,7 +104,6 @@
AddIconByType (IMG,/icons/image2.gif) image/*
AddIconByType (SND,/icons/sound2.gif) audio/*
AddIconByType (VID,/icons/movie.gif) video/*
-DefaultType text/plain
TypesConfig /etc/mime.types
AddEncoding x-compress Z
diff -Nur smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki
--- smeserver-phpki-ng-0.3.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki 2021-02-25 00:13:06.337000000 -0500
+++ smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki 2021-02-25 01:28:59.712000000 -0500
@@ -5,13 +5,19 @@
AddType application/x-httpd-php .php
Options FollowSymLinks
-
- SetHandler "proxy:unix:/var/run/php-fpm/php73.sock|fcgi://localhost"
-
- php_flag register_globals off
- php_flag register_long_arrays on
- php_admin_value session.save_path /var/lib/php/pki-session
- php_admin_value openbase_dir /opt/phpki:/var/lib/php/pki-session
+{
+ my $key = "phpki";
+ my $pool_name = lc $key;
+ my $version = ${httpd-pki}{'PHPVersion'} || '73';
+ $OUT .="
+
+ SetHandler \"proxy:unix:/var/run/php-fpm/php${version}-${pool_name}.sock|fcgi://localhost\"
+\n";
+}
+# php_flag register_globals off
+# php_flag register_long_arrays on
+# php_admin_value session.save_path /var/lib/php/pki-session
+# php_admin_value openbase_dir /opt/phpki:/var/lib/php/pki-session
AddType application/x-x509-ca-cert .crt .pem
AddType application/pkix-crl .crl
AddType application/pkix-cert .cer .der
diff -Nur 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 1969-12-31 19:00:00.000000000 -0500
+++ smeserver-phpki-ng-0.3/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20pki 2021-02-25 01:36:39.161000000 -0500
@@ -0,0 +1,66 @@
+{
+ use esmith::ConfigDB;
+ my $c = esmith::ConfigDB->open_ro || die "Couldn't open the configuration database\n";
+ my $httpdpki = $c->get( 'httpd-pki' );
+
+ my $version = $httpdpki->prop('PHPVersion') || '73';
+ # we enable both the httpd server and php pool with same status
+ my $status = $httpdpki->prop('status') || 'disabled';
+ return unless ($status eq 'enabled' && $version eq $PHP_VERSION);
+ 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 $disabled_functions = 'show_source,dl,passthru'
+;
+ # Format vars
+ $disabled_functions = join(', ', split /[,;:]/, $disabled_functions);
+ $open_basedir = join(':', split(/[,;:]/, $open_basedir . ",/usr/share/php"));
+
+ $OUT .=<<"_EOF" if ($version eq $PHP_VERSION);
+
+[$pool_name]
+user = phpki
+group = phpki
+listen.owner = root
+listen.group = phpki
+listen.mode = 0660
+listen = /var/run/php-fpm/php$version-$pool_name.sock
+catch_workers_output = yes
+pm = dynamic
+pm.max_children = 15
+pm.start_servers = 3
+pm.min_spare_servers = 3
+pm.max_spare_servers = 4
+pm.max_requests = 1000
+slowlog = /var/log/$key/slow.log
+php_admin_value[session.save_path] = /var/lib/php/$key/session
+php_admin_value[opcache.file_cache] = /var/lib/php/$key/opcache
+php_admin_value[upload_tmp_dir] = /var/lib/php/$key/tmp
+php_admin_value[sys_temp_dir] = /var/lib/php/$key/tmp
+php_admin_flag[display_errors] = off
+php_admin_value[error_reporting] =E_ERROR | E_WARNING | E_PARSE
+php_admin_value[error_log] = /var/log/$key/error.log
+php_admin_flag[log_errors] = on
+; php_admin_value[max_execution_time] = $max_execution_time
+php_admin_value[disable_functions] = $disabled_functions
+php_admin_flag[allow_url_fopen] = off
+php_admin_flag[file_upload] = off
+php_admin_flag[session.cookie_httponly] = on
+php_admin_flag[allow_url_include] = off
+php_admin_value[session.save_handler] = files
+php_admin_value[open_basedir] = $open_basedir
+
+php_admin_value[auto_prepend_file] = /usr/share/php/auth_translation.php
+php_value[include_path] = $include_path
+php_flag[magic_quotes_gpc] = off
+php_flag[track_vars] = on
+php_flag[session.use_trans_sid] = off
+php_flag[register_globals] = off
+php_flag[register_long_arrays] = on
+
+_EOF
+
+
+}
+