<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[152597] trunk/dports/net/nagios/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/152597">152597</a></dd>
<dt>Author</dt> <dd>mps@macports.org</dd>
<dt>Date</dt> <dd>2016-09-12 14:28:08 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>nagios: add mode line and do white space clean-up.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetnagiosPortfile">trunk/dports/net/nagios/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetnagiosPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nagios/Portfile (152596 => 152597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nagios/Portfile 2016-09-12 21:22:42 UTC (rev 152596)
+++ trunk/dports/net/nagios/Portfile 2016-09-12 21:28:08 UTC (rev 152597)
</span><span class="lines">@@ -1,61 +1,62 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
</ins><span class="cx"> # $Id$
</span><span class="cx">
</span><del>-PortSystem 1.0
</del><ins>+PortSystem 1.0
</ins><span class="cx">
</span><del>-name nagios
-version 3.5.0
-revision 3
-categories net
-license GPL-2
-maintainers nomaintainer
-platforms darwin
</del><ins>+name nagios
+version 3.5.0
+revision 3
+categories net
+license GPL-2
+maintainers nomaintainer
+platforms darwin
</ins><span class="cx">
</span><del>-description Nagios is a host and service monitoring program
</del><ins>+description Nagios is a host and service monitoring program
</ins><span class="cx">
</span><del>-long_description A network service and host monitor that can notify you \
- when servers go down by monitoring for external services \
- such as HTTP, FTP, SMTP, SNMP, as well as internal host \
- checks for things such as CPU and disk usage and many \
- other things.
</del><ins>+long_description A network service and host monitor that can notify you \
+ when servers go down by monitoring for external services \
+ such as HTTP, FTP, SMTP, SNMP, as well as internal host \
+ checks for things such as CPU and disk usage and many \
+ other things.
</ins><span class="cx">
</span><del>-homepage http://nagios.org
</del><ins>+homepage http://nagios.org
</ins><span class="cx">
</span><del>-livecheck.regex nagios-(\[0-9.\]+)${extract.suffix}
</del><ins>+livecheck.regex nagios-(\[0-9.\]+)${extract.suffix}
</ins><span class="cx">
</span><del>-master_sites sourceforge:project/nagios/nagios-3.x/nagios-${version}
-checksums rmd160 d75a764486fd3dc0462fb49924698754852d39be \
- sha256 469381b2954392689c85d3db733e8da4bd43b806b3d661d1a7fbd52dacc084db
</del><ins>+master_sites sourceforge:project/nagios/nagios-3.x/nagios-${version}
+checksums rmd160 d75a764486fd3dc0462fb49924698754852d39be \
+ sha256 469381b2954392689c85d3db733e8da4bd43b806b3d661d1a7fbd52dacc084db
</ins><span class="cx">
</span><del>-worksrcdir ${name}
</del><ins>+worksrcdir ${name}
</ins><span class="cx">
</span><del>-depends_build port:gd2
-depends_lib path:lib/libssl.dylib:openssl \
- port:nagios-plugins
</del><ins>+depends_build port:gd2
+depends_lib path:lib/libssl.dylib:openssl \
+ port:nagios-plugins
</ins><span class="cx">
</span><del>-set sysconfdir ${prefix}/etc/${name}
-destroot.destdir prefix=${prefix} DESTDIR=${destroot}
</del><ins>+set sysconfdir ${prefix}/etc/${name}
+destroot.destdir prefix=${prefix} DESTDIR=${destroot}
</ins><span class="cx">
</span><del>-destroot.target install install-config install-commandmode install-init
</del><ins>+destroot.target install install-config install-commandmode install-init
</ins><span class="cx">
</span><del>-configure.args --with-cgiurl=/nagios/cgi-bin \
- --with-htmurl=/nagios \
- --with-nagios-user=nagios \
- --with-nagios-grp=nagios \
- --with-command-grp=nagios \
- --with-gd-lib=${prefix}/lib \
- --with-gd-inc=${prefix}/include \
- --sbindir=${prefix}/sbin/nagios \
- --libexecdir=${prefix}/libexec/nagios \
- --datadir=${prefix}/share/nagios \
- --with-lockfile=${prefix}/var/nagios/nagios.lock \
- --with-init-dir=${prefix}/var/nagios \
- --sysconfdir=${sysconfdir} \
- --localstatedir=${prefix}/var/nagios \
- --with-httpd-conf=/etc/apache2/httpd.conf
</del><ins>+configure.args --with-cgiurl=/nagios/cgi-bin \
+ --with-htmurl=/nagios \
+ --with-nagios-user=nagios \
+ --with-nagios-grp=nagios \
+ --with-command-grp=nagios \
+ --with-gd-lib=${prefix}/lib \
+ --with-gd-inc=${prefix}/include \
+ --sbindir=${prefix}/sbin/nagios \
+ --libexecdir=${prefix}/libexec/nagios \
+ --datadir=${prefix}/share/nagios \
+ --with-lockfile=${prefix}/var/nagios/nagios.lock \
+ --with-init-dir=${prefix}/var/nagios \
+ --sysconfdir=${sysconfdir} \
+ --localstatedir=${prefix}/var/nagios \
+ --with-httpd-conf=/etc/apache2/httpd.conf
</ins><span class="cx">
</span><span class="cx"> platform darwin 8 {
</span><del>- configure.args-delete --with-httpd-conf=/etc/apache2/httpd.conf
- configure.args-append --with-httpd-conf=/etc/httpd/httpd.conf
</del><ins>+ configure.args-delete --with-httpd-conf=/etc/apache2/httpd.conf
+ configure.args-append --with-httpd-conf=/etc/httpd/httpd.conf
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> startupitem.create yes
</span><span class="lines">@@ -66,13 +67,13 @@
</span><span class="cx"> reinplace "s|INIT_OPTS=-o root -g root|INIT_OPTS=-o nagios -g nagios|g" \
</span><span class="cx"> "${worksrcpath}/Makefile.in"
</span><span class="cx">
</span><del>- reinplace "s|daemon-init \$(DESTDIR)\$(INIT_DIR)/nagios|daemon-init \$(DESTDIR)\$(INIT_DIR)/nagios.init|g" \
- "${worksrcpath}/Makefile.in"
</del><ins>+ reinplace "s|daemon-init \$(DESTDIR)\$(INIT_DIR)/nagios|daemon-init \$(DESTDIR)\$(INIT_DIR)/nagios.init|g" \
+ "${worksrcpath}/Makefile.in"
</ins><span class="cx">
</span><del>- reinplace "s|NagiosLockDir=/var/lock/subsys|NagiosLockDir=${prefix}/var/nagios|g" \
- ${worksrcpath}/daemon-init.in
- reinplace "s|su -|su -m|g" \
- ${worksrcpath}/daemon-init.in
</del><ins>+ reinplace "s|NagiosLockDir=/var/lock/subsys|NagiosLockDir=${prefix}/var/nagios|g" \
+ ${worksrcpath}/daemon-init.in
+ reinplace "s|su -|su -m|g" \
+ ${worksrcpath}/daemon-init.in
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> add_users nagios group=nagios
</span><span class="lines">@@ -82,12 +83,12 @@
</span><span class="cx"> destroot.keepdirs ${destroot}${prefix}/var/nagios/rw
</span><span class="cx">
</span><span class="cx"> # Nagios sample files no longer install with -sample suffixes, so do this manually for safety
</span><del>- foreach cfgfile [glob ${destroot}${sysconfdir}/*.cfg] {
- file rename ${cfgfile} ${cfgfile}-sample
- }
- foreach cfgfile [glob ${destroot}${sysconfdir}/objects/*.cfg] {
- file rename ${cfgfile} ${cfgfile}-sample
- }
</del><ins>+ foreach cfgfile [glob ${destroot}${sysconfdir}/*.cfg] {
+ file rename ${cfgfile} ${cfgfile}-sample
+ }
+ foreach cfgfile [glob ${destroot}${sysconfdir}/objects/*.cfg] {
+ file rename ${cfgfile} ${cfgfile}-sample
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -100,7 +101,7 @@
</span><span class="cx"> ************************************************************
</span><span class="cx">
</span><span class="cx"> IMPORTANT: A user and group called 'nagios' has been created and you must run\
</span><del>- nagios as that user.
</del><ins>+ nagios as that user.
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -109,7 +110,7 @@
</span><span class="cx"> Insert the \"Nagios stuff\" text block somewhere *above* your Apache cgi-bin\
</span><span class="cx"> ScriptAlias statement:
</span><span class="cx">
</span><del>- ScriptAlias /cgi-bin/ \"/Library/WebServer/CGI-Executables/\"
</del><ins>+ ScriptAlias /cgi-bin/ \"/Library/WebServer/CGI-Executables/\"
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # Nagios stuff
</span><span class="lines">@@ -173,7 +174,7 @@
</span><span class="cx"> 4) Create a 'nagiosadmin' Apache user/password to correspond with the Nagios Apache\
</span><span class="cx"> user created above
</span><span class="cx">
</span><del>- htpasswd -c ${prefix}/etc/nagios/htpasswd.users nagiosadmin
</del><ins>+ htpasswd -c ${prefix}/etc/nagios/htpasswd.users nagiosadmin
</ins><span class="cx">
</span><span class="cx"> Create other users as desired, omit '-c' since it creates the password file. Make\
</span><span class="cx"> additional users login names match Nagios contact names to restrict web viewing to your\
</span><span class="lines">@@ -183,10 +184,10 @@
</span><span class="cx"> 5) Set Nagios to start at system boot, and start Nagios
</span><span class="cx">
</span><span class="cx"> Run launchctl so Nagios will start at system boot
</span><del>- sudo launchctl load -w /Library/LaunchDaemons/org.macports.nagios.plist
</del><ins>+ sudo launchctl load -w /Library/LaunchDaemons/org.macports.nagios.plist
</ins><span class="cx">
</span><span class="cx"> You may now start Nagios manually with this command (or a reboot):
</span><del>- sudo ${prefix}/var/nagios/nagios.init start
</del><ins>+ sudo ${prefix}/var/nagios/nagios.init start
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> 6) You may now login as 'nagiosadmin' to the Nagios web interface at http://localhost/nagios
</span><span class="lines">@@ -197,10 +198,10 @@
</span><span class="cx">
</span><span class="cx"> File Locations:
</span><span class="cx">
</span><del>- Configuration files: ${prefix}/etc/nagios
- Nagios plugins: ${prefix}/libexec/nagios
- Lock file: ${prefix}/var/nagios/nagios.lock
- Init file: ${prefix}/var/nagios/nagios.init
- HTML URL: http://localhost/nagios/
- CGI URL: http://localhost/nagios/cgi-bin/
</del><ins>+ Configuration files: ${prefix}/etc/nagios
+ Nagios plugins: ${prefix}/libexec/nagios
+ Lock file: ${prefix}/var/nagios/nagios.lock
+ Init file: ${prefix}/var/nagios/nagios.init
+ HTML URL: http://localhost/nagios/
+ CGI URL: http://localhost/nagios/cgi-bin/
</ins><span class="cx"> "
</span></span></pre>
</div>
</div>
</body>
</html>