From 2837c2412a296c6eed2381126df1fc80a77fdd16 Mon Sep 17 00:00:00 2001
From: Yaco <franco@reevo.org>
Date: Thu, 11 Jun 2020 23:03:37 -0300
Subject: changes for multiple sites

---
 etc/global_config.php.sample |  8 ++++----
 etc/nginx/wiki.conf.sample   | 14 +++++++-------
 etc/php-fpm/wiki.conf.sample | 18 +++++++++---------
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'etc')

diff --git a/etc/global_config.php.sample b/etc/global_config.php.sample
index 705f7812..bb8a4bb4 100755
--- a/etc/global_config.php.sample
+++ b/etc/global_config.php.sample
@@ -7,7 +7,7 @@
 ## ES: Defina el usuario y contraseña para acceder a las DBs
 ## EN: Define user and password to access DBs
 
-$REEVO_PATH = "/srv/reevo-2020";
+$REEVO_PATH = "/srv/reevotech";
 $REEVO_URL = "reevo.test";
 $REEVO_URL_CRM = "reevo.org";
 
@@ -16,9 +16,9 @@ $REEVO_PROTOCOL = "http";
 $REEVO_DB_USER = "";
 $REEVO_DB_PASS = "";
 
-$REEVO_DB_WIKI 		= "reevo2020_wiki";
-$REEVO_DB_WP		= "reevo2020_wp";
-$REEVO_DB_CRM		= "reevo2020_crm";
+$REEVO_DB_WIKI 		= "reevotech_wiki";
+$REEVO_DB_WP		= "reevotech_wp";
+$REEVO_DB_CRM		= "reevotech_crm";
 
 $REEVO_WIKI_API_USER = "";
 $REEVO_WIKI_API_PASS = "";
diff --git a/etc/nginx/wiki.conf.sample b/etc/nginx/wiki.conf.sample
index abfc42c2..cec4d645 100755
--- a/etc/nginx/wiki.conf.sample
+++ b/etc/nginx/wiki.conf.sample
@@ -1,18 +1,18 @@
 # ----
 # Copyright (C) 2013-2020 - Reevo (http://reevo.org)
 # License: Affero GPL version 3 - http://www.gnu.org/licenses/agpl.html
-# ES: Este archivos es parte de: reevo-web (http://git.reevo.org/reevo/reevotech)
-# EN: This file is part of: reevotech (http://git.reevo.org/reevo/reevotech)
+# ES: Este archivos es parte de: reevo-web (http://git.reevo.org/reevo/crianzamutua)
+# EN: This file is part of: crianzamutua (http://git.reevo.org/reevo/reevo-2020)
 # ----
 
 server {
-	server_name example.org ~^(?<subdomain>.+)\.example\.org$;
+	server_name example.org;
 	root /srv/reevotech/www/wiki;
 
 	index index.php;
 
-	access_log /srv/reevotech/log/wiki/nginx.access.log;
-	error_log /srv/reevotech/log/wiki/nginx.error.log;
+	access_log /srv/reevotech/log/wiki/$server_name.nginx.access.log;
+	error_log /srv/reevotech/log/wiki/$server_name.nginx.error.log;
 
 	location / {
 		index index.php;
@@ -29,14 +29,14 @@ server {
 
 	location @mediawiki {
 		if ($subdomain) {
-			return       301 http://example.org$request_uri#$subdomain;
+			return       301 http://$server_name$request_uri#$subdomain;
 		}
 		rewrite ^/([^?]*)(?:\?(.*))? /index.php?title=$1&$2 last;
 	}
 
 	location ~ \.php?$ {
 		include /etc/nginx/fastcgi_params;
-		fastcgi_pass unix:/srv/reevotech/run/wiki.socket;
+		fastcgi_pass unix:/srv/reevotech/run/$server_name.socket;
 		fastcgi_index index.php;
 		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 	}
diff --git a/etc/php-fpm/wiki.conf.sample b/etc/php-fpm/wiki.conf.sample
index eb01d555..e98d2368 100755
--- a/etc/php-fpm/wiki.conf.sample
+++ b/etc/php-fpm/wiki.conf.sample
@@ -1,11 +1,11 @@
 ; ----
 ; Copyright (C) 2013-2020 - Reevo (http://reevo.org)
 ; License: Affero GPL version 3 - http://www.gnu.org/licenses/agpl.html
-; ES: Este archivos es parte de: reevotech (http://git.reevo.org/reevo/reevotech)
-; EN: This file is part of: reevotech (http://git.reevo.org/reevo/reevotech)
+; ES: Este archivos es parte de: crianzamutua (http://git.reevo.org/reevo/crianzamutua)
+; EN: This file is part of: reevo-2020 (http://git.reevo.org/reevo/reevo-2020)
 ; ----
 
-[wiki]
+[example.org]
 
 user = reevo
 group = www-data
@@ -28,7 +28,7 @@ pm.max_spare_servers = 30
 pm.status_path = /.status
 
 ping.path = /.ping
-ping.response = pong example.org
+ping.response = pong $pool
 
 request_slowlog_timeout = 10
 request_terminate_timeout = 10m
@@ -41,10 +41,10 @@ catch_workers_output = yes
 
 security.limit_extensions = .php .jpg .png .js .css
 
-env[HOSTNAME]   = $pool.example.org
-env[TMP]        = /srv/reevotech/tmp/$pool
-env[TMPDIR]     = /srv/reevotech/tmp/$pool
-env[TEMP]       = /srv/reevotech/tmp/$pool
+env[HOSTNAME]   = reevotech.test
+env[TMP]        = /srv/reevotech/tmp/wiki
+env[TMPDIR]     = /srv/reevotech/tmp/wiki
+env[TEMP]       = /srv/reevotech/tmp/wiki
 
 php_flag[display_errors] = on
 php_admin_value[error_log] = /srv/reevotech/log/wiki/php_fpm-$pool.error.log
@@ -55,6 +55,6 @@ php_admin_value[memory_limit] = 64M
 php_admin_value[post_max_size] = 12M
 php_admin_value[upload_max_filesize] = 10M
 
-php_admin_value[session.cookie_domain] = .example.org
+php_admin_value[session.cookie_domain] = .reevotech.test
 
 php_admin_value[cgi.fix_pathinfo] = 1
-- 
cgit v1.2.1