summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cyfraeviolae-tls.conf4
-rw-r--r--cyfraeviolae.conf5
2 files changed, 4 insertions, 5 deletions
diff --git a/cyfraeviolae-tls.conf b/cyfraeviolae-tls.conf
deleted file mode 100644
index 45bda9e..0000000
--- a/cyfraeviolae-tls.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-ssl_certificate /etc/letsencrypt/live/cyfraeviolae.org/fullchain.pem;
-ssl_certificate_key /etc/letsencrypt/live/cyfraeviolae.org/privkey.pem;
-include /etc/letsencrypt/options-ssl-nginx.conf;
-ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
diff --git a/cyfraeviolae.conf b/cyfraeviolae.conf
index 0b55f97..cd4cc3f 100644
--- a/cyfraeviolae.conf
+++ b/cyfraeviolae.conf
@@ -2,7 +2,10 @@ server {
listen 80 default_server;
listen 443 ssl default_server;
- include /etc/nginx/conf.d/cyfraeviolae-ssl.conf*;
+ ssl_certificate /etc/letsencrypt/live/cyfraeviolae.org/fullchain.pem;
+ ssl_certificate_key /etc/letsencrypt/live/cyfraeviolae.org/privkey.pem;
+ include /etc/letsencrypt/options-ssl-nginx.conf;
+ ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
location /forbidden-salamanders {
proxy_pass http://127.0.0.1:9010/;