summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2014-01-14 21:58:44 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2014-01-14 21:58:44 (GMT)
commit0f0a943d5429cf8db0f7f6cc9bc2679ed9329901 (patch)
treecad8ae57e93fcfbfc5bc65ed7afb6c6b50bce62a /etc
parent3be1e22a0077eb714be9c9e1e3793ad080d93e3f (diff)
downloadsite-0f0a943d5429cf8db0f7f6cc9bc2679ed9329901.tar.gz
Rename Nagios Plugins to Monitoring Plugins
This is a first step of replacing the name "Nagios Plugins" with "Monitoring Plugins" where appriopriate. Some news items and FAQ entries are also created or updated. More to come.
Diffstat (limited to 'etc')
-rw-r--r--etc/crontab2
-rw-r--r--etc/nginx.conf26
2 files changed, 14 insertions, 14 deletions
diff --git a/etc/crontab b/etc/crontab
index 0339f69..c08d955 100644
--- a/etc/crontab
+++ b/etc/crontab
@@ -4,5 +4,5 @@
4# 4#
5MAILTO=admin@monitoring-plugins.org 5MAILTO=admin@monitoring-plugins.org
6# 6#
7*/10 * * * * $HOME/bin/git-mirror $HOME/repositories/nagios-*.git 7#*/10 * * * * $HOME/bin/git-mirror $HOME/repositories/nagios-*.git
844 4 * * * $HOME/bin/check-mirrors 844 4 * * * $HOME/bin/check-mirrors
diff --git a/etc/nginx.conf b/etc/nginx.conf
index 1b37bae..b8e3fd0 100644
--- a/etc/nginx.conf
+++ b/etc/nginx.conf
@@ -10,14 +10,14 @@
10# 10#
11 11
12# 12#
13# Server definition for <https://www.nagios-plugins.org/>. 13# Server definition for <https://www.monitoring-plugins.org/>.
14# 14#
15server { 15server {
16 listen 130.133.8.40:443 ssl; 16 listen 130.133.8.40:443 ssl;
17 listen 130.133.8.40:444 ssl; 17 listen 130.133.8.40:444 ssl;
18 server_name www.nagios-plugins.org; 18 server_name www.monitoring-plugins.org;
19 ssl_certificate /home/plugins/etc/ssl/nagios-plugins.crt; 19 ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
20 ssl_certificate_key /home/plugins/etc/ssl/nagios-plugins.key; 20 ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
21 root /home/plugins/web/port-$server_port; 21 root /home/plugins/web/port-$server_port;
22 22
23 # 23 #
@@ -72,8 +72,8 @@ server {
72 location = /doc/release-notes/1-5.html { 72 location = /doc/release-notes/1-5.html {
73 return 301 /news/release-1-5.html; 73 return 301 /news/release-1-5.html;
74 } 74 }
75 location = /download/snapshot/nagios-plugins-HEAD.tar.gz { 75 location = /download/snapshot/monitoring-plugins-HEAD.tar.gz {
76 return 301 /download/snapshot/nagios-plugins-master.tar.gz; 76 return 301 /download/snapshot/monitoring-plugins-master.tar.gz;
77 } 77 }
78 location = /rfc/new_threshold_syntax { 78 location = /rfc/new_threshold_syntax {
79 return 301 /doc/new-threshold-syntax.html; 79 return 301 /doc/new-threshold-syntax.html;
@@ -90,20 +90,20 @@ server {
90} 90}
91 91
92# 92#
93# Redirect HTTP and all other domains to <https://www.nagios-plugins.org/>. 93# Redirect HTTP and all other domains to <https://www.monitoring-plugins.org/>.
94# Ditto for the test instance. 94# Ditto for the test instance.
95# 95#
96server { 96server {
97 listen 130.133.8.40:80 default_server; 97 listen 130.133.8.40:80 default_server;
98 listen 130.133.8.40:443 default_server ssl; 98 listen 130.133.8.40:443 default_server ssl;
99 ssl_certificate /home/plugins/etc/ssl/nagios-plugins.crt; 99 ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
100 ssl_certificate_key /home/plugins/etc/ssl/nagios-plugins.key; 100 ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
101 return 301 https://www.nagios-plugins.org$request_uri; 101 return 301 https://www.monitoring-plugins.org$request_uri;
102} 102}
103server { 103server {
104 listen 130.133.8.40:81 default_server; 104 listen 130.133.8.40:81 default_server;
105 listen 130.133.8.40:444 default_server ssl; 105 listen 130.133.8.40:444 default_server ssl;
106 ssl_certificate /home/plugins/etc/ssl/nagios-plugins.crt; 106 ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
107 ssl_certificate_key /home/plugins/etc/ssl/nagios-plugins.key; 107 ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
108 return 301 https://www.nagios-plugins.org:444$request_uri; 108 return 301 https://www.monitoring-plugins.org:444$request_uri;
109} 109}