From bd299333b8186f905352e71acb362df728142117 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Wed, 29 Jul 2026 17:38:16 +0200
Subject: [PATCH] fixing newt configuration

---
 .../roles/newt_client/tasks/docker_newt.yaml  | 10 +---------
 .../templates/newt-config.secret.j2           |  4 ++++
 .../templates/newt_compose.yaml.j2            | 11 ++---------
 .../roles/nginx/tasks/docker_nginx.yaml       | 14 +++++++++++++-
 .../roles/nginx/templates/nginx.conf.j2       | 19 ++++++++++++-------
 5 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/ansible/playbooks/roles/newt_client/tasks/docker_newt.yaml b/ansible/playbooks/roles/newt_client/tasks/docker_newt.yaml
index eeece4c..a8b9cb2 100644
--- a/ansible/playbooks/roles/newt_client/tasks/docker_newt.yaml
+++ b/ansible/playbooks/roles/newt_client/tasks/docker_newt.yaml
@@ -17,15 +17,7 @@
     src: templates/newt-config.secret.j2
     dest: "{{ compose_dir.path }}/newt-config.secret"
 
-
-
-- name: Defining network
-  community.docker.docker_network:
-    name: "newt-network"
-    state: present 
-
-
-
 - name: Starting newt project
   community.docker.docker_compose_v2:
     project_src: "{{ compose_dir.path }}" 
+
diff --git a/ansible/playbooks/roles/newt_client/templates/newt-config.secret.j2 b/ansible/playbooks/roles/newt_client/templates/newt-config.secret.j2
index f6fb0ff..014c277 100644
--- a/ansible/playbooks/roles/newt_client/templates/newt-config.secret.j2
+++ b/ansible/playbooks/roles/newt_client/templates/newt-config.secret.j2
@@ -2,5 +2,9 @@
   "id": "{{ pangolin_site_id }}",
   "secret": "{{ newt_secret }}",
   "endpoint": "https://pangolin.{{ base_domain }}",
+
+  "dockerSocket": "unix:///var/run/docker.sock",
+  "dockerEnforceNetworkValidation": true,
+
   "tlsClientCert": ""
 }
\ No newline at end of file
diff --git a/ansible/playbooks/roles/newt_client/templates/newt_compose.yaml.j2 b/ansible/playbooks/roles/newt_client/templates/newt_compose.yaml.j2
index a607f9c..f1c0de1 100644
--- a/ansible/playbooks/roles/newt_client/templates/newt_compose.yaml.j2
+++ b/ansible/playbooks/roles/newt_client/templates/newt_compose.yaml.j2
@@ -4,20 +4,13 @@ services:
     image: fosrl/newt
     container_name: newt
     restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
       - CONFIG_FILE=/run/secrets/newt-config
     secrets:
       - newt-config
 
-    networks:
-      - newt-network
-
-
-
-networks:
-  newt-network:
-    external: true
-    
 secrets:
   newt-config:
     file: ./newt-config.secret
\ No newline at end of file
diff --git a/ansible/playbooks/roles/nginx/tasks/docker_nginx.yaml b/ansible/playbooks/roles/nginx/tasks/docker_nginx.yaml
index c7e8050..7d4d57f 100644
--- a/ansible/playbooks/roles/nginx/tasks/docker_nginx.yaml
+++ b/ansible/playbooks/roles/nginx/tasks/docker_nginx.yaml
@@ -30,6 +30,13 @@
     dest: "{{ nginx_conf_dir.path }}/nginx.conf"
 
 
+- name: Create nginx logs dir
+  file:
+    path: "/home/{{ ansible_user }}/nginx/logs"
+    state: directory
+  register: nginx_logs_dir
+
+
 - name: Create container
   docker_container:
     name: nginx-static
@@ -39,5 +46,10 @@
     volumes:
       - "{{ site_dir.path }}:/usr/share/nginx/html"
       - "{{ nginx_conf_dir.path }}:/etc/nginx/conf.d"
+      - "{{ nginx_logs_dir.path }}:/var/log/nginx"
     restart_policy : "unless-stopped"
-    init : true
\ No newline at end of file
+    networks:
+      - name: "newt_compose_default"
+    init : true
+    recreate: true
+    state: started
\ No newline at end of file
diff --git a/ansible/playbooks/roles/nginx/templates/nginx.conf.j2 b/ansible/playbooks/roles/nginx/templates/nginx.conf.j2
index 42616a1..f2b7ed9 100644
--- a/ansible/playbooks/roles/nginx/templates/nginx.conf.j2
+++ b/ansible/playbooks/roles/nginx/templates/nginx.conf.j2
@@ -1,8 +1,13 @@
 server {
-    listen 80;
-    listen [::]:80;
-
-    root   /var/www/html;
-    index  index.html;
-
-} 
\ No newline at end of file
+    listen                  80;
+    root                    /usr/share/nginx/html;
+    index                   index.html index.htm;
+    server_name             static1;
+    client_max_body_size    32m;
+    access_log              /var/log/nginx/static1.access.log;
+    error_log               /var/log/nginx/static1.error.log debug;
+    error_page              500 502 503 504  /50x.html;
+    location = /50x.html {
+          root              /var/lib/nginx/html;
+    }
+}
\ No newline at end of file