Skip to content

Commit 2bba4d0

Browse files
committed
Using ini get_override_values
1 parent 687faac commit 2bba4d0

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

overlay/etc/bf/init.d/22-php-ini.nu

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
use bf
2+
use bf-nginx-php
23
use bf-php
34
bf env load
45

56
# Apply any overrides to php.ini
67
export def main [] {
7-
# load any override files and apply them
8-
let ini_override = bf env PHP_INI_OVERRIDE_D
9-
if ($ini_override | path exists) { $"($ini_override)/*.json" | into glob | ls --full-paths $in | get name | sort | each {|x|
10-
let override_values = bf fs read $x | from json
11-
bf-php ini $override_values
12-
} }
8+
# get ini override values
9+
let override_values = bf-nginx-php ini get_override_values
10+
11+
# download specified php.ini file and apply any override values
12+
bf-php ini $override_values
1313

1414
# return nothing
1515
return

overlay/etc/nu/scripts/bf-nginx-php/sessions.nu

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
use bf
2+
use ini.nu
23

34
# Clean sessions as user www
45
export def clean [] {
56
# load environment
67
bf env load
78

89
# get session max lifetime (if set)
9-
let ini_override = bf env PHP_INI_OVERRIDE
10-
let max_lifetime = match ($ini_override | path exists) {
11-
true => ($ini_override | open | get --optional "session.gc_maxlifetime")
12-
false => 86400
13-
}
10+
let ini_override = bf env PHP_INI_OVERRIDE_D
11+
let max_lifetime = ini get_override_values | default 86400 session.gc_maxlifetime
1412

1513
# hat-tip https://www.getpagespeed.com/server-setup/php/cleanup-php-sessions-like-a-pro
1614
let args = [

0 commit comments

Comments
 (0)