Move SITE_STATUS definition into INI file so that CLI can read it too

This commit is contained in:
Alex Cabal 2022-03-24 09:41:14 -05:00
parent beda605f32
commit 395d4d9f9b
5 changed files with 21 additions and 5 deletions

View file

@ -16,5 +16,3 @@ slowlog = /var/log/local/php-fpm-slow.log
catch_workers_output = yes catch_workers_output = yes
php_admin_value[include_path] = /standardebooks.org/web/lib php_admin_value[include_path] = /standardebooks.org/web/lib
env[SITE_STATUS] = "live"

View file

@ -9,6 +9,7 @@ max_execution_time = 120
allow_url_fopen = false allow_url_fopen = false
allow_url_include = false allow_url_include = false
expose_php = off expose_php = off
site_status = "live"
[Date] [Date]
date.timezone = Etc/UTC date.timezone = Etc/UTC

View file

@ -16,5 +16,3 @@ slowlog = /var/log/local/php-fpm-slow.log
catch_workers_output = yes catch_workers_output = yes
php_admin_value[include_path] = /standardebooks.org/web/lib:/standardebooks.org/web/vendor php_admin_value[include_path] = /standardebooks.org/web/lib:/standardebooks.org/web/vendor
env[SITE_STATUS] = "dev"

View file

@ -0,0 +1,18 @@
error_log = "/var/log/local/php-error.log"
display_errors = Off
display_startup_errors = Off
html_errors = Off
log_errors = On
short_open_tag = On
error_reporting = E_ALL
max_execution_time = 120
allow_url_fopen = false
allow_url_include = false
expose_php = off
site_status = "live"
[Date]
date.timezone = Etc/UTC
[opcache]
opcache.validate_timestamps = off

View file

@ -6,7 +6,8 @@ use function Safe\strtotime;
const SITE_STATUS_LIVE = 'live'; const SITE_STATUS_LIVE = 'live';
const SITE_STATUS_DEV = 'dev'; const SITE_STATUS_DEV = 'dev';
define('SITE_STATUS', getenv('SITE_STATUS') ?: SITE_STATUS_DEV); // Set in the PHP FPM pool configuration. Have to use define() and not const so we can use a function.
define('SITE_STATUS', get_cfg_var('site_status') ?: SITE_STATUS_DEV); // Set in the PHP INI configuration for both CLI and FPM. Have to use define() and not const so we can use a function.
// No trailing slash on any of the below constants. // No trailing slash on any of the below constants.
if(SITE_STATUS == SITE_STATUS_LIVE){ if(SITE_STATUS == SITE_STATUS_LIVE){