From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Wed, 15 Apr 2015 09:33:47 +0000 (+0200)
Subject: Corrections :         etc/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/... -> etc/php5... 
X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fadmin.git;a=commitdiff_plain;h=0413dcd8bcb432071ebddf429016fefe3216035b

Corrections :         etc/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/... -> etc/php5/fpm/org/heureux-cyclage/clavette-lyon/...
---

diff --git a/srv/ateliers/etc/nginx/org/heureux-cyclage/clavette-lyon/install b/srv/ateliers/etc/nginx/org/heureux-cyclage/clavette-lyon/install
index 10c48da..d845dfb 100755
--- a/srv/ateliers/etc/nginx/org/heureux-cyclage/clavette-lyon/install
+++ b/srv/ateliers/etc/nginx/org/heureux-cyclage/clavette-lyon/install
@@ -17,7 +17,7 @@
 # ACTION: install from ./etc/nginx/org/heureux-cyclage/clavette-lyon
 	nginx_log_home=$("$tool"/cat sys/nginx/log/home)
 	nginx_log_user=$("$tool"/cat sys/nginx/log/user)
-	pool=$("$tool"/cat sys/php5/fpm/org/heureux-cyclage/clavette-lyon/pool)
+	pool=$("$tool"/cat sys/php5/fpm/org/heureux-cyclage/clavette-lyon/user)
 	user=$("$tool"/cat sys/nginx/org/heureux-cyclage/clavette-lyon/user)
 	home=$("$tool"/cat sys/nginx/org/heureux-cyclage/clavette-lyon/home)
 	"$tool"/ssh-sudo \
diff --git a/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/clavette-lyon/... b/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/clavette-lyon/...
new file mode 120000
index 0000000..951b30d
--- /dev/null
+++ b/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/clavette-lyon/...
@@ -0,0 +1 @@
+../...
\ No newline at end of file
diff --git a/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/clavette-lyon/php-fpm.conf.m4 b/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/clavette-lyon/php-fpm.conf.m4
new file mode 100644
index 0000000..7126680
--- /dev/null
+++ b/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/clavette-lyon/php-fpm.conf.m4
@@ -0,0 +1,44 @@
+define(`POOL',patsubst(__file__,`^.*/fpm/\(.*\)/[^/]*$',`\1'))dnl
+[POOL]
+access.log = /home/www/log/php5/fpm/POOL/access.log
+catch_workers_output = no
+chdir = /
+env[HOSTNAME] = $HOSTNAME
+env[TEMP] = /tmp
+env[TMPDIR] = /tmp
+env[TMP] = /tmp
+group = CAT(sys/php5/fpm/org/heureux-cyclage/clavette-lyon/user)
+#listen = 127.0.0.1:9000
+listen = /run/php5/fpm/POOL
+#listen.allowed_clients = 127.0.0.1
+listen.group = www-data
+listen.mode = 0660
+#listen.owner = www-data
+listen.backlog = -1
+ping.path = /ping
+pm = dynamic
+pm.max_children = 5
+pm.max_requests = 200
+pm.max_spare_servers = 4
+pm.min_spare_servers = 2
+pm.start_servers = 3
+pm.status_path = /status
+request_slowlog_timeout = 5s
+request_terminate_timeout = 120s
+rlimit_core = unlimited
+rlimit_files = 131072
+slowlog = /home/www/log/php5/fpm/POOL/slow.log
+user = CAT(sys/php5/fpm/org/heureux-cyclage/clavette-lyon/user)
+#php_admin_value[extension] = pdo_mysql.so
+php_admin_value[extension] = mysql.so
+pm.max_children = 4
+pm.max_requests = 1000
+pm.max_spare_servers = 4
+pm.min_spare_servers = 2
+pm.process_idle_timeout = 60s
+pm.start_servers = 2
+request_slowlog_timeout = 5s
+request_terminate_timeout = 120s
+rlimit_core = unlimited
+rlimit_files = 131072
+security.limit_extensions = .php
diff --git a/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/... b/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/...
deleted file mode 120000
index 951b30d..0000000
--- a/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/...
+++ /dev/null
@@ -1 +0,0 @@
-../...
\ No newline at end of file
diff --git a/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/php-fpm.conf.m4 b/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/php-fpm.conf.m4
deleted file mode 100644
index 8acf077..0000000
--- a/srv/ateliers/etc/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/php-fpm.conf.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-define(`POOL',patsubst(__file__,`^.*/fpm/\(.*\)/[^/]*$',`\1'))dnl
-CAT(sys/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/pool)
-[POOL]
-access.log = /home/www/log/php5/fpm/POOL/access.log
-catch_workers_output = no
-chdir = /
-env[HOSTNAME] = $HOSTNAME
-env[TEMP] = /tmp
-env[TMPDIR] = /tmp
-env[TMP] = /tmp
-group = CAT(sys/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/pool)
-#listen = 127.0.0.1:9000
-listen = /run/php5/fpm/POOL
-#listen.allowed_clients = 127.0.0.1
-listen.group = www-data
-listen.mode = 0660
-#listen.owner = www-data
-listen.backlog = -1
-ping.path = /ping
-pm = dynamic
-pm.max_children = 5
-pm.max_requests = 200
-pm.max_spare_servers = 4
-pm.min_spare_servers = 2
-pm.start_servers = 3
-pm.status_path = /status
-request_slowlog_timeout = 5s
-request_terminate_timeout = 120s
-rlimit_core = unlimited
-rlimit_files = 131072
-slowlog = /home/www/log/php5/fpm/POOL/slow.log
-user = CAT(sys/php5/fpm/org/heureux-cyclage/lhc_clav_lyon/pool)
-#php_admin_value[extension] = pdo_mysql.so
-php_admin_value[extension] = mysql.so
-pm.max_children = 4
-pm.max_requests = 1000
-pm.max_spare_servers = 4
-pm.min_spare_servers = 2
-pm.process_idle_timeout = 60s
-pm.start_servers = 2
-request_slowlog_timeout = 5s
-request_terminate_timeout = 120s
-rlimit_core = unlimited
-rlimit_files = 131072
-security.limit_extensions = .php
diff --git a/srv/ateliers/sys/php5/fpm/org/heureux-cyclage/clavette-lyon/pool b/srv/ateliers/sys/php5/fpm/org/heureux-cyclage/clavette-lyon/pool
deleted file mode 100644
index 24b2e2b..0000000
--- a/srv/ateliers/sys/php5/fpm/org/heureux-cyclage/clavette-lyon/pool
+++ /dev/null
@@ -1 +0,0 @@
-php_lhc_clav_lyon
\ No newline at end of file
diff --git a/srv/ateliers/sys/php5/fpm/org/heureux-cyclage/clavette-lyon/user b/srv/ateliers/sys/php5/fpm/org/heureux-cyclage/clavette-lyon/user
new file mode 100644
index 0000000..24b2e2b
--- /dev/null
+++ b/srv/ateliers/sys/php5/fpm/org/heureux-cyclage/clavette-lyon/user
@@ -0,0 +1 @@
+php_lhc_clav_lyon
\ No newline at end of file