Refactored ws implementation to use it in mastodon and in new espocrm role

roles/docker-mastodon/tasks/create-domains.yml

@@ -1,9 +0,0 @@
-- name: "include role for {{application_id}} to recieve certs & do modification routines"
-  include_role:
-    name: nginx-https-get-cert-modify-all
-    
-- name: configure {{domain}}.conf
-  template: 
-    src:  "mastodon.conf.j2" 
-    dest: "{{nginx.directories.http.servers}}{{domain}}.conf"
-  notify: restart nginx

roles/docker-mastodon/tasks/main.yml

@@ -3,13 +3,18 @@
   include_role: 
     name: docker-central-database
 
-- name: "include create-domains.yml for mastodon"
-  include_tasks: create-domains.yml
+- name: "Include setup for domain '{{ domain }}'"
+  include_role: 
+    name: nginx-domain-setup
   loop: "{{ [domains.mastodon] + domains.mastodon_alternates }}"
   loop_control:
     loop_var: domain
   vars:
-    http_port: "{{ ports.localhost.http[application_id] }}"
+    http_port:            "{{ ports.localhost.http[application_id] }}"
+    ws_path:              "/api/v1/streaming"
+    ws_port:              "{{ ports.localhost.websocket[application_id] }}"
+    client_max_body_size: "80m"
+    vhost_flavour:        "ws_generic"
 
 - name: "copy docker-compose.yml and env file"
   include_tasks: copy-docker-compose-and-env.yml

roles/docker-mastodon/templates/docker-compose.yml.j2

@@ -24,7 +24,7 @@ services:
     healthcheck:
       test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
     ports:
-      - "127.0.0.1:{{ports.localhost.web_socket[application_id]}}:4000"
+      - "127.0.0.1:{{ports.localhost.websocket[application_id]}}:4000"
 {% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
 

roles/docker-mastodon/templates/mastodon.conf.j2

@@ -1,48 +0,0 @@
-map $http_upgrade $connection_upgrade {
-  default upgrade;
-  ''      close;
-}
-
-server {
-  server_name {{domain}};
-
-  {% include 'roles/letsencrypt/templates/ssl_header.j2' %}
-
-  {% include 'roles/nginx-modifier-all/templates/global.includes.conf.j2'%}
-
-  keepalive_timeout    70;
-  sendfile             on;
-  client_max_body_size 80m;
-
-  gzip on;
-  gzip_disable "msie6";
-  gzip_vary on;
-  gzip_proxied any;
-  gzip_comp_level 6;
-  gzip_buffers 16 8k;
-  gzip_http_version 1.1;
-  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
-
-  add_header Strict-Transport-Security "max-age=31536000";
-
-  {% include 'roles/nginx-docker-reverse-proxy/templates/proxy_pass.conf.j2' %}
-
-  location /api/v1/streaming {
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto https;
-    proxy_set_header Proxy "";
-
-    proxy_pass http://127.0.0.1:{{ports.localhost.web_socket[application_id]}};
-    proxy_buffering off;
-    proxy_redirect off;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection $connection_upgrade;
-
-    tcp_nodelay on;
-  }
-
-  error_page 500 501 502 503 504 /500.html;
-}