From 301db58862558ce5c7a7f6f47939d27c041201e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= Date: Thu, 1 Sep 2022 16:04:51 +0200 Subject: [PATCH] sync --- dot_config/php/80/fpm/php-fpm.conf.tmpl | 6 ++++-- dot_config/private_mc/mc.ext | 4 ++-- dot_zshrc | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dot_config/php/80/fpm/php-fpm.conf.tmpl b/dot_config/php/80/fpm/php-fpm.conf.tmpl index 5e528ed..fee5ac7 100644 --- a/dot_config/php/80/fpm/php-fpm.conf.tmpl +++ b/dot_config/php/80/fpm/php-fpm.conf.tmpl @@ -1,6 +1,7 @@ [global] error_log = /tmp/php80-fpm.error.log daemonize = no +log_limit = 49152 [www] listen = 127.0.0.1:9080 @@ -18,9 +19,10 @@ access.format = "%R - %u %t \"%m %r\" %s %d" request_terminate_timeout = 0 catch_workers_output = yes +decorate_workers_output = no php_admin_value[error_log] = /dev/stderr ;php_admin_flag[log_errors] = on ;php_admin_value[memory_limit] = 32M -php_admin_value[sendmail_path] = {{.chezmoi.homeDir}}/bin/pipemail -php_admin_value[sys_temp_dir] = {{.chezmoi.homeDir}}/jopixel/webserver/temp +php_admin_value[sendmail_path] = {{ .chezmoi.homeDir }}/bin/pipemail +php_admin_value[sys_temp_dir] = {{ .chezmoi.homeDir }}/jopixel/webserver/temp diff --git a/dot_config/private_mc/mc.ext b/dot_config/private_mc/mc.ext index 5b5831e..fef8c65 100644 --- a/dot_config/private_mc/mc.ext +++ b/dot_config/private_mc/mc.ext @@ -591,8 +591,8 @@ type/^PostScript # PDF type/^PDF - Open=/usr/bin/mupdf %f - View=/usr/bin/mupdf %f + Open=/usr/bin/zathura %f + View=/usr/bin/zathura %f # html regex/i/\.html?$ diff --git a/dot_zshrc b/dot_zshrc index 6bad465..c027e6d 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -45,10 +45,11 @@ DISABLE_AUTO_UPDATE="true" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git z sudo docker laya-repo fzf timer) +plugins=(git z sudo docker laya-repo fzf) if [[ -z "$MC_SID" ]] then plugins+=direnv + plugins+=timer fi source $ZSH/oh-my-zsh.sh @@ -104,6 +105,6 @@ then else # in mc function __git_prompt_git() { - return 1 + return 0 } fi