Modification : letabli.cyclocoop.org : pgsql -> mysql.

diff --git a/etc/nginx/site.d/cyclo-letabli/local.sh b/etc/nginx/site.d/cyclo-letabli/local.sh
index 5b08cc6..cd316a9 100644 (file)
--- a/etc/nginx/site.d/cyclo-letabli/local.sh
+++ b/etc/nginx/site.d/cyclo-letabli/local.sh
@@ -1,4 +1,4 @@
-pool=cyclo_letabli
+pool=letabli
 sudo adduser php_"$pool" www-"$site"
 sudo adduser www-"$site" sftp
 
@@ -11,14 +11,9 @@ sudo install -d -m 2750 -o www-"$site" -g www-"$site" \
 sudo install -d -m 2770 -o www-"$site" -g www-"$site" \
  ~www-data/"$site"/www
 
-"$tool"/local/runit-sv-configure postgres
-"$tool"/local/runit-sv-start     postgres
-while ! sudo -u postgres psql </dev/null
+"$tool"/local/runit-sv-start mysql
+while ! sudo mysql -u root </dev/null
 do sleep 1; done
 
-"$tool"/local/postgresql-user-create     "$pool"
-"$tool"/local/postgresql-database-create "$pool"
-"$tool"/local/postgresql-schema-create   "$pool"
-sudo -u postgres psql -AqtX --set ON_ERROR_STOP=1 "$pool" <<-EOF
-       GRANT USAGE ON SCHEMA pg_catalog TO $pool;
-       EOF
+"$tool"/local/mysql-user-create     php_"$pool"
+"$tool"/local/mysql-database-create php_"$pool"

diff --git a/etc/nginx/site.d/cyclo-letabli/site.conf b/etc/nginx/site.d/cyclo-letabli/site.conf
index be97db0..49db553 100644 (file)
--- a/etc/nginx/site.d/cyclo-letabli/site.conf
+++ b/etc/nginx/site.d/cyclo-letabli/site.conf
@@ -45,7 +45,7 @@ location ~ \.php(|/.+)$ {
        fastcgi_pass_header Set-Cookie;
        fastcgi_split_path_info ^(.+\.php)(/.+)$;
        
-       fastcgi_pass unix:/run/php5/fpm/cyclo_letabli;
+       fastcgi_pass unix:/run/php5/fpm/letabli;
  }
 
 # vim: ft=sh

diff --git a/etc/php5/fpm/pool.d/cyclo_letabli/php-fpm.conf b/etc/php5/fpm/pool.d/cyclo_letabli/php-fpm.conf
deleted file mode 100644 (file)
index 5c7d9fe..0000000
--- a/etc/php5/fpm/pool.d/cyclo_letabli/php-fpm.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-php_admin_value[extension] = curl.so
-php_admin_value[extension] = pdo_pgsql.so
-php_admin_value[extension] = pgsql.so
-pm.max_children = 15
-pm.max_requests = 200
-pm.max_spare_servers = 5
-pm.min_spare_servers = 1
-pm.process_idle_timeout = 60s
-pm.start_servers = 1
-request_slowlog_timeout = 5s
-request_terminate_timeout = 120s
-rlimit_core = unlimited
-rlimit_files = 131072
-security.limit_extensions = .php

diff --git a/etc/php5/fpm/pool.d/letabli/php-fpm.conf b/etc/php5/fpm/pool.d/letabli/php-fpm.conf
new file mode 100644 (file)
index 0000000..b1eb898
--- /dev/null
+++ b/etc/php5/fpm/pool.d/letabli/php-fpm.conf
@@ -0,0 +1,14 @@
+php_admin_value[extension] = curl.so
+#php_admin_value[extension] = pdo_mysql.so
+php_admin_value[extension] = mysql.so
+pm.max_children = 15
+pm.max_requests = 200
+pm.max_spare_servers = 5
+pm.min_spare_servers = 1
+pm.process_idle_timeout = 60s
+pm.start_servers = 1
+request_slowlog_timeout = 5s
+request_terminate_timeout = 120s
+rlimit_core = unlimited
+rlimit_files = 131072
+security.limit_extensions = .php