| 1 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/createlinks smeserver-phpldapadmin-1.5.0/createlinks |
| 2 |
|
|
--- smeserver-phpldapadmin-1.5.0.old/createlinks 2014-06-21 12:53:47.000000000 -0400 |
| 3 |
|
|
+++ smeserver-phpldapadmin-1.5.0/createlinks 2021-06-01 12:51:13.224000000 -0400 |
| 4 |
jpp |
1.7 |
@@ -14,3 +14,16 @@ |
| 5 |
jpp |
1.1 |
templates2events("/etc/phpldapadmin/config.php", $event) |
| 6 |
|
|
} |
| 7 |
|
|
safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/phpldapadmin/config.php/template-begin"); |
| 8 |
|
|
+ |
| 9 |
|
|
+for my $event (qw( |
| 10 |
|
|
+ smeserver-phpldapadmin-update |
| 11 |
|
|
+ )) |
| 12 |
|
|
+ { |
| 13 |
|
|
+ templates2events("/etc/httpd/conf/httpd.conf", $event); |
| 14 |
|
|
+ templates2events("/etc/phpldapadmin/config.php", $event); |
| 15 |
jpp |
1.7 |
+ templates2events("/etc/opt/remi/php____PHPVERSION____/php-fpm.d/www.conf", $event) unless "____PHPVERSION____" eq ""; |
| 16 |
|
|
+ templates2events("/etc/php-fpm.d/www.conf", $event) if "____PHPVERSION____" eq ""; |
| 17 |
jpp |
1.1 |
+ safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); |
| 18 |
jpp |
1.7 |
+ safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/php____PHPVERSION____-php-fpm") unless "____PHPVERSION____" eq ""; |
| 19 |
|
|
+ safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/php-fpm") if "____PHPVERSION____" eq ""; |
| 20 |
jpp |
1.1 |
+ } |
| 21 |
jpp |
1.4 |
diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status smeserver-phpldapadmin-1.5.0/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status |
| 22 |
|
|
--- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status 1969-12-31 19:00:00.000000000 -0500 |
| 23 |
|
|
+++ smeserver-phpldapadmin-1.5.0/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status 2021-06-01 13:08:02.020000000 -0400 |
| 24 |
|
|
@@ -0,0 +1 @@ |
| 25 |
|
|
+enabled |
| 26 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin |
| 27 |
|
|
--- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin 2014-06-21 12:53:47.000000000 -0400 |
| 28 |
jpp |
1.3 |
+++ smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin 2021-06-01 13:04:03.628000000 -0400 |
| 29 |
jpp |
1.2 |
@@ -21,8 +21,10 @@ |
| 30 |
jpp |
1.1 |
AuthExternal pwauth |
| 31 |
|
|
require user admin |
| 32 |
|
|
Satisfy all |
| 33 |
|
|
- AddType application/x-httpd-php .php .php3 |
| 34 |
|
|
- php_flag magic_quotes_gpc on |
| 35 |
|
|
- php_flag track_vars on |
| 36 |
jpp |
1.3 |
+ <FilesMatch \.php$> |
| 37 |
jpp |
1.6 |
+ SetHandler "proxy:unix:/var/run/php-fpm/php____PHPVERSION____-phpldapadmin.sock|fcgi://localhost" |
| 38 |
jpp |
1.2 |
+ </FilesMatch> |
| 39 |
|
|
+ SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1 |
| 40 |
jpp |
1.1 |
+ |
| 41 |
|
|
</Directory> |
| 42 |
|
|
|
| 43 |
|
|
diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin |
| 44 |
|
|
--- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin 1969-12-31 19:00:00.000000000 -0500 |
| 45 |
jpp |
1.5 |
+++ smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin 2021-06-01 13:10:34.241000000 -0400 |
| 46 |
jpp |
1.1 |
@@ -0,0 +1,73 @@ |
| 47 |
|
|
+{ |
| 48 |
|
|
+ |
| 49 |
jpp |
1.6 |
+if ($PHP_VERSION eq '____PHPVERSION____'){ |
| 50 |
jpp |
1.1 |
+ if (($phpldapadmin{'status'} || 'disabled') eq 'enabled'){ |
| 51 |
|
|
+ my $max_upload_size = ($phpldapadmin{MaxUploadSize} || '100M');# 104857600 bytes |
| 52 |
|
|
+ $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/); |
| 53 |
|
|
+ my $memory_limit = ($phpldapadmin{MemoryLimit} || '512M'); |
| 54 |
|
|
+ $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/); |
| 55 |
|
|
+ my $open_basedir= $phpldapadmin{PHPBaseDir} || ''; |
| 56 |
jpp |
1.5 |
+ $open_basedir = "/etc/phpldapadmin/:/usr/share/phpldapadmin/:/var/lib/php/phpldapadmin:". |
| 57 |
jpp |
1.1 |
+"/var/lib/phpldapadmin/temp:/var/lib/phpldapadmin/save/:/var/lib/phpldapadmin/upload:/var/lib/phpldapadmin/cache/:". |
| 58 |
|
|
+"/usr/share/php/:". |
| 59 |
|
|
+"/var/log/php/phpldapadmin::/dev/urandom:$open_basedir"; |
| 60 |
|
|
+ my $max_children = $phpldapadmin{'PHPmaxChildren'} || 20; |
| 61 |
|
|
+ my $min_spare_servers = $phpldapadmin{'PHPminServers'} || 4; |
| 62 |
|
|
+ my $start_servers = $phpldapadmin{'PHPstartServers'} || 6; |
| 63 |
|
|
+ my $max_spare_servers = $phpldapadmin{'PHPmaxServers'} || 8; |
| 64 |
|
|
+ my $max_requests = $phpldapadmin{'PHPmaxRequests'} || 1000; |
| 65 |
|
|
+ $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? printf("%.0f",$max_spare_servers/2) : $min_spare_servers; |
| 66 |
|
|
+ $start_servers = ( $start_servers > $max_spare_servers ) ? printf("%.0f", $max_spare_servers /2 + $min_spare_servers/2 ) : $start_servers; |
| 67 |
jpp |
1.5 |
+ my $id = 'phpldapadmin'; # Note the package is phpldapadmin |
| 68 |
jpp |
1.1 |
+ $OUT .=<<"_EOF"; |
| 69 |
|
|
+ |
| 70 |
|
|
+[php$PHP_VERSION-$id] |
| 71 |
|
|
+user = www |
| 72 |
|
|
+group = www |
| 73 |
|
|
+listen.owner = root |
| 74 |
|
|
+listen.group = www |
| 75 |
|
|
+listen.mode = 0660 |
| 76 |
|
|
+listen = /var/run/php-fpm/php$PHP_VERSION-$id.sock |
| 77 |
|
|
+pm = dynamic |
| 78 |
|
|
+pm.max_children = $max_children |
| 79 |
|
|
+pm.start_servers = $start_servers |
| 80 |
|
|
+pm.min_spare_servers = $min_spare_servers |
| 81 |
|
|
+pm.max_spare_servers = $max_spare_servers |
| 82 |
|
|
+pm.max_requests = $max_requests |
| 83 |
|
|
+; Used in nextcloud |
| 84 |
|
|
+php_admin_value[session.save_path] = /var/lib/php/$id/session |
| 85 |
|
|
+php_admin_value[session.gc_maxlifetime] = 86400 |
| 86 |
|
|
+php_admin_value[opcache.file_cache] = /var/lib/php/$id/opcache |
| 87 |
|
|
+php_admin_value[upload_tmp_dir] = /var/lib/php/$id/tmp |
| 88 |
|
|
+php_admin_value[sys_temp_dir] = /var/lib/php/$id/tmp |
| 89 |
|
|
+php_admin_value[error_log] = /var/log/php/$id/error.log |
| 90 |
|
|
+slowlog = /var/log/php/$id/slow.log |
| 91 |
|
|
+php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName } |
| 92 |
|
|
+php_admin_flag[display_errors] = off |
| 93 |
|
|
+php_admin_flag[log_errors] = on |
| 94 |
|
|
+php_admin_value[memory_limit] = $memory_limit |
| 95 |
|
|
+php_admin_value[max_execution_time] = 3600 |
| 96 |
|
|
+php_admin_value[post_max_size] = $max_upload_size |
| 97 |
|
|
+php_admin_value[upload_max_filesize] = $max_upload_size |
| 98 |
|
|
+php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd |
| 99 |
|
|
+php_admin_value[open_basedir] = $open_basedir |
| 100 |
|
|
+php_admin_flag[allow_url_fopen] = on |
| 101 |
|
|
+php_admin_flag[file_upload] = on |
| 102 |
|
|
+php_admin_flag[session.cookie_httponly] = on |
| 103 |
|
|
+php_admin_flag[allow_url_include] = off |
| 104 |
|
|
+php_admin_value[session.save_handler] = files |
| 105 |
|
|
+php_admin_flag[output_buffering] = off |
| 106 |
|
|
+php_admin_value[auto_prepend_file] = /usr/share/php/auth_translation.php |
| 107 |
|
|
+php_flag[session.use_trans_sid] = off |
| 108 |
|
|
+php_flag[track_vars] = on |
| 109 |
jpp |
1.8 |
+php_flag[magic_quotes_gpc] = on |
| 110 |
jpp |
1.1 |
+ |
| 111 |
|
|
+_EOF |
| 112 |
|
|
+ |
| 113 |
|
|
+ } |
| 114 |
|
|
+ else{ |
| 115 |
|
|
+ $OUT .= '; phpldapadmin is disabled'; |
| 116 |
|
|
+ } |
| 117 |
|
|
+} |
| 118 |
|
|
+} |
| 119 |
|
|
+ |
| 120 |
jpp |
1.9 |
diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/phpldapadmin/config.php/06SASLAuth smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/phpldapadmin/config.php/06SASLAuth |
| 121 |
|
|
--- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/phpldapadmin/config.php/06SASLAuth 2014-06-21 12:53:47.000000000 -0400 |
| 122 |
|
|
+++ smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/phpldapadmin/config.php/06SASLAuth 2021-06-01 14:02:24.703000000 -0400 |
| 123 |
|
|
@@ -43,8 +43,8 @@ |
| 124 |
|
|
|
| 125 |
|
|
/* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5, |
| 126 |
|
|
blowfish, crypt or leave blank for now default algorithm. */ |
| 127 |
|
|
-// $servers->setValue('appearance','password_hash','md5'); |
| 128 |
|
|
-$servers->setValue('appearance','password_hash',''); |
| 129 |
|
|
+// $servers->setValue('appearance','pla_password_hash','md5'); |
| 130 |
|
|
+$servers->setValue('appearance','pla_password_hash',''); |
| 131 |
|
|
|
| 132 |
|
|
/* If you specified 'cookie' or 'session' as the auth_type above, you can |
| 133 |
|
|
optionally specify here an attribute to use when logging in. If you enter |
| 134 |
|
|
diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/phpldapadmin/config.php/08Others smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/phpldapadmin/config.php/08Others |
| 135 |
|
|
--- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/phpldapadmin/config.php/08Others 2014-06-21 12:53:47.000000000 -0400 |
| 136 |
|
|
+++ smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/phpldapadmin/config.php/08Others 2021-06-01 14:02:47.857000000 -0400 |
| 137 |
|
|
@@ -25,7 +25,7 @@ |
| 138 |
|
|
$servers->setValue('sasl','authz_id_replacement','$1'); |
| 139 |
|
|
$servers->setValue('sasl','props',null); |
| 140 |
|
|
|
| 141 |
|
|
-$servers->setValue('appearance','password_hash','md5'); |
| 142 |
|
|
+$servers->setValue('appearance','pla_password_hash','md5'); |
| 143 |
|
|
$servers->setValue('login','attr','dn'); |
| 144 |
|
|
$servers->setValue('login','fallback_dn',false); |
| 145 |
|
|
$servers->setValue('login','class',null); |
Parent Directory
| 
Revision Log
| 
Revision Graph
