summaryrefslogtreecommitdiffstats
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-17 14:11:48 (GMT)
commit58af77e919ee68d1cba1b5dce3e745003d7d6d67 (patch)
tree5c595c3ade634e9e59efae685a2d69879984529c
parent3be1e22a0077eb714be9c9e1e3793ad080d93e3f (diff)
downloadsite-58af77e919ee68d1cba1b5dce3e745003d7d6d67.tar.gz
Rename Nagios Plugins to Monitoring Plugins
-rw-r--r--etc/crontab2
-rw-r--r--etc/nginx.conf26
-rw-r--r--web/input/development.md12
-rw-r--r--web/input/doc/faq/compilation.md6
-rw-r--r--web/input/doc/faq/contribute.md2
-rw-r--r--web/input/doc/faq/control.md12
-rw-r--r--web/input/doc/faq/donations.md10
-rw-r--r--web/input/doc/faq/git.md12
-rw-r--r--web/input/doc/faq/gnulib.md4
-rw-r--r--web/input/doc/faq/index.md6
-rw-r--r--web/input/doc/faq/installation.md2
-rw-r--r--web/input/doc/faq/libtap.md7
-rw-r--r--web/input/doc/faq/license.md8
-rw-r--r--web/input/doc/faq/packages.md4
-rw-r--r--web/input/doc/faq/private-c-api.md8
-rw-r--r--web/input/doc/faq/reuse.md12
-rw-r--r--web/input/doc/faq/use-perl-module.md4
-rw-r--r--web/input/doc/index.md6
-rw-r--r--web/input/doc/writing-perl-plugins.md5
-rw-r--r--web/input/download.md12
-rw-r--r--web/input/index.md27
-rw-r--r--web/input/news/new-project-name.md36
-rw-r--r--web/input/news/release-1-5.md2
-rw-r--r--web/input/resources/plugins.css2
-rw-r--r--web/input/support.md32
-rw-r--r--web/input/team.md4
-rw-r--r--web/macros.py8
-rw-r--r--web/page.html12
28 files changed, 159 insertions, 124 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}
diff --git a/web/input/development.md b/web/input/development.md
index 5fec2cd..76a52df 100644
--- a/web/input/development.md
+++ b/web/input/development.md
@@ -7,15 +7,15 @@ menu: 6
7 7
8## Software Repositories 8## Software Repositories
9 9
10The [Nagios Plugins Development Team][team] takes care of three projects: 10The [Monitoring Plugins Development Team][team] takes care of three projects:
11 11
12* Nagios Plugins &mdash; the core bundle of standard plugins. 12* Monitoring Plugins &mdash; the core bundle of standard plugins.
13* Nagios::Plugin &mdash; a module used by plugins written in Perl. 13* Nagios::Plugin &mdash; a module used by plugins written in Perl.
14* NagiosMIB &mdash; SNMP MIB files for traps sent from [Nagios][nagios]. 14* NagiosMIB &mdash; SNMP MIB files for traps sent from [Nagios][nagios].
15 15
16These projects are maintained in separate repositories on [GitHub][github]: 16These projects are maintained in separate repositories on [GitHub][github]:
17 17
18* <https://github.com/nagios-plugins/repositories> 18* <https://github.com/monitoring-plugins/repositories>
19 19
20Contributions are always welcome! If you'd like to provide patches, please 20Contributions are always welcome! If you'd like to provide patches, please
21[fork][fork] the desired repository and submit a [pull request][pull]. In 21[fork][fork] the desired repository and submit a [pull request][pull]. In
@@ -24,8 +24,8 @@ introduction][git-intro] or [some other Git documentation][git-ref], first.
24 24
25## Test Suite 25## Test Suite
26 26
27The Nagios Plugins bundle comes with an extensive test suite. Some of the 27The Monitoring Plugins bundle comes with an extensive test suite. Some of the
28tests require [libtap][libtap], a copy of which is shipped with the Nagios 28tests require [libtap][libtap], a copy of which is shipped with the Monitoring
29Plugins source tarball. In order to execute all tests, issue the following 29Plugins source tarball. In order to execute all tests, issue the following
30commands: 30commands:
31 31
@@ -39,7 +39,7 @@ Also see our testing-related [development FAQs][dev-faq].
39Regular tests of the latest code are scheduled automatically on various 39Regular tests of the latest code are scheduled automatically on various
40platforms, the results can be [viewed online][tests]. 40platforms, the results can be [viewed online][tests].
41 41
42[team]: team.html "Nagios Plugins Development Team" 42[team]: team.html "Monitoring Plugins Development Team"
43[nagios]: http://www.nagios.org/ "Nagios" 43[nagios]: http://www.nagios.org/ "Nagios"
44[github]: https://github.com/ "GitHub" 44[github]: https://github.com/ "GitHub"
45[fork]: https://help.github.com/articles/fork-a-repo "Fork Documentation" 45[fork]: https://help.github.com/articles/fork-a-repo "Fork Documentation"
diff --git a/web/input/doc/faq/compilation.md b/web/input/doc/faq/compilation.md
index ac5fff7..45df8a2 100644
--- a/web/input/doc/faq/compilation.md
+++ b/web/input/doc/faq/compilation.md
@@ -1,4 +1,4 @@
1title: Building Nagios Plugins 1title: Building Monitoring Plugins
2parent: FAQ 2parent: FAQ
3--- 3---
4 4
@@ -6,8 +6,8 @@ parent: FAQ
6 6
7To compile version `1.x` of the plugins, you run: 7To compile version `1.x` of the plugins, you run:
8 8
9 $ gzip -dc nagios-plugins-1.x.tar.gz | tar -xf - 9 $ gzip -dc monitoring-plugins-1.x.tar.gz | tar -xf -
10 $ cd nagios-plugins-1.x 10 $ cd monitoring-plugins-1.x
11 $ ./configure 11 $ ./configure
12 $ make 12 $ make
13 13
diff --git a/web/input/doc/faq/contribute.md b/web/input/doc/faq/contribute.md
index fe97a80..c92594f 100644
--- a/web/input/doc/faq/contribute.md
+++ b/web/input/doc/faq/contribute.md
@@ -16,7 +16,7 @@ you have full rights to it. If your pull request is accepted, we will (of
16course) retain the Git author name and email address, and we'll add your name 16course) retain the Git author name and email address, and we'll add your name
17to the list of contributors in the [THANKS][thanks] file. 17to the list of contributors in the [THANKS][thanks] file.
18 18
19[repo]: https://github.com/nagios-plugins/repositories "Our Repositories" 19[repo]: https://github.com/monitoring-plugins/repositories "Our Repositories"
20[fork]: https://help.github.com/articles/fork-a-repo "Fork Documentation" 20[fork]: https://help.github.com/articles/fork-a-repo "Fork Documentation"
21[pull]: https://help.github.com/articles/using-pull-requests "Pull Request Documentation" 21[pull]: https://help.github.com/articles/using-pull-requests "Pull Request Documentation"
22[github]: https://github.com/ "GitHub" 22[github]: https://github.com/ "GitHub"
diff --git a/web/input/doc/faq/control.md b/web/input/doc/faq/control.md
index 37a811f..59636a0 100644
--- a/web/input/doc/faq/control.md
+++ b/web/input/doc/faq/control.md
@@ -2,15 +2,11 @@ title: Who controls the project?
2parent: FAQ 2parent: FAQ
3--- 3---
4 4
5# Who controls the Nagios Plugins project? 5# Who controls the project?
6 6
7[Nagios Enterprises][enterprises] own the Nagios Plugins project, hence the 7The Monitoring Plugins are maintained by an independent [team][team] of
8domain names of the site belong to Nagios Enterprises. However, the [Nagios 8volunteers.
9Plugins Development Team][team] are responsible for the running of the
10project. This means that decisions about the web site and the development of
11code related to the project are handled independently by the team.
12 9
13[enterprises]: http://www.nagios.com/about/company "Nagios Enterprises" 10[team]: team.html "Monitoring Plugins Development Team"
14[team]: team.html "Nagios Plugins Development Team"
15 11
16<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %--> 12<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/input/doc/faq/donations.md b/web/input/doc/faq/donations.md
index b7413e9..bc15968 100644
--- a/web/input/doc/faq/donations.md
+++ b/web/input/doc/faq/donations.md
@@ -4,16 +4,16 @@ parent: FAQ
4 4
5# Do you accept donations? 5# Do you accept donations?
6 6
7The [Nagios Plugins Development Team][team] accepts donations for the project. 7The [Monitoring Plugins Development Team][team] accepts donations for the
8We have a separate Paypal account that is used for donations, which is 8project. We have a separate Paypal account that is used for donations, which
9administered by the team leader. 9is administered by the team leader.
10 10
11Donations go towards paying for the small administrative charges we have. We 11Donations go towards paying for the small administrative charges we have. We
12might also use some of the funds for team beer when we meet up in person. 12might also use some of the funds for team beer when we meet up in person.
13 13
14Please contact <donations@nagios-plugins.org> if you're considering a 14Please contact <donations@monitoring-plugins.org> if you're considering a
15donation. 15donation.
16 16
17[team]: team.html "Nagios Plugins Development Team" 17[team]: team.html "Monitoring Plugins Development Team"
18 18
19<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %--> 19<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/input/doc/faq/git.md b/web/input/doc/faq/git.md
index 390b87a..e9bc27d 100644
--- a/web/input/doc/faq/git.md
+++ b/web/input/doc/faq/git.md
@@ -4,9 +4,8 @@ parent: FAQ
4 4
5# How do I use Git? 5# How do I use Git?
6 6
7After the 1.4.13 release, the [Nagios Plugins Development Team][team] moved to 7After the 1.4.13 release, the project moved to [Git][git] for its code
8[Git][git] for its code repositories. This document is a quick introduction 8repositories. This document is a quick introduction to Git.
9to Git.
10 9
11## Basic Concepts 10## Basic Concepts
12 11
@@ -41,14 +40,14 @@ with Git you only have to type a handful of digits to reference one.
41To work on a project you first have to clone it. This creates your own local 40To work on a project you first have to clone it. This creates your own local
42repository, and until you want to distribute your change or merge changes from 41repository, and until you want to distribute your change or merge changes from
43someone else, everything that follows can happen offline. If you have push 42someone else, everything that follows can happen offline. If you have push
44access to the Nagios Plugins repository, run the command: 43access to the Monitoring Plugins repository, run the command:
45 44
46 $ git clone git@github.com:nagios-plugins/nagios-plugins.git 45 $ git clone git@github.com:monitoring-plugins/monitoring-plugins.git
47 46
48If you just want a local copy or wish to clone it to your workstation, you can 47If you just want a local copy or wish to clone it to your workstation, you can
49run this command instead: 48run this command instead:
50 49
51 $ git clone git://github.com/nagios-plugins/nagios-plugins.git 50 $ git clone git://github.com/monitoring-plugins/monitoring-plugins.git
52 51
53This will create a directory called `nagios-plugins` with all the `master` 52This will create a directory called `nagios-plugins` with all the `master`
54code and history (this is roughly equivalent to CVS/SVN `HEAD`). Change 53code and history (this is roughly equivalent to CVS/SVN `HEAD`). Change
@@ -192,7 +191,6 @@ on the [Git web site][git]).
192- Git for Computer Scientists 191- Git for Computer Scientists
193 <http://eagain.net/articles/git-for-computer-scientists/> 192 <http://eagain.net/articles/git-for-computer-scientists/>
194 193
195[team]: team.html "Nagios Plugins Development Team"
196[guidelines]: doc/guidelines.html "Nagios Plugin Development Guidelines" 194[guidelines]: doc/guidelines.html "Nagios Plugin Development Guidelines"
197[git]: http://git-scm.com/ "Git" 195[git]: http://git-scm.com/ "Git"
198[scott]: http://scottchacon.com/ "Scott Chacon" 196[scott]: http://scottchacon.com/ "Scott Chacon"
diff --git a/web/input/doc/faq/gnulib.md b/web/input/doc/faq/gnulib.md
index 5b7299b..964940c 100644
--- a/web/input/doc/faq/gnulib.md
+++ b/web/input/doc/faq/gnulib.md
@@ -12,8 +12,8 @@ latest Gnulib code, do something like:
12 $ cd gnulib 12 $ cd gnulib
13 $ GNULIB_HEAD=$(git rev-parse --short HEAD) 13 $ GNULIB_HEAD=$(git rev-parse --short HEAD)
14 $ cd .. 14 $ cd ..
15 $ git clone git@github.com:nagios-plugins/nagios-plugins.git 15 $ git clone git@github.com:monitoring-plugins/monitoring-plugins.git
16 $ cd nagios-plugins 16 $ cd monitoring-plugins
17 $ ../gnulib/gnulib-tool --update 17 $ ../gnulib/gnulib-tool --update
18 $ find gl -name '*~' -o -name '.gitignore' | xargs rm 18 $ find gl -name '*~' -o -name '.gitignore' | xargs rm
19 $ git status 19 $ git status
diff --git a/web/input/doc/faq/index.md b/web/input/doc/faq/index.md
index 722362c..302df11 100644
--- a/web/input/doc/faq/index.md
+++ b/web/input/doc/faq/index.md
@@ -4,12 +4,12 @@ parent: Documentation
4 4
5# FAQ 5# FAQ
6 6
7This is a list of Frequently Asked Questions (FAQ) regarding the Nagios 7This is a list of Frequently Asked Questions (FAQ) regarding the Monitoring
8Plugins. 8Plugins.
9 9
10## General 10## General
11 11
12* [Who controls the Nagios Plugins project?][control] 12* [Who controls the project?][control]
13* [What license is the code distributed under?][license] 13* [What license is the code distributed under?][license]
14* [Can I submit a patch?][contribute] 14* [Can I submit a patch?][contribute]
15* [Do you accept donations?][donations] 15* [Do you accept donations?][donations]
@@ -41,7 +41,7 @@ Plugins.
41* [How do I use and update Gnulib?][gnulib] 41* [How do I use and update Gnulib?][gnulib]
42* [How do I use the Nagios::Plugin module?][use-perl-module] 42* [How do I use the Nagios::Plugin module?][use-perl-module]
43* [How do I modify NagiosMIB?][nagiosmib] 43* [How do I modify NagiosMIB?][nagiosmib]
44* [Can I use Nagios Plugins in my project?][reuse] 44* [Can I reuse Monitoring Plugins code?][reuse]
45 45
46[control]: doc/faq/control.html 46[control]: doc/faq/control.html
47[license]: doc/faq/license.html 47[license]: doc/faq/license.html
diff --git a/web/input/doc/faq/installation.md b/web/input/doc/faq/installation.md
index 6f3694a..f13a9f9 100644
--- a/web/input/doc/faq/installation.md
+++ b/web/input/doc/faq/installation.md
@@ -1,4 +1,4 @@
1title: Installing Nagios Plugins 1title: Installing Monitoring Plugins
2parent: FAQ 2parent: FAQ
3--- 3---
4 4
diff --git a/web/input/doc/faq/libtap.md b/web/input/doc/faq/libtap.md
index c592030..4bd115f 100644
--- a/web/input/doc/faq/libtap.md
+++ b/web/input/doc/faq/libtap.md
@@ -15,10 +15,11 @@ thread implementation. To workaround, run:
15 $ make check 15 $ make check
16 $ make install 16 $ make install
17 17
18Now when you run the Nagios Plugins `./configure` script, it should find the 18Now when you run the Monitoring Plugins `./configure` script, it should find
19libtap library and compile the tests and run them when you run `make` `test`. 19the libtap library and compile the tests and run them when you run `make`
20`test`.
20 21
21*Update:* These days, the Nagios Plugins tarball includes a copy of libtap 22*Update:* These days, the Monitoring Plugins tarball includes a copy of libtap
22which is used if you run `./configure` `--enable-libtap`. 23which is used if you run `./configure` `--enable-libtap`.
23 24
24[libtap]: http://jc.ngo.org.uk/trac-bin/trac.cgi/wiki/LibTap "libtap" 25[libtap]: http://jc.ngo.org.uk/trac-bin/trac.cgi/wiki/LibTap "libtap"
diff --git a/web/input/doc/faq/license.md b/web/input/doc/faq/license.md
index d4a369c..0818b3e 100644
--- a/web/input/doc/faq/license.md
+++ b/web/input/doc/faq/license.md
@@ -4,14 +4,14 @@ parent: FAQ
4 4
5# What license is the code distributed under? 5# What license is the code distributed under?
6 6
7The Nagios Plugins code is currently distributed using the [GNU General Public 7The Monitoring Plugins code is currently distributed using the [GNU General
8License, Version 3][gpl] (GPLv3). 8Public License, Version 3][gpl] (GPLv3).
9 9
10This is because some C code that we depend upon, from the [Gnulib][gnulib] 10This is because some C code that we depend upon, from the [Gnulib][gnulib]
11project, is distributed under the GPLv3; and therefore, some of our plugins 11project, is distributed under the GPLv3; and therefore, some of our plugins
12also need to be GPLv3 licensed. The team has decided, rather than having a 12also need to be GPLv3 licensed. The team has decided, rather than having a
13mixed license, we'll distribute all of the core Nagios Plugins code under the 13mixed license, we'll distribute all of the core Monitoring Plugins code under
14GPLv3. 14the GPLv3.
15 15
16[gpl]: http://www.gnu.org/licenses/gpl.html "GPLv3" 16[gpl]: http://www.gnu.org/licenses/gpl.html "GPLv3"
17[gnulib]: http://www.gnu.org/software/gnulib/ "Gnulib" 17[gnulib]: http://www.gnu.org/software/gnulib/ "Gnulib"
diff --git a/web/input/doc/faq/packages.md b/web/input/doc/faq/packages.md
index 2329db9..d3c1643 100644
--- a/web/input/doc/faq/packages.md
+++ b/web/input/doc/faq/packages.md
@@ -9,8 +9,8 @@ Short answer: **Yes**!
9Slightly longer answer: 9Slightly longer answer:
10 10
11Most Linux distributions and BSD projects provide binary packages of the 11Most Linux distributions and BSD projects provide binary packages of the
12Nagios Plugins. These are usually well-integrated and much easier to deploy 12Monitoring Plugins. These are usually well-integrated and much easier to
13and maintain, so we strongly recommend using them whenever possible. 13deploy and maintain, so we strongly recommend using them whenever possible.
14 14
15Our source tarballs and the associated documentation are primarily intended 15Our source tarballs and the associated documentation are primarily intended
16for package maintainers, for those users who'd like to test them, and for the 16for package maintainers, for those users who'd like to test them, and for the
diff --git a/web/input/doc/faq/private-c-api.md b/web/input/doc/faq/private-c-api.md
index c814d8c..700fd20 100644
--- a/web/input/doc/faq/private-c-api.md
+++ b/web/input/doc/faq/private-c-api.md
@@ -4,8 +4,8 @@ parent: FAQ
4 4
5# Private C APIs 5# Private C APIs
6 6
7This page describes the Nagios Plugins routines that can be accessed from the 7This page describes the Monitoring Plugins routines that can be accessed from
8internal library. 8the internal library.
9 9
10This page is in development, so these are not guaranteed to be available. As 10This page is in development, so these are not guaranteed to be available. As
11the API matures and is available in libraries, this information will be 11the API matures and is available in libraries, this information will be
@@ -15,8 +15,8 @@ migrated to the [Development Guidelines][guidelines].
15 15
16### np\_init(char \*plugin\_name, int argc, char \*\*argv) 16### np\_init(char \*plugin\_name, int argc, char \*\*argv)
17 17
18Initialize the Nagios Plugins routines. Pass the plugin name and `argc` and 18Initialize the Monitoring Plugins routines. Pass the plugin name and `argc`
19`argv` from `main()`. 19and `argv` from `main()`.
20 20
21A variable `nagios_plugin` will be created for internal use. 21A variable `nagios_plugin` will be created for internal use.
22 22
diff --git a/web/input/doc/faq/reuse.md b/web/input/doc/faq/reuse.md
index 6c8e7b0..f7fe8a6 100644
--- a/web/input/doc/faq/reuse.md
+++ b/web/input/doc/faq/reuse.md
@@ -2,21 +2,21 @@ title: Code reuse
2parent: FAQ 2parent: FAQ
3--- 3---
4 4
5# Can I use Nagios Plugins in my project? 5# Can I reuse Monitoring Plugins code?
6 6
7Firstly, there is a distinction between a Nagios plugin and plugins from the 7Firstly, there is a distinction between a Nagios plugin and plugins from the
8Nagios Plugins project. 8Monitoring Plugins project.
9 9
10Although Nagios (the system) is licensed under the GPL, plugins are executed 10Although Nagios (the system) is licensed under the GPL, plugins are executed
11in their own environment, so they [do not fall][aggregation] under the "viral" 11in their own environment, so they [do not fall][aggregation] under the "viral"
12aspect of the GPL. Therefore, any plugin written for use by Nagios can be 12aspect of the GPL. Therefore, any plugin written for use by Nagios can be
13under any license the copyright holder selects. 13under any license the copyright holder selects.
14 14
15However, the plugins contained within the Nagios Plugins project are 15However, the plugins contained within the Monitoring Plugins project are
16distributed under the [GPL][gpl]. If you distribute an application that 16distributed under the [GPL][gpl]. If you distribute an application that
17includes the Nagios Plugins (modified or not), you are required to distribute 17includes the Monitoring Plugins (modified or not), you are required to
18a copy of the source code for the plugins under the terms of the GPL, 18distribute a copy of the source code for the plugins under the terms of the
19regardless of the licensing for the rest of the application. 19GPL, regardless of the licensing for the rest of the application.
20 20
21If you write a plugin which is a derivative work from code of the Nagios 21If you write a plugin which is a derivative work from code of the Nagios
22Plugins project, then your plugin must also be licensed under the GPL, 22Plugins project, then your plugin must also be licensed under the GPL,
diff --git a/web/input/doc/faq/use-perl-module.md b/web/input/doc/faq/use-perl-module.md
index 64ba18a..d624e5f 100644
--- a/web/input/doc/faq/use-perl-module.md
+++ b/web/input/doc/faq/use-perl-module.md
@@ -6,11 +6,11 @@ parent: FAQ
6 6
7The Nagios::Plugin Perl module can be obtained from two main locations: 7The Nagios::Plugin Perl module can be obtained from two main locations:
8 8
9* from the Nagios Plugins tarball with an 9* from the Monitoring Plugins tarball with an
10 [extra configure option][configure-module] 10 [extra configure option][configure-module]
11* from [CPAN][cpan-module] 11* from [CPAN][cpan-module]
12 12
13If you install from the Nagios Plugins tarball, the Perl module will be 13If you install from the Monitoring Plugins tarball, the Perl module will be
14installed in `$prefix/perl`. 14installed in `$prefix/perl`.
15 15
16If you install from CPAN, the Perl module will be installed into your Perl's 16If you install from CPAN, the Perl module will be installed into your Perl's
diff --git a/web/input/doc/index.md b/web/input/doc/index.md
index a7a5bb2..907b2f8 100644
--- a/web/input/doc/index.md
+++ b/web/input/doc/index.md
@@ -7,14 +7,14 @@ menu: 4
7 7
8## Basics 8## Basics
9 9
10The main Nagios Plugins documentation is split into two parts: 10The main Monitoring Plugins documentation is split into two parts:
11 11
121. **[Manual Pages][man]** 121. **[Manual Pages][man]**
13 This part provides documentation for each individual plugin. 13 This part provides documentation for each individual plugin.
14 14
152. **[FAQ][faq]** 152. **[FAQ][faq]**
16 The FAQ section offers additional information on the Nagios Plugins 16 The FAQ section offers information on the Monitoring Plugins package as a
17 package as a whole. 17 whole.
18 18
19## Advanced Topics 19## Advanced Topics
20 20
diff --git a/web/input/doc/writing-perl-plugins.md b/web/input/doc/writing-perl-plugins.md
index 1bee67a..e89d973 100644
--- a/web/input/doc/writing-perl-plugins.md
+++ b/web/input/doc/writing-perl-plugins.md
@@ -4,8 +4,8 @@ parent: Documentation
4 4
5# Writing Perl Plugins 5# Writing Perl Plugins
6 6
7Former Nagios Plugins team lead Ton Voon gave a 15-minutes lightning talk 7Former [team][team] lead Ton Voon gave a 15-minutes lightning talk about
8about the Nagios Plugins at [FOSDEM][fosdem]. He made a screencast of [the 8writing plugins in Perl at [FOSDEM][fosdem]. He made a screencast of [the
9presentation][talk] in Quicktime format (35&nbsp;MB): 9presentation][talk] in Quicktime format (35&nbsp;MB):
10 10
11* [fosdem.mov][screencast] 11* [fosdem.mov][screencast]
@@ -18,6 +18,7 @@ for download, with additional comments:
18Both files are also available via FTP mirrors, see our [download 18Both files are also available via FTP mirrors, see our [download
19page][download]. 19page][download].
20 20
21[team]: team.html "Monitoring Plugins Development Team"
21[fosdem]: https://fosdem.org/ "FOSDEM" 22[fosdem]: https://fosdem.org/ "FOSDEM"
22[talk]: https://archive.fosdem.org/2007/schedule/events/lt_nagios_plugins.html "Ton's Talk" 23[talk]: https://archive.fosdem.org/2007/schedule/events/lt_nagios_plugins.html "Ton's Talk"
23[screencast]: https://www.nagios-plugins.org/download/presentation/fosdem.mov "Screencast" 24[screencast]: https://www.nagios-plugins.org/download/presentation/fosdem.mov "Screencast"
diff --git a/web/input/download.md b/web/input/download.md
index 11ea7fb..6f09107 100644
--- a/web/input/download.md
+++ b/web/input/download.md
@@ -5,13 +5,13 @@ menu: 3
5 5
6# Download 6# Download
7 7
8## Nagios Plugins 8## Monitoring Plugins
9 9
10### Stable Release 10### Stable Release
11 11
12The current stable Nagios Plugins release is <!--{plugins_release}-->, see the 12The current stable Monitoring Plugins release is <!--{plugins_release}-->, see
13[release announcement][announcement]. You can grab the source tarball from 13the [release announcement][announcement]. You can grab the source tarball
14here: 14from here:
15 15
16* [nagios-plugins-<!--{plugins_release}-->.tar.gz][tar1] ([sum][sum1]) 16* [nagios-plugins-<!--{plugins_release}-->.tar.gz][tar1] ([sum][sum1])
17 17
@@ -29,7 +29,7 @@ The current development shapshot is available here:
29 29
30* [nagios-plugins-master.tar.gz][tar2] ([sum][sum2]) 30* [nagios-plugins-master.tar.gz][tar2] ([sum][sum2])
31 31
32It is rebuilt from the `master` branch of the [Nagios Plugins 32It is rebuilt from the `master` branch of the [Monitoring Plugins
33repository][repository] whenever that branch changes. Snapshots built from 33repository][repository] whenever that branch changes. Snapshots built from
34other development branches are also available in the [snapshot 34other development branches are also available in the [snapshot
35directory][snapshot] of the [download area][download]. 35directory][snapshot] of the [download area][download].
@@ -62,7 +62,7 @@ Old versions can be found [within][mib] the [download area][download].
62[mirror-ch]: ftp://mirror.switch.ch/mirror/nagios-plugins/ "FTP Mirror in Switzerland" 62[mirror-ch]: ftp://mirror.switch.ch/mirror/nagios-plugins/ "FTP Mirror in Switzerland"
63[mirror-uk]: ftp://mirror.bytemark.co.uk/nagios-plugins/ "FTP Mirror in the United Kingdom" 63[mirror-uk]: ftp://mirror.bytemark.co.uk/nagios-plugins/ "FTP Mirror in the United Kingdom"
64[mirror-us]: ftp://mirror.jmu.edu/pub/nagios-plugins/ "FTP Mirror in the United States" 64[mirror-us]: ftp://mirror.jmu.edu/pub/nagios-plugins/ "FTP Mirror in the United States"
65[repository]: https://github.com/nagios-plugins/nagios-plugins "Nagios Plugins Git Repository" 65[repository]: https://github.com/monitoring-plugins/monitoring-plugins "Nagios Plugins Git Repository"
66[news]: doc/news.txt "NEWS" 66[news]: doc/news.txt "NEWS"
67[download]: download/ "Download Area" 67[download]: download/ "Download Area"
68[snapshot]: download/snapshot/ "Snapshot Directory" 68[snapshot]: download/snapshot/ "Snapshot Directory"
diff --git a/web/input/index.md b/web/input/index.md
index fcdf68e..fc8a0ce 100644
--- a/web/input/index.md
+++ b/web/input/index.md
@@ -2,16 +2,14 @@ title: Home
2menu: 1 2menu: 1
3--- 3---
4 4
5# The Nagios Plugins Project 5# The Monitoring Plugins Project
6 6
7We, the [Nagios Plugins Development Team][team], maintain a bundle of more 7We, the [Monitoring Plugins Development Team][team], maintain a bundle of more
8than fifty standard plugins for [Nagios][nagios], [Icinga][icinga], 8than fifty standard plugins for [Nagios][nagios], [Icinga][icinga],
9[Shinken][shinken], [Naemon][naemon], and other monitoring applications that 9[Shinken][shinken], [Naemon][naemon], and other monitoring applications. Each
10use the straightforward plugin interface [originally invented][history] by the 10plugin is a stand-alone command line tool that provides a specific type of
11[Nagios folks][folks]. Each plugin is a stand-alone command line tool that 11check. Typically, your monitoring software runs these plugins to determine
12provides a specific type of check. Typically, your monitoring software runs 12the current status of hosts and services on your network.
13these plugins to determine the current status of hosts and services on your
14network.
15 13
16Some of the provided plugins let you check local system metrics (such as [load 14Some of the provided plugins let you check local system metrics (such as [load
17averages][load], [processes][procs], or [disk space usage][disk]), others use 15averages][load], [processes][procs], or [disk space usage][disk]), others use
@@ -26,15 +24,19 @@ that makes it [easy][perl-plugins] to write your own plugin. We also take
26care of an SNMP MIB used for traps sent from Nagios. Last but not least, we 24care of an SNMP MIB used for traps sent from Nagios. Last but not least, we
27host the [Nagios Plugin Development Guidelines][guidelines]. 25host the [Nagios Plugin Development Guidelines][guidelines].
28 26
27Our bundle was previously known as the “official” Nagios Plugins package. The
28[new name][rename] reflects both the success of the plugin interface
29[originally invented][history] by the [Nagios folks][folks], and the
30popularity of our package, as the plugins are now used with various other
31monitoring products as well.
32
29You can get the latest releases from the [download page][download]. 33You can get the latest releases from the [download page][download].
30 34
31[team]: team.html "Nagios Plugins Development Team" 35[team]: team.html "Monitoring Plugins Development Team"
32[nagios]: http://www.nagios.org/ "Nagios" 36[nagios]: http://www.nagios.org/ "Nagios"
33[icinga]: https://www.icinga.org/ "Icinga" 37[icinga]: https://www.icinga.org/ "Icinga"
34[shinken]: http://www.shinken-monitoring.org/ "Shinken" 38[shinken]: http://www.shinken-monitoring.org/ "Shinken"
35[naemon]: http://naemon.github.io/ "Naemon" 39[naemon]: http://naemon.github.io/ "Naemon"
36[history]: http://www.nagios.org/about/history "Nagios (Plugins) History"
37[folks]: http://www.nagios.org/about/team "Nagios Team"
38[load]: doc/man/check_load.html "check_load" 40[load]: doc/man/check_load.html "check_load"
39[procs]: doc/man/check_procs.html "check_procs" 41[procs]: doc/man/check_procs.html "check_procs"
40[disk]: doc/man/check_disk.html "check_disk" 42[disk]: doc/man/check_disk.html "check_disk"
@@ -46,6 +48,9 @@ You can get the latest releases from the [download page][download].
46[module]: http://search.cpan.org/dist/Nagios-Plugin/ "Nagios::Plugin Module" 48[module]: http://search.cpan.org/dist/Nagios-Plugin/ "Nagios::Plugin Module"
47[guidelines]: doc/guidelines.html "Nagios Plugin Development Guidelines" 49[guidelines]: doc/guidelines.html "Nagios Plugin Development Guidelines"
48[perl-plugins]: doc/writing-perl-plugins.html "Nagios::Plugin Presentation" 50[perl-plugins]: doc/writing-perl-plugins.html "Nagios::Plugin Presentation"
51[rename]: news/new-project-name.html "New Project Name"
52[history]: http://www.nagios.org/about/history "Nagios (Plugins) History"
53[folks]: http://www.nagios.org/about/team "Nagios Team"
49[download]: download.html "Download" 54[download]: download.html "Download"
50 55
51<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %--> 56<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/input/news/new-project-name.md b/web/input/news/new-project-name.md
new file mode 100644
index 0000000..9a4e5a1
--- /dev/null
+++ b/web/input/news/new-project-name.md
@@ -0,0 +1,36 @@
1title: New Project Name: Monitoring Plugins
2author: Holger Weiß
3date: 2014-01-15
4---
5
6In the past, the domain `nagios-plugins.org` pointed to a server independently
7maintained by us, the Nagios Plugins Development Team. Today, the DNS records
8were modified to point to web space controlled by Nagios Enterprises instead.
9This change was done without prior notice.
10
11This means the project can no longer use the name "Nagios Plugins". We, the
12Nagios Plugins Development Team, therefore renamed the Nagios Plugins to
13*Monitoring Plugins*.
14<end-of-teaser>
15
16We're not too happy having to make this move. Renaming the project will lead
17to some confusion, and to quite a bit of work for others and for ourselves.
18We would've preferred to save everyone this trouble.
19
20However, we *do* like how the new name indicates that our plugins are also
21used with various other monitoring applications these days. While the Nagios
22folks created the original implementation of the core plugins bundle, an
23independent team has taken over development more than a decade ago, and the
24product is intended to be useful for *all* users, including, but not limited
25to, the customers of Nagios Enterprises.
26
27It'll probably take us a few days to sort out various issues caused by the new
28project name, but we're confident that we can resume our development work
29towards the next stable releases very soon.
30
31We'd like to take the chance to thank you, our community, for your countless
32contributions, which made the plugins what they are today. You guys are
33awesome. We're looking forward to the next chapter of Monitoring Plugins
34development, and we hope you are, too!
35
36<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/input/news/release-1-5.md b/web/input/news/release-1-5.md
index 6eef24e..8972f79 100644
--- a/web/input/news/release-1-5.md
+++ b/web/input/news/release-1-5.md
@@ -85,7 +85,7 @@ You can get the tarball from our [download page][download].
85 Nagios Plugins Development Team. 85 Nagios Plugins Development Team.
86 86
87[download]: /download.html 87[download]: /download.html
88[contrib]: https://github.com/nagios-plugins/nagios-plugins/tree/7a80e27fb38b26713ac5a1f6810b99519a31dbf3/contrib 88[contrib]: https://github.com/monitoring-plugins/monitoring-plugins/tree/7a80e27fb38b26713ac5a1f6810b99519a31dbf3/contrib
89[nag-exchange]: http://exchange.nagios.org/ 89[nag-exchange]: http://exchange.nagios.org/
90[mon-exchange]: https://www.monitoringexchange.org/ 90[mon-exchange]: https://www.monitoringexchange.org/
91 91
diff --git a/web/input/resources/plugins.css b/web/input/resources/plugins.css
index b5df882..9b1e76e 100644
--- a/web/input/resources/plugins.css
+++ b/web/input/resources/plugins.css
@@ -1,5 +1,5 @@
1/* 1/*
2 * Nagios Plugins style sheet. 2 * Monitoring Plugins style sheet.
3 * 3 *
4 * Color scheme: 4 * Color scheme:
5 * 5 *
diff --git a/web/input/support.md b/web/input/support.md
index 5016cef..db04223 100644
--- a/web/input/support.md
+++ b/web/input/support.md
@@ -15,18 +15,18 @@ might be relevant!
15 15
16## Mailing Lists 16## Mailing Lists
17 17
18There are four mailing lists for the Nagios Plugins: 18There are four mailing lists for the Monitoring Plugins:
19 19
20* General discussion and support: **<help@nagios-plugins.org>** 20* General discussion and support: **<help@monitoring-plugins.org>**
21 [Subscribe][help-sub] | [Archive][help-arch] | [Gmane][help-gmane] 21 [Subscribe][help-sub] | [Archive][help-arch] | [Gmane][help-gmane]
22 22
23* Development-related issues: **<devel@nagios-plugins.org>** 23* Development-related issues: **<devel@monitoring-plugins.org>**
24 [Subscribe][devel-sub] | [Archive][devel-arch] | [Gmane][devel-gmane] 24 [Subscribe][devel-sub] | [Archive][devel-arch] | [Gmane][devel-gmane]
25 25
26* Git commits (read-only): **<commits@nagios-plugins.org>** 26* Git commits (read-only): **<commits@monitoring-plugins.org>**
27 [Subscribe][commits-sub] | [Archive][commits-arch] | [Gmane][commits-gmane] 27 [Subscribe][commits-sub] | [Archive][commits-arch] | [Gmane][commits-gmane]
28 28
29* Announcements (read-only): **<announce@nagios-plugins.org>** 29* Announcements (read-only): **<announce@monitoring-plugins.org>**
30 [Subscribe][announce-sub] | [Archive][announce-arch] | [Gmane][announce-gmane] 30 [Subscribe][announce-sub] | [Archive][announce-arch] | [Gmane][announce-gmane]
31 31
32Be aware that these mailing lists are read by volunteers, so responses may 32Be aware that these mailing lists are read by volunteers, so responses may
@@ -39,23 +39,23 @@ Plugin issues are usually discussed in the [#Nagios][nagios-irc] channel on
39[#Nagios-Devel][nagios-devel-irc]. 39[#Nagios-Devel][nagios-devel-irc].
40 40
41[snapshot]: download/snapshot/nagios-plugins-master.tar.gz "Current Snapshot Tarball" 41[snapshot]: download/snapshot/nagios-plugins-master.tar.gz "Current Snapshot Tarball"
42[search]: https://github.com/nagios-plugins/nagios-plugins/search?type=Issues "Issue Tracker Search" 42[search]: https://github.com/monitoring-plugins/monitoring-plugins/search?type=Issues "Issue Tracker Search"
43[tracker]: https://github.com/nagios-plugins/nagios-plugins/issues "Issue Tracker" 43[tracker]: https://github.com/monitoring-plugins/monitoring-plugins/issues "Issue Tracker"
44[new]: https://github.com/nagios-plugins/nagios-plugins/issues/new "New Issue" 44[new]: https://github.com/monitoring-plugins/monitoring-plugins/issues/new "New Issue"
45[freenode]: http://freenode.net/ "Freenode Network" 45[freenode]: http://freenode.net/ "Freenode Network"
46[nagios-irc]: http://webchat.freenode.net/?channels=nagios 46[nagios-irc]: http://webchat.freenode.net/?channels=nagios
47[nagios-devel-irc]: http://webchat.freenode.net/?channels=nagios-devel 47[nagios-devel-irc]: http://webchat.freenode.net/?channels=nagios-devel
48[help-sub]: https://www.nagios-plugins.org/list/listinfo/help/ 48[help-sub]: https://www.monitoring-plugins.org/list/listinfo/help/
49[help-arch]: https://www.nagios-plugins.org/archive/help/ 49[help-arch]: https://www.monitoring-plugins.org/archive/help/
50[help-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins 50[help-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins
51[devel-sub]: https://www.nagios-plugins.org/list/listinfo/devel/ 51[devel-sub]: https://www.monitoring-plugins.org/list/listinfo/devel/
52[devel-arch]: https://www.nagios-plugins.org/archive/devel/ 52[devel-arch]: https://www.monitoring-plugins.org/archive/devel/
53[devel-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.devel 53[devel-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.devel
54[commits-sub]: https://www.nagios-plugins.org/list/listinfo/commits/ 54[commits-sub]: https://www.monitoring-plugins.org/list/listinfo/commits/
55[commits-arch]: https://www.nagios-plugins.org/archive/commits/ 55[commits-arch]: https://www.monitoring-plugins.org/archive/commits/
56[commits-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.cvs 56[commits-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.cvs
57[announce-sub]: https://www.nagios-plugins.org/list/listinfo/announce/ 57[announce-sub]: https://www.monitoring-plugins.org/list/listinfo/announce/
58[announce-arch]: https://www.nagios-plugins.org/archive/announce/ 58[announce-arch]: https://www.monitoring-plugins.org/archive/announce/
59[announce-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.announce 59[announce-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.announce
60 60
61<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %--> 61<!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/input/team.md b/web/input/team.md
index f9b0a5d..db4336e 100644
--- a/web/input/team.md
+++ b/web/input/team.md
@@ -2,9 +2,9 @@ title: Team
2parent: Home 2parent: Home
3--- 3---
4 4
5# Nagios Plugins Development Team 5# Monitoring Plugins Development Team
6 6
7The Nagios Plugins are maintained by the following group of developers: 7The Monitoring Plugins are maintained by the following group of developers:
8 8
9* Holger Weiß *(Patch Review, Development, Team Lead)* 9* Holger Weiß *(Patch Review, Development, Team Lead)*
10* Jan Wagner *(Patch Review, Development)* 10* Jan Wagner *(Patch Review, Development)*
diff --git a/web/macros.py b/web/macros.py
index c950a04..5381ce9 100644
--- a/web/macros.py
+++ b/web/macros.py
@@ -5,7 +5,7 @@ import time
5plugins_release = '1.5' 5plugins_release = '1.5'
6mib_release = '1.0.1' 6mib_release = '1.0.1'
7release_notes = 'news/release-%s.html' % plugins_release.replace('.', '-') 7release_notes = 'news/release-%s.html' % plugins_release.replace('.', '-')
8site_url = 'https://www.nagios-plugins.org/' 8site_url = 'https://www.monitoring-plugins.org/'
9feeds = """These project news articles are also available as an 9feeds = """These project news articles are also available as an
10[RSS feed][rss]{: rel="alternate" type="application/rss+xml" }. Additional 10[RSS feed][rss]{: rel="alternate" type="application/rss+xml" }. Additional
11stuff is posted to [Twitter][twitter], so you might want to [follow us][follow] 11stuff is posted to [Twitter][twitter], so you might want to [follow us][follow]
@@ -32,7 +32,7 @@ _RSS = """<?xml version="1.0" encoding="UTF-8"?>
32 <link>%s</link> 32 <link>%s</link>
33 <description>%s</description> 33 <description>%s</description>
34 <language>en-us</language> 34 <language>en-us</language>
35 <webMaster>webmaster@nagios-plugins.org</webMaster> 35 <webMaster>webmaster@monitoring-plugins.org</webMaster>
36 <pubDate>%s</pubDate> 36 <pubDate>%s</pubDate>
37 <lastBuildDate>%s</lastBuildDate> 37 <lastBuildDate>%s</lastBuildDate>
38 <generator>Poole</generator> 38 <generator>Poole</generator>
@@ -63,9 +63,9 @@ def hook_postconvert_rss():
63 date = email.utils.formatdate(date) 63 date = email.utils.formatdate(date)
64 items.append(_RSS_ITEM % (p.title, link, desc, link, date)) 64 items.append(_RSS_ITEM % (p.title, link, desc, link, date))
65 items = ''.join(items) 65 items = ''.join(items)
66 title = 'Nagios Plugins' 66 title = 'Monitoring Plugins'
67 link = '%s/news/' % site_url.rstrip('/') 67 link = '%s/news/' % site_url.rstrip('/')
68 desc = 'Announcements published by the Nagios Plugins Development Team.' 68 desc = 'Announcements published by the Monitoring Plugins Development Team.'
69 date = email.utils.formatdate() 69 date = email.utils.formatdate()
70 rss = _RSS % (title, link, desc, date, date, items) 70 rss = _RSS % (title, link, desc, date, date, items)
71 fp = open(os.path.join(output, 'rss.xml'), 'w') 71 fp = open(os.path.join(output, 'rss.xml'), 'w')
diff --git a/web/page.html b/web/page.html
index e9f92d6..989dd4c 100644
--- a/web/page.html
+++ b/web/page.html
@@ -5,11 +5,11 @@
5<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 5<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
6 6
7 <head> 7 <head>
8 <title>Nagios Plugins - {{ hx(page.title) }}</title> 8 <title>Monitoring Plugins - {{ hx(page.title) }}</title>
9 <meta http-equiv="Content-Type" content="text/html; charset={{ __encoding__ }}" /> 9 <meta http-equiv="Content-Type" content="text/html; charset={{ __encoding__ }}" />
10 <meta name="description" content="{{ hx(page.description) }}" /> 10 <meta name="description" content="{{ hx(page.description) }}" />
11 <meta name="keywords" content="{{ hx(page.keywords) }}" /> 11 <meta name="keywords" content="{{ hx(page.keywords) }}" />
12 <link href="rss.xml" rel="alternate" type="application/rss+xml" title="Nagios Plugins News" /> 12 <link href="rss.xml" rel="alternate" type="application/rss+xml" title="Monitoring Plugins News" />
13 <link href="resources/plugins.css" rel="stylesheet" type="text/css" /> 13 <link href="resources/plugins.css" rel="stylesheet" type="text/css" />
14 <link href="resources/favicon.ico" rel="shortcut icon" type="image/x-icon" /> 14 <link href="resources/favicon.ico" rel="shortcut icon" type="image/x-icon" />
15 </head> 15 </head>
@@ -17,7 +17,7 @@
17 <body> 17 <body>
18 <div id="github-ribbon"> 18 <div id="github-ribbon">
19 <a 19 <a
20 href="https://github.com/nagios-plugins" 20 href="https://github.com/monitoring-plugins"
21 title="GitHub Repositories"><img 21 title="GitHub Repositories"><img
22 src="resources/github.png" 22 src="resources/github.png"
23 alt="GitHub" 23 alt="GitHub"
@@ -45,10 +45,8 @@
45 <div id="breadcrumb">{{ breadcrumb() }}</div> 45 <div id="breadcrumb">{{ breadcrumb() }}</div>
46 <div id="content">{{ __content__ }}</div> 46 <div id="content">{{ __content__ }}</div>
47 <div id="footer">Copyright &copy; {{ copyright_years(since=2008) }} 47 <div id="footer">Copyright &copy; {{ copyright_years(since=2008) }}
48 <a href="team.html">Nagios Plugins Development Team</a> | 48 <a href="team.html">Monitoring Plugins Development Team</a> |
49 <a href="impressum.html">Impressum</a><br /> 49 <a href="impressum.html">Impressum</a>
50 Nagios is a registered trademark of
51 <a href="http://www.nagios.com/about/company">Nagios Enterprises, LLC</a>.
52 </div> 50 </div>
53 </div> 51 </div>
54 </body> 52 </body>