ansible task

.sys/ansible/playbook.yml

@@ -2,11 +2,13 @@
   hosts: localhost
   gather_facts: no
   vars:
-    main_domain: funtov.loc
+    main_domain: mustafin.local
+    main_dir: /home/MustafinTF/devops_lessons
     main_port: 80
-    node_port: 3000
-    php_fpm_socket: /run/php/my-app-php-fpm.sock
+    node_port: 4000
+    php_fpm_socket: 127.0.0.1:9234
   roles:
     - nginx
     - node-app
     - php-app
+    - install-apps

.sys/ansible/roles/install-apps/tasks/main.yml

@@ -0,0 +1,7 @@
+- name: Install tilde
+  apt:
+    name: tilde
+
+- name: Install mc
+  apt:
+    name: mc

.sys/ansible/roles/nginx/templates/main.conf.j2

@@ -6,28 +6,35 @@ server {
     server_name {{main_domain}};
     listen {{main_port}};
 
-    root /home/kfuntov/devops_lessons;
+    root {{main_dir}};
 
     location / {
-        root /home/kfuntov/devops_lessons/static-files;
+        root {{main_dir}}/static-files;
         try_files $uri $uri/index.html =404;
     }
 
+
+    location ~ \.jpg$ {
+       try_files $uri $uri/index.html =404;
+    }
+
     location ^~ /new-php/ {
         include /etc/nginx/fastcgi_params;
         fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME /home/kfuntov/devops_lessons/php-app/index.php;
-        fastcgi_pass unix:{{php_fpm_socket}};
+        fastcgi_param SCRIPT_FILENAME {{main_dir}}/php-app/index.php;
+        fastcgi_pass {{php_fpm_socket}};
     }
 
     location ~ \.php$ {
         include /etc/nginx/fastcgi_params;
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_pass unix:{{php_fpm_socket}};
+        fastcgi_pass {{php_fpm_socket}};
     }
 
     location /node/ {
+        proxy_set_header From-who 'my-app';
+        proxy_set_header Host            'testx';
         proxy_pass http://node_app;
     }
 }

.sys/ansible/roles/nginx/templates/proxy.conf.j2

@@ -4,6 +4,7 @@ map $http_host $proxy_upstream {
     default kibana;
     kibana.* kibana;
     tech-dash.* tech-dash;
+    rep.* rep;
 }
 
 upstream kibana {
@@ -13,12 +14,17 @@ upstream tech-dash {
     server tech-dash.x340.org;
 }
 
+upstream rep {
+    server repetitors.info.master.stend.x340.org;
+}
+
 map $http_host $proxy_host {
     hostnames;
 
     default kibana.x340.org;
     kibana.* kibana.x340.org;
     tech-dash.* tech-dash.x340.org;
+    rep.* repetitors.info.master.stend.x340.org;
 }
 
 

.sys/ansible/roles/node-app/templates/node-app.service.j2

@@ -3,7 +3,7 @@ Description=NodeJs app for devops lessons
 
 [Service]
 User=www-data
-WorkingDirectory=/home/kfuntov/devops_lessons/node-app
+WorkingDirectory={{main_dir}}/node-app
 Environment=PORT={{node_port}}
 ExecStart=/usr/bin/node index.js
 Restart=always

node-app/index.js

@@ -6,7 +6,7 @@ const port = process.env.PORT;
 const server = http.createServer((req, res) => {
   if (req.url === "/node/hello") {
     res.statusCode = 200;
-    res.end('Hello from node.js');
+    res.end('Hello from node.js ' + req.headers['from-who'] + ' ' + req.headers['host']);
     return;
   }
   res.statusCode = 404;