From 60aa0fc16a75e8ab7ec1338c14b11096eb94fea4 Mon Sep 17 00:00:00 2001
From: hmangeart <hugo.mangeart@ubicast.eu>
Date: Tue, 29 Aug 2017 17:48:56 +0200
Subject: [PATCH] encore
---
.../5.Nginx/vhost_msmonitor.conf | 58 +++++++++----------
2.Common_services/5.Nginx/vhost_skyreach.conf | 10 ++--
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/2.Common_services/5.Nginx/vhost_msmonitor.conf b/2.Common_services/5.Nginx/vhost_msmonitor.conf
index c5f21c88..9c3e1c9d 100644
--- a/2.Common_services/5.Nginx/vhost_msmonitor.conf
+++ b/2.Common_services/5.Nginx/vhost_msmonitor.conf
@@ -1,40 +1,40 @@
server {
- listen 80;
- server_name {{ server_name }};
+ listen 80;
+ server_name {{ server_name }};
- #location '/.well-known/acme-challenge' {
- # default_type "text/plain";
- # root /tmp/letsencrypt;
- #}
+ #location '/.well-known/acme-challenge' {
+ # default_type "text/plain";
+ # root /tmp/letsencrypt;
+ #}
- rewrite ^ https://$host$request_uri? permanent;
+ rewrite ^ https://$host$request_uri? permanent;
}
server {
- listen 443 ssl;
- server_name {{ server_name }};
- root /var/www/msmonitor;
+ listen 443 ssl;
+ server_name {{ server_name }};
+ root /var/www/msmonitor;
- access_log /var/log/nginx/access_msmonitor.log;
- error_log /var/log/nginx/error_msmonitor.log;
+ access_log /var/log/nginx/access_msmonitor.log;
+ error_log /var/log/nginx/error_msmonitor.log;
- #ssl_certificate /etc/letsencrypt/live/{{ server_name }}/fullchain.pem;
- #ssl_certificate_key /etc/letsencrypt/live/{{ server_name }}/privkey.pem;
+ #ssl_certificate /etc/letsencrypt/live/{{ server_name }}/fullchain.pem;
+ #ssl_certificate_key /etc/letsencrypt/live/{{ server_name }}/privkey.pem;
- location /media {
- }
- location /static {
- }
- location /wowza-manager/ {
- proxy_pass http://localhost:8088/;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Server $host;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_cookie_path / /wowza-manager/;
- }
- location / {
- uwsgi_pass unix:///home/msmonitor/msmonitor/temporary/uwsgi.sock;
- include /etc/nginx/uwsgi_params;
- }
+ location /media {
+ }
+ location /static {
+ }
+ location /wowza-manager/ {
+ proxy_pass http://localhost:8088/;
+ proxy_set_header X-Forwarded-Host $host;
+ proxy_set_header X-Forwarded-Server $host;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_cookie_path / /wowza-manager/;
+ }
+ location / {
+ uwsgi_pass unix:///home/msmonitor/msmonitor/temporary/uwsgi.sock;
+ include /etc/nginx/uwsgi_params;
+ }
}
diff --git a/2.Common_services/5.Nginx/vhost_skyreach.conf b/2.Common_services/5.Nginx/vhost_skyreach.conf
index 7cb661fc..0f27a74e 100644
--- a/2.Common_services/5.Nginx/vhost_skyreach.conf
+++ b/2.Common_services/5.Nginx/vhost_skyreach.conf
@@ -3,9 +3,9 @@ server {
server_name {{ server_name }};
#location '/.well-known/acme-challenge' {
- # default_type "text/plain";
- # root /tmp/letsencrypt;
- #}
+ # default_type "text/plain";
+ # root /tmp/letsencrypt;
+ #}
rewrite ^ https://$host$request_uri? permanent;
}
@@ -18,8 +18,8 @@ server {
access_log /var/log/nginx/access_skyreach.log;
error_log /var/log/nginx/error_skyreach.log;
- #ssl_certificate /etc/letsencrypt/live/{{ server_name }}/fullchain.pem;
- #ssl_certificate_key /etc/letsencrypt/live/{{ server_name }}/privkey.pem;
+ #ssl_certificate /etc/letsencrypt/live/{{ server_name }}/fullchain.pem;
+ #ssl_certificate_key /etc/letsencrypt/live/{{ server_name }}/privkey.pem;
location /media {
alias /home/skyreach/htdocs/skyreach_site/media;
--
GitLab