From 7b6e82b702b0c5f1c7142818a254a5b8774edc10 Mon Sep 17 00:00:00 2001
From: lulzette <lulzette@cock.li>
Date: Thu, 25 Feb 2021 18:02:15 +0300
Subject: [PATCH] templates

---
 1/play.yml                                   | 3 ++-
 1/roles/nginx/files/sites-enabled/cloud.conf | 8 ++++----
 1/roles/nginx/files/sites-enabled/pma.conf   | 6 +++---
 1/roles/nginx/files/sites-enabled/root.conf  | 6 +++---
 1/roles/nginx/files/sites-enabled/wiki.conf  | 6 +++---
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/1/play.yml b/1/play.yml
index 7ce4c4b..1223dc8 100644
--- a/1/play.yml
+++ b/1/play.yml
@@ -3,4 +3,5 @@
    roles: 
     - nginx
     - php
-    - mysql
\ No newline at end of file
+    - mysql
+    - webapps
\ No newline at end of file
diff --git a/1/roles/nginx/files/sites-enabled/cloud.conf b/1/roles/nginx/files/sites-enabled/cloud.conf
index 7bc7429..a66d140 100644
--- a/1/roles/nginx/files/sites-enabled/cloud.conf
+++ b/1/roles/nginx/files/sites-enabled/cloud.conf
@@ -1,10 +1,10 @@
 server {
     listen 80;
     listen 443 ssl http2;
-    server_name cloud.xz777.ru;
+    server_name cloud.{{domain}};
     index index.php;
-    ssl_certificate /etc/letsencrypt/live/cloud.xz777.ru/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/cloud.xz777.ru/privkey.pem; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/cloud.{{domain}}/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/cloud.{{domain}}/privkey.pem; # managed by Certbot
 
     add_header X-Content-Type-Options nosniff;
     add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
@@ -61,7 +61,7 @@ server {
         fastcgi_param front_controller_active true;
         fastcgi_send_timeout 1200;
         fastcgi_read_timeout 1200;
-        fastcgi_pass unix:/run/php/php7.4-fpm.sock;
+        fastcgi_pass unix:/run/php/php-fpm.sock;
         fastcgi_intercept_errors on;
         fastcgi_request_buffering off;
     }
diff --git a/1/roles/nginx/files/sites-enabled/pma.conf b/1/roles/nginx/files/sites-enabled/pma.conf
index 8546a1d..1148607 100644
--- a/1/roles/nginx/files/sites-enabled/pma.conf
+++ b/1/roles/nginx/files/sites-enabled/pma.conf
@@ -2,9 +2,9 @@ server {
     listen 80;
     listen 443 ssl http2;
 
-    server_name pma.xz777.ru;
-    ssl_certificate /etc/letsencrypt/live/pma.xz777.ru/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/pma.xz777.ru/privkey.pem; # managed by Certbot
+    server_name pma.{{domain}};
+    ssl_certificate /etc/letsencrypt/live/pma.{{domain}}/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/pma.{{domain}}/privkey.pem; # managed by Certbot
 
     add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
     add_header X-Content-Type-Options nosniff;
diff --git a/1/roles/nginx/files/sites-enabled/root.conf b/1/roles/nginx/files/sites-enabled/root.conf
index af0190d..c50dc5c 100644
--- a/1/roles/nginx/files/sites-enabled/root.conf
+++ b/1/roles/nginx/files/sites-enabled/root.conf
@@ -1,9 +1,9 @@
 server {
     listen 80;
     listen 443 ssl http2;
-    server_name xz777.ru;
-    ssl_certificate /etc/letsencrypt/live/xz777.ru/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/xz777.ru/privkey.pem; # managed by Certbot
+    server_name {{domain}};
+    ssl_certificate /etc/letsencrypt/live/{{domain}}/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/{{domain}}/privkey.pem; # managed by Certbot
     add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
     add_header X-Content-Type-Options nosniff;
     add_header X-XSS-Protection "1; mode=block";
diff --git a/1/roles/nginx/files/sites-enabled/wiki.conf b/1/roles/nginx/files/sites-enabled/wiki.conf
index 3d562bd..d801b11 100644
--- a/1/roles/nginx/files/sites-enabled/wiki.conf
+++ b/1/roles/nginx/files/sites-enabled/wiki.conf
@@ -2,9 +2,9 @@ server {
     listen 80;
     listen 443 ssl http2;
 
-    server_name wiki.xz777.ru;
-    ssl_certificate /etc/letsencrypt/live/wiki.xz777.ru/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/wiki.xz777.ru/privkey.pem; # managed by Certbot
+    server_name wiki.{{domain}};
+    ssl_certificate /etc/letsencrypt/live/wiki.{{domain}}/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/wiki.{{domain}}/privkey.pem; # managed by Certbot
 
     add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
     add_header X-Content-Type-Options nosniff;