summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/nginx.conf (renamed from etc/nginx/site.conf)18
-rw-r--r--etc/nginx/ssl.conf6
2 files changed, 12 insertions, 12 deletions
diff --git a/etc/nginx/site.conf b/etc/nginx.conf
index 9e94bf6..4c74584 100644
--- a/etc/nginx/site.conf
+++ b/etc/nginx.conf
@@ -13,9 +13,11 @@
13# Server definition for <https://www.nagios-plugins.org/>. 13# Server definition for <https://www.nagios-plugins.org/>.
14# 14#
15server { 15server {
16 listen 443 ssl; 16 listen 130.133.8.40:443 ssl;
17 listen 444 ssl; 17 listen 130.133.8.40:444 ssl;
18 server_name www.nagios-plugins.org; 18 server_name www.nagios-plugins.org;
19 ssl_certificate /home/plugins/etc/ssl/nagios-plugins.crt;
20 ssl_certificate_key /home/plugins/etc/ssl/nagios-plugins.key;
19 root /home/plugins/web/port-$server_port; 21 root /home/plugins/web/port-$server_port;
20 22
21 # 23 #
@@ -81,12 +83,16 @@ server {
81# Ditto for the test instance. 83# Ditto for the test instance.
82# 84#
83server { 85server {
84 listen 80 default_server; 86 listen 130.133.8.40:80 default_server;
85 listen 443 default_server ssl; 87 listen 130.133.8.40:443 default_server ssl;
88 ssl_certificate /home/plugins/etc/ssl/nagios-plugins.crt;
89 ssl_certificate_key /home/plugins/etc/ssl/nagios-plugins.key;
86 return 301 https://www.nagios-plugins.org$request_uri; 90 return 301 https://www.nagios-plugins.org$request_uri;
87} 91}
88server { 92server {
89 listen 81 default_server; 93 listen 130.133.8.40:81 default_server;
90 listen 444 default_server ssl; 94 listen 130.133.8.40:444 default_server ssl;
95 ssl_certificate /home/plugins/etc/ssl/nagios-plugins.crt;
96 ssl_certificate_key /home/plugins/etc/ssl/nagios-plugins.key;
91 return 301 https://www.nagios-plugins.org:444$request_uri; 97 return 301 https://www.nagios-plugins.org:444$request_uri;
92} 98}
diff --git a/etc/nginx/ssl.conf b/etc/nginx/ssl.conf
deleted file mode 100644
index 04f029a..0000000
--- a/etc/nginx/ssl.conf
+++ /dev/null
@@ -1,6 +0,0 @@
1#
2# Nginx SSL configuration for the Nagios Plugins.
3#
4ssl_certificate /home/plugins/etc/ssl/nagios-plugins.crt;
5ssl_certificate_key /home/plugins/etc/ssl/nagios-plugins.key;
6ssl_session_cache shared:SSL:10m;