From 8d8b0e00759f6fcaebbb9bff9821cc2d85aed56c Mon Sep 17 00:00:00 2001 From: Qwerty Date: Wed, 28 Aug 2024 16:14:26 +0300 Subject: [PATCH 1/5] Logs adjasted --- nginx.conf | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/nginx.conf b/nginx.conf index 0e7240d..c3ab9e9 100644 --- a/nginx.conf +++ b/nginx.conf @@ -3,10 +3,15 @@ events {} http { log_format main '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; + '"$http_user_agent" "$http_x_forwarded_for" "$host"'; + + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log; + + server { listen 80; - server_name git.evil-bird.ru; + server_name your.domain.example; location /.well-known/acme-challenge/ { root /var/www/html; @@ -19,13 +24,13 @@ http { server { listen 443 ssl; - server_name git.evil-bird.ru; + server_name your.domain.example; - ssl_certificate /etc/letsencrypt/live/git.evil-bird.ru/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/git.evil-bird.ru/privkey.pem; + ssl_certificate /etc/letsencrypt/live/your.domain.example/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/your.domain.example/privkey.pem; location / { - proxy_pass http://10.10.1.10:3000; + proxy_pass http://; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -- 2.47.2 From 6404556a82723721547226e0d719c7defe9c47bb Mon Sep 17 00:00:00 2001 From: Qwerty Date: Mon, 12 Aug 2024 16:54:16 +0300 Subject: [PATCH 2/5] Email --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 766864f..666fda7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,8 @@ services: volumes: - ./certs:/etc/letsencrypt - ./html:/var/www/html -# command: certonly --webroot --webroot-path=/var/www/html --email prbigoon@gmail.com --agree-tos --no-eff-email -d git.evil-bird.ru + +# command: certonly --webroot --webroot-path=/var/www/html --email your.email@example --agree-tos --no-eff-email -d your.domain.example command: renew --webroot --webroot-path=/var/www/html entrypoint: /bin/sh -c "trap exit TERM; while :; do certbot renew --webroot --webroot-path=/var/www/html; sleep 12h & wait $${!}; done;" depends_on: -- 2.47.2 From 11adb9feca09af74101d38c15430f78d050ee70a Mon Sep 17 00:00:00 2001 From: Qwerty Date: Mon, 12 Aug 2024 17:11:18 +0300 Subject: [PATCH 3/5] -ssl2 --- nginx.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nginx.conf b/nginx.conf index c3ab9e9..9af8d7b 100644 --- a/nginx.conf +++ b/nginx.conf @@ -23,8 +23,13 @@ http { } server { +<<<<<<< HEAD listen 443 ssl; server_name your.domain.example; +======= + listen 443; + server_name git.evil-bird.ru; +>>>>>>> cbd9e3c (-ssl2) ssl_certificate /etc/letsencrypt/live/your.domain.example/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/your.domain.example/privkey.pem; -- 2.47.2 From 22c40d7c898dd0908f564457150d4c66e0171944 Mon Sep 17 00:00:00 2001 From: Qwerty Date: Wed, 28 Aug 2024 16:20:55 +0300 Subject: [PATCH 4/5] Fix conflicts --- nginx.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nginx.conf b/nginx.conf index 9af8d7b..c3ab9e9 100644 --- a/nginx.conf +++ b/nginx.conf @@ -23,13 +23,8 @@ http { } server { -<<<<<<< HEAD listen 443 ssl; server_name your.domain.example; -======= - listen 443; - server_name git.evil-bird.ru; ->>>>>>> cbd9e3c (-ssl2) ssl_certificate /etc/letsencrypt/live/your.domain.example/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/your.domain.example/privkey.pem; -- 2.47.2 From 0bc29157d6c5f976abaf3d319052443cd012f481 Mon Sep 17 00:00:00 2001 From: Qwerty Date: Wed, 28 Aug 2024 16:21:41 +0300 Subject: [PATCH 5/5] Fix domains --- html/stagged_nginx.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/html/stagged_nginx.conf b/html/stagged_nginx.conf index 9eabd87..58b3833 100644 --- a/html/stagged_nginx.conf +++ b/html/stagged_nginx.conf @@ -3,7 +3,7 @@ events {} http { server { listen 80; - server_name git.evil-bird.ru; + server_name your.domain.example; location /.well-known/acme-challenge/ { root /var/www/html; @@ -17,10 +17,10 @@ http { server { listen 443; # ssl; - server_name git.evil-bird.ru; + server_name your.domain.example; - # ssl_certificate /etc/letsencrypt/live/git.evil-bird.ru/fullchain.pem; - # ssl_certificate_key /etc/letsencrypt/live/git.evil-bird.ru/privkey.pem; + # ssl_certificate /etc/letsencrypt/live/your.domain.example/fullchain.pem; + # ssl_certificate_key /etc/letsencrypt/live/your.domain.example/privkey.pem; location / { root /var/www/html; -- 2.47.2