diff --git a/docker-compose.yml b/docker-compose.yml index 134fe4c..da6bb7b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -102,7 +102,7 @@ services: dvadmin-nginx: image: nginx:latest - container_name: docker-nginx + container_name: dvadmin-nginx # build: ./docker_env/nginx restart: always ports: diff --git a/docker_env/nginx/sites-enabled/api.conf b/docker_env/nginx/sites-enabled/api.conf index 522ef5e..f198ca3 100644 --- a/docker_env/nginx/sites-enabled/api.conf +++ b/docker_env/nginx/sites-enabled/api.conf @@ -27,7 +27,7 @@ server { location / { root html/www; include uwsgi_params; - uwsgi_pass docker-django:8000; + uwsgi_pass dvadmin-django:8000; uwsgi_param UWSGI_SCRIPT home.wsgi; uwsgi_param UWSGI_CHDIR /dvadmin-backend/;#项目路径 diff --git a/docker_env/nginx/sites-enabled/daily.api.conf b/docker_env/nginx/sites-enabled/daily.api.conf new file mode 100644 index 0000000..f198ca3 --- /dev/null +++ b/docker_env/nginx/sites-enabled/daily.api.conf @@ -0,0 +1,46 @@ +## 将HTTP请求全部重定向至HTTPS +server { + listen 80; + server_name api.django-vue-admin.com; + charset utf-8; + access_log /var/log/nginx/api-80.access.log; + error_log /var/log/nginx/api-80.error.log; + rewrite ^(.*)$ https://${server_name}$1 permanent; +} +server { + listen 443 ssl; + server_name api.django-vue-admin.com; + root /dvadmin-backend/;#项目路径 + charset utf-8; + ssl_certificate /nginx/keys/api.django-vue-admin.com.crt;#.pem证书路径 + ssl_certificate_key /nginx/keys/api.django-vue-admin.com.key;#.key证书路径 + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE; + ssl_prefer_server_ciphers on; + ssl_session_cache shared:SSL:10m; + ssl_session_timeout 10m; + error_page 497 https://$host$request_uri; + proxy_set_header Host $proxy_host; + proxy_set_header X-DTS-SCHEMA api; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; + location / { + root html/www; + include uwsgi_params; + uwsgi_pass dvadmin-django:8000; + uwsgi_param UWSGI_SCRIPT home.wsgi; + uwsgi_param UWSGI_CHDIR /dvadmin-backend/;#项目路径 + + } + # Django media + location /media { + alias /dvadmin-backend/media; # your Django project's media files - amend as required + } + # Django static + location /static { + alias /dvadmin-backend/static; # your Django project's static files - amend as required + } + + access_log /var/log/nginx/api-443.access.log; + error_log /var/log/nginx/api-443.error.log; + }