From f2e7131a224274a5669dff5515b11c7402265c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= <vladimir@tango-dj.cz>
Date: Tue, 11 Apr 2023 15:12:26 +0200
Subject: [PATCH] php: reformat

---
 dot_config/php/71/fpm/php-fpm.conf.tmpl | 6 +++---
 dot_config/php/72/fpm/php-fpm.conf.tmpl | 2 +-
 dot_config/php/73/fpm/php-fpm.conf.tmpl | 4 ++--
 dot_config/php/74/flake.nix             | 2 +-
 dot_config/php/74/fpm/php-fpm.conf.tmpl | 2 +-
 dot_config/php/80/fpm/php-fpm.conf.tmpl | 5 +++--
 dot_config/php/81/fpm/php-fpm.conf.tmpl | 4 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/dot_config/php/71/fpm/php-fpm.conf.tmpl b/dot_config/php/71/fpm/php-fpm.conf.tmpl
index 225c7db..c0996ef 100644
--- a/dot_config/php/71/fpm/php-fpm.conf.tmpl
+++ b/dot_config/php/71/fpm/php-fpm.conf.tmpl
@@ -3,7 +3,7 @@ error_log = /tmp/php71-fpm.error.log
 daemonize = no
 
 [www]
-listen = /run/user/{{.chezmoi.uid}}/php71-fpm/fpm.sock
+listen = /run/user/{{ .chezmoi.gid }}/php71-fpm/fpm.sock
 
 pm = dynamic
 pm.max_children = 5
@@ -16,5 +16,5 @@ request_terminate_timeout = 0
 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/php/72/fpm/php-fpm.conf.tmpl b/dot_config/php/72/fpm/php-fpm.conf.tmpl
index cc18611..dd6f0a8 100644
--- a/dot_config/php/72/fpm/php-fpm.conf.tmpl
+++ b/dot_config/php/72/fpm/php-fpm.conf.tmpl
@@ -3,7 +3,7 @@ error_log = /tmp/php72.log
 daemonize = no
 
 [www]
-listen = /run/user/1000/php72-fpm/fpm.sock
+listen = /run/user/{{ .chezmoi.gid }}/php72-fpm/fpm.sock
 
 pm = dynamic
 pm.max_children = 5
diff --git a/dot_config/php/73/fpm/php-fpm.conf.tmpl b/dot_config/php/73/fpm/php-fpm.conf.tmpl
index 873f9c9..731bf1b 100644
--- a/dot_config/php/73/fpm/php-fpm.conf.tmpl
+++ b/dot_config/php/73/fpm/php-fpm.conf.tmpl
@@ -16,5 +16,5 @@ request_terminate_timeout = 0
 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/php/74/flake.nix b/dot_config/php/74/flake.nix
index 4a5ded2..dfb19be 100644
--- a/dot_config/php/74/flake.nix
+++ b/dot_config/php/74/flake.nix
@@ -27,7 +27,7 @@
               "posix"
               "openssl"
               "xdebug"
-              "xml"
+              "json"
               "pdo"
               "bcmath"
               "gd"
diff --git a/dot_config/php/74/fpm/php-fpm.conf.tmpl b/dot_config/php/74/fpm/php-fpm.conf.tmpl
index b1e7276..70dc6bf 100644
--- a/dot_config/php/74/fpm/php-fpm.conf.tmpl
+++ b/dot_config/php/74/fpm/php-fpm.conf.tmpl
@@ -3,7 +3,7 @@ error_log = /tmp/php74.log
 daemonize = no
 
 [www]
-listen = /run/user/1000/php74-fpm/fpm.sock
+listen = /run/user/{{ .chezmoi.gid }}/php74-fpm/fpm.sock
 
 pm = dynamic
 pm.max_children = 5
diff --git a/dot_config/php/80/fpm/php-fpm.conf.tmpl b/dot_config/php/80/fpm/php-fpm.conf.tmpl
index a166082..37e2f1a 100644
--- a/dot_config/php/80/fpm/php-fpm.conf.tmpl
+++ b/dot_config/php/80/fpm/php-fpm.conf.tmpl
@@ -4,7 +4,8 @@ daemonize = no
 log_limit = 49152
 
 [www]
-listen = /run/user/1000/php80-fpm/fpm.sock
+env[LOCALE_ARCHIVE] = /usr/lib/locale/locale-archive
+listen = /run/user/{{ .chezmoi.gid }}/php80-fpm/fpm.sock
 
 pm = ondemand
 pm.max_children = 30
@@ -13,7 +14,7 @@ pm.min_spare_servers = 1
 pm.max_spare_servers = 15
 
 pm.status_path = /fpm-status
-pm.status_listen = /run/user/1000/php80-fpm/status.sock
+pm.status_listen = /run/user/{{ .chezmoi.gid }}/php80-fpm/status.sock
 
 access.log = /dev/stdout
 access.format = "%R - %u %t \"%m %r\" %s %d"
diff --git a/dot_config/php/81/fpm/php-fpm.conf.tmpl b/dot_config/php/81/fpm/php-fpm.conf.tmpl
index 953df7d..2306f16 100644
--- a/dot_config/php/81/fpm/php-fpm.conf.tmpl
+++ b/dot_config/php/81/fpm/php-fpm.conf.tmpl
@@ -22,5 +22,5 @@ catch_workers_output = yes
 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