<!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>[152440] trunk/dports/net</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/152440">152440</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2016-09-08 21:28:04 -0700 (Thu, 08 Sep 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>zabbix3: New port.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetzabbix3Portfile">trunk/dports/net/zabbix3/Portfile</a></li>
<li><a href="#trunkdportsnetzabbix3fileszabbix_serverinitmysql">trunk/dports/net/zabbix3/files/zabbix_server.init.mysql</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/net/zabbix3/</li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetzabbix3Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/zabbix3/Portfile (145673 => 152440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/zabbix2/Portfile        2016-02-12 20:11:33 UTC (rev 145673)
+++ trunk/dports/net/zabbix3/Portfile        2016-09-09 04:28:04 UTC (rev 152440)
</span><span class="lines">@@ -3,8 +3,8 @@
</span><span class="cx"> 
</span><span class="cx"> PortSystem          1.0
</span><span class="cx"> 
</span><del>-name                zabbix2
-version             2.4.7
</del><ins>+name                zabbix3
+version             3.0.4
</ins><span class="cx"> revision            0
</span><span class="cx"> categories          net
</span><span class="cx"> maintainers         eborisch openmaintainer
</span><span class="lines">@@ -22,68 +22,93 @@
</span><span class="cx"> 
</span><span class="cx"> distname            zabbix-${version}
</span><span class="cx"> livecheck.name      zabbix
</span><del>-livecheck.regex     &quot;Stable\/(\[0-9.\]+)\/&quot;
</del><ins>+livecheck.regex     &quot;Stable\/(3\[0-9.\]+)\/&quot;
</ins><span class="cx"> livecheck.url \
</span><span class="cx">     http://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/
</span><span class="cx"> homepage            http://www.zabbix.com/
</span><span class="cx"> master_sites \
</span><span class="cx">     sourceforge:project/zabbix/ZABBIX%20Latest%20Stable/${version} \
</span><span class="cx">     sourceforge:project/zabbix/ZABBIX%20Release%20Candidates/${version}
</span><del>-dist_subdir         zabbix2
</del><ins>+dist_subdir         zabbix3
</ins><span class="cx"> 
</span><ins>+conflicts           zabbix zabbix2
+
</ins><span class="cx"> checksums \
</span><del>-    rmd160  f935c44faf0ae98a04d2deb895fbf1ca825204f1 \
-    sha256  d2c47b8f5b9b91f18010d54c45de55845d979014a8b3fe4bef64e0b08f8b00da
</del><ins>+    rmd160  447be2d01e4f409ec3b4f318dfb34ca48eaea521 \
+    sha256  9fa47d97843b6ca9f550d706b40ee6b35b76c5165ff32ff11ef0474f161e7700
</ins><span class="cx"> 
</span><ins>+patchfiles          log_and_pid_locations.patch
+
</ins><span class="cx"> universal_variant   no
</span><span class="cx"> 
</span><del>-conflicts           zabbix
</del><ins>+subport             zabbix3-agent {}
</ins><span class="cx"> 
</span><del>-subport             zabbix2-agent {}
-
</del><span class="cx"> configure.args      --bindir=${prefix}/bin/zabbix \
</span><span class="cx">                     --sbindir=${prefix}/sbin/zabbix \
</span><span class="cx">                     --libexecdir=${prefix}/libexec/zabbix \
</span><span class="cx">                     --datadir=${prefix}/share/zabbix \
</span><span class="cx">                     --sysconfdir=${prefix}/etc/zabbix \
</span><del>-                    --localstatedir=${prefix}/var/zabbix
</del><ins>+                    --localstatedir=${prefix}/var/zabbix \
+                    --with-gnutls=/opt/local \
+                    --enable-ipv6
</ins><span class="cx"> 
</span><span class="cx"> configure.ldflags-append    -lresolv
</span><span class="cx"> 
</span><span class="cx"> startupitem.create      yes
</span><ins>+depends_lib-append      port:libiconv \
+                        port:gnutls
</ins><span class="cx"> 
</span><span class="cx"> if { ${name} ne ${subport} } {
</span><del>-    startupitem.name        zabbix2-agentd
</del><ins>+    conflicts               zabbix2-agent
+    startupitem.name        zabbix3-agentd
</ins><span class="cx">     startupitem.executable  \
</span><span class="cx">         ${prefix}/sbin/zabbix/zabbix_agentd \
</span><del>-        -c ${prefix}/etc/zabbix/zabbix_agentd.conf
-    startupitem.pidfile     clean /tmp/zabbix_agentd.pid
</del><ins>+        -c ${prefix}/etc/zabbix3/zabbix_agentd.conf
+    startupitem.pidfile     auto ${prefix}/var/run/zabbix/zabbix_agentd.pid
+    startupitem.logfile     ${prefix}/var/log/zabbix/zabbix_agentd.launch
</ins><span class="cx"> 
</span><span class="cx">     configure.args-append   --enable-agent
</span><span class="cx"> } else {
</span><del>-    depends_lib-append      port:apache2 \
-                            port:curl \
-                            port:fping \
</del><ins>+    depends_lib-append      port:curl \
</ins><span class="cx">                             port:libssh2 \
</span><span class="cx">                             port:net-snmp \
</span><span class="cx">                             port:OpenIPMI \
</span><del>-                            port:php53 \
-                            port:php53-apache2handler \
-                            port:php53-gd \
-                            port:php53-gettext \
-                            port:php53-mbstring \
-                            port:php53-sockets
</del><ins>+                            port:libxml2
</ins><span class="cx"> 
</span><ins>+    depends_run-append      port:fping \
+                            port:apache2
+
</ins><span class="cx">     configure.args-append   --enable-server \
</span><span class="cx">                             --with-libcurl=${prefix}/bin/curl-config \
</span><span class="cx">                             --with-net-snmp \
</span><span class="cx">                             --with-openipmi=${prefix} \
</span><del>-                            --with-ssh2=${prefix}
</del><ins>+                            --with-ssh2=${prefix} \
+                            --with-libxml2=${prefix}/bin/xml2-config
</ins><span class="cx"> 
</span><del>-    startupitem.name        zabbix2-server
-    startupitem.start       &quot;${prefix}/share/zabbix/zabbix_server.init start&quot;
-    startupitem.stop        &quot;${prefix}/share/zabbix/zabbix_server.init stop&quot;
</del><ins>+    startupitem.name        zabbix3-server
+    startupitem.executable  \
+        ${prefix}/sbin/zabbix/zabbix_server \
+        -c ${prefix}/etc/zabbix3/zabbix_server.conf
+    startupitem.pidfile     auto ${prefix}/var/run/zabbix/zabbix_server.pid
+    startupitem.logfile     ${prefix}/var/log/zabbix/zabbix_agentd.launch
</ins><span class="cx"> 
</span><ins>+    foreach php {php56 php70} {
+        eval [subst {
+            variant ${php} description &quot;Use ${php}&quot; {
+                depends_run-append      port:${php} \
+                                        port:${php}-apache2handler \
+                                        port:${php}-gd \
+                                        port:${php}-gettext \
+                                        port:${php}-mbstring \
+                                        port:${php}-sockets
+            }
+        }]
+    }
+
+    if {![variant_isset php56] &amp;&amp; ![variant_isset php70]} {
+        default_variants        +php56
+    }
+
</ins><span class="cx">     variant full_server description {
</span><span class="cx">         Adds dependencies a complete server are installed.
</span><span class="cx">     } {
</span><span class="lines">@@ -93,24 +118,16 @@
</span><span class="cx">     array set DBLIST {
</span><span class="cx">         mysql5  {&quot;MySQL 5.x&quot;            mysql5 \
</span><span class="cx">                  mysql=${prefix}/lib/mysql5/bin/mysql_config mysql}
</span><del>-        mysql51 {&quot;MySQL 5.1&quot;            mysql51 \
-                 mysql=${prefix}/lib/mysql51/bin/mysql_config mysql}
-        mysql55 {&quot;MySQL 5.5&quot;            mysql55 \
-                 mysql=${prefix}/lib/mysql55/bin/mysql_config mysql}
</del><span class="cx">         mysql56 {&quot;MySQL 5.6&quot;            mysql56 \
</span><span class="cx">                  mysql=${prefix}/lib/mysql56/bin/mysql_config mysql}
</span><span class="cx">         mariadb {&quot;MariaDB&quot;              mariadb \
</span><span class="cx">                  mysql=${prefix}/lib/mariadb/bin/mysql_config mysql}
</span><span class="cx">         percona {&quot;Percona&quot;              percona \
</span><span class="cx">                  mysql=${prefix}/lib/percona/bin/mysql_config mysql}
</span><del>-        pgsql81 {&quot;PostgreSQL 8.1.x&quot;     postgresql81 \
-                 pgsql=${prefix}/lib/postgresql81/bin/pg_config postgresql}
-        pgsql82 {&quot;PostgreSQL 8.2.x&quot;     postgresql82 \
-                 pgsql=${prefix}/lib/postgresql82/bin/pg_config postgresql}
-        pgsql83 {&quot;PostgreSQL 8.3.x&quot;     postgresql83 \
-                 pgsql=${prefix}/lib/postgresql83/bin/pg_config postgresql}
</del><span class="cx">         pgsql84 {&quot;PostgreSQL 8.4.x&quot;     postgresql84 \
</span><del>-                 pgsql=${prefix}/lib/postgresql84/bin/pg_config postgresql}
</del><ins>+                 postgresql=${prefix}/lib/postgresql84/bin/pg_config postgresql}
+        pgsql95 {&quot;PostgreSQL 9.5.x&quot;     postgresql95 \
+                 postgresql=${prefix}/lib/postgresql95/bin/pg_config postgresql}
</ins><span class="cx">         sqlite3 {&quot;SQLite 3.x&quot;           sqlite3 \
</span><span class="cx">                  sqlite3=${prefix} sqlite}
</span><span class="cx">     }
</span><span class="lines">@@ -131,12 +148,21 @@
</span><span class="cx"> 
</span><span class="cx">         append variant_line { &quot;
</span><span class="cx">             set ::ZDB               [lindex ${prms} 1]
</span><ins>+            set ::DBFILES           [lindex ${prms} 3]
</ins><span class="cx">             set ::MYSQL_MODE        [string equal [lindex ${prms} 3] mysql]
</span><span class="cx">             depends_lib-append      port:[lindex ${prms} 1]
</span><span class="cx">             configure.args-append   --with-[lindex ${prms} 2]
</span><del>-            depends_run-append \
-                port:php53-[lindex ${prms} 3]
</del><span class="cx"> 
</span><ins>+            if {[variant_isset php56]} {
+                depends_run-append \
+                    port:php56-[lindex ${prms} 3]
+            }
+
+            if {[variant_isset php70]} {
+                depends_run-append \
+                    port:php70-[lindex ${prms} 3]
+            }
+
</ins><span class="cx">             if {[string compare ${dbitem} sqlite3] &amp;&amp; \
</span><span class="cx">                  [variant_isset full_server]} {
</span><span class="cx">                 depends_run-append \
</span><span class="lines">@@ -147,28 +173,16 @@
</span><span class="cx">         eval $variant_line
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if {![variant_isset mysql51] &amp;&amp;
-        ![variant_isset mysql55] &amp;&amp;
</del><ins>+    if {![variant_isset mysql5] &amp;&amp;
</ins><span class="cx">         ![variant_isset mysql56] &amp;&amp;
</span><span class="cx">         ![variant_isset mariadb] &amp;&amp;
</span><span class="cx">         ![variant_isset percona] &amp;&amp;
</span><del>-        ![variant_isset pgsql81] &amp;&amp;
-        ![variant_isset pgsql82] &amp;&amp;
-        ![variant_isset pgsql83] &amp;&amp;
</del><span class="cx">         ![variant_isset pgsql84] &amp;&amp;
</span><ins>+        ![variant_isset pgsql95] &amp;&amp;
</ins><span class="cx">         ![variant_isset sqlite3]} {
</span><span class="cx">         default_variants            +mysql5
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-# Notify anyone with +agent_only installed of new zabbix2-agent port
-    variant agent_only description {Old variant -- install zabbix2-agent} {
-        pre-fetch {
-            ui_error \
-                &quot;Variant 'zabbix2 +agent_only' replaced by port zabbix2-agent&quot;
-            return -code error &quot;+agent_only variant replaced by zabbix2-agent&quot;
-        }
-    }
-
</del><span class="cx">     variant date_slash description {
</span><span class="cx">         Draw month/day rather than day.month on line graphs.
</span><span class="cx">     } {}
</span><span class="lines">@@ -193,41 +207,44 @@
</span><span class="cx">     reinplace ${repstr} ${worksrcpath}/conf/zabbix_server.conf
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+post-patch {
+    reinplace &quot;s|%%PREFIX%%|${prefix}|&quot; \
+        conf/zabbix_agentd.conf conf/zabbix_server.conf
+    reinplace &quot;s|/usr/local/etc|${prefix}/etc/zabbix3|&quot; \
+        conf/zabbix_agentd.conf conf/zabbix_server.conf
+}
+
</ins><span class="cx"> add_users zabbix group=zabbix
</span><span class="cx"> 
</span><span class="cx"> post-destroot {
</span><span class="cx">     if { ${name} ne ${subport} } {
</span><span class="cx">      ####### AGENT #######
</span><span class="cx"> # Copy sample agent .conf files
</span><del>-        xinstall -d -m 755 -d ${destroot}${prefix}/etc/zabbix
-        xinstall -m 755  ${worksrcpath}/conf/zabbix_agent.conf \
-            ${destroot}${prefix}/etc/zabbix/zabbix_agent.conf.sample
</del><ins>+        move ${destroot}${prefix}/etc/zabbix ${destroot}${prefix}/etc/zabbix3
</ins><span class="cx">         xinstall -m 755  ${worksrcpath}/conf/zabbix_agentd.conf \
</span><del>-            ${destroot}${prefix}/etc/zabbix/zabbix_agentd.conf.sample
</del><ins>+            ${destroot}${prefix}/etc/zabbix3/zabbix_agentd.conf.sample
</ins><span class="cx"> 
</span><span class="cx"> # Don't overwrite user settings on each install
</span><del>-        delete ${destroot}${prefix}/etc/zabbix/zabbix_agentd.conf
-        delete ${destroot}${prefix}/etc/zabbix/zabbix_agent.conf
</del><ins>+        delete ${destroot}${prefix}/etc/zabbix3/zabbix_agentd.conf
</ins><span class="cx">     } else {
</span><span class="cx">      ####### SERVER #######
</span><span class="cx"> # Copy sample server and agent .conf files
</span><del>-        xinstall -d -m 755 -d ${destroot}${prefix}/etc/zabbix
</del><ins>+        move ${destroot}${prefix}/etc/zabbix ${destroot}${prefix}/etc/zabbix3
+        xinstall -m 755 -d \
+            ${destroot}${prefix}/share/zabbix3/zabbix_server.conf.d
+
</ins><span class="cx">         xinstall -m 755 ${worksrcpath}/conf/zabbix_server.conf \
</span><del>-            ${destroot}${prefix}/etc/zabbix/zabbix_server.conf.sample
</del><ins>+            ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf.sample
</ins><span class="cx"> 
</span><span class="cx"> # Don't overwrite user settings on each install
</span><del>-        delete ${destroot}${prefix}/etc/zabbix/zabbix_server.conf
</del><ins>+        delete ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf
</ins><span class="cx"> 
</span><span class="cx"> # Copy database data and schemas
</span><del>-        xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix/data
-        xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix/schema
</del><ins>+        xinstall -m 755 -d ${destroot}${prefix}/share/zabbix/scripts
</ins><span class="cx"> 
</span><del>-        eval xinstall -m 755 ${worksrcpath}/database/mysql/data.sql \
-            ${destroot}${prefix}/share/zabbix/data
-        eval xinstall -m 755 ${worksrcpath}/database/mysql/images.sql \
-            ${destroot}${prefix}/share/zabbix/data
-        eval xinstall -m 755 ${worksrcpath}/database/mysql/schema.sql \
-            ${destroot}${prefix}/share/zabbix/schema
</del><ins>+        eval xinstall -m 755 -W ${worksrcpath}/database/${DBFILES} \
+            data.sql images.sql schema.sql \
+            ${destroot}${prefix}/share/zabbix/scripts
</ins><span class="cx"> 
</span><span class="cx">         file copy ${worksrcpath}/upgrades \
</span><span class="cx">             ${destroot}${prefix}/share/zabbix/
</span><span class="lines">@@ -237,28 +254,8 @@
</span><span class="cx">         file copy ${worksrcpath}/frontends/php/ \
</span><span class="cx">             ${destroot}${prefix}/share/zabbix/frontends/
</span><span class="cx"> 
</span><del>-# Create a startup script for the server
-# This script has a delay built into it (waiting for DB to start) so we
-# don't use a simple startupitem.executable approach
-        if { ${MYSQL_MODE} == 1 } {
-            xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init.mysql \
-                ${destroot}${prefix}/share/zabbix/zabbix_server.init
-            reinplace &quot;s|__VER__|${ZDB}|g&quot; \
-                ${destroot}${prefix}/share/zabbix/zabbix_server.init
-            if {[variant_isset full_server]} {
-                reinplace &quot;s/^#%#//&quot; \
-                    ${destroot}${prefix}/share/zabbix/zabbix_server.init
-            }
-        } else {
-            xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init \
-                ${destroot}${prefix}/share/zabbix
-        }
-        reinplace &quot;s|__PREFIX__|${prefix}|g&quot; \
-            ${destroot}${prefix}/share/zabbix/zabbix_server.init
-
</del><span class="cx"> # Set permissions for etc (protect passwords) and the frontend
</span><del>-        system &quot;chmod 660 ${destroot}${prefix}/etc/zabbix/*&quot;
-        system &quot;chown zabbix:zabbix ${destroot}${prefix}/etc/zabbix/*&quot;
</del><ins>+        system &quot;chmod 660 ${destroot}${prefix}/etc/zabbix3/*&quot;
</ins><span class="cx">         system &quot;chown -R www:www ${destroot}${prefix}/share/zabbix/frontends/*&quot;
</span><span class="cx"> 
</span><span class="cx">         xinstall -d -m 755 -d \
</span><span class="lines">@@ -266,14 +263,22 @@
</span><span class="cx">         xinstall -m 755 ${worksrcpath}/bin/win32/zabbix_agentd.exe \
</span><span class="cx">             ${destroot}${prefix}/share/zabbix/zabbix_agent_win32
</span><span class="cx">     }
</span><ins>+
+    foreach dname {run log} {
+        xinstall -d -m 755 ${destroot}${prefix}/var/${dname}/zabbix
+        system &quot;chown -R zabbix:zabbix ${destroot}${prefix}/var/${dname}/zabbix&quot;
+        touch ${destroot}${prefix}/var/${dname}/zabbix/.dropping.${subport}
+    }
+
+    system &quot;chown -R zabbix:zabbix ${destroot}${prefix}/etc/zabbix3&quot;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> if { ${name} ne ${subport} } {
</span><span class="cx">     notes &quot;
</span><span class="cx"> ####                                        ####
</span><del>-#### ZABBIX2 agent installation section     ####
</del><ins>+#### ZABBIX3 agent installation section     ####
</ins><span class="cx"> 
</span><del>-1) Edit the sample .conf file ${prefix}/etc/zabbix/zabbix_agentd.conf.sample
</del><ins>+1) Edit the sample .conf file ${prefix}/etc/zabbix3/zabbix_agentd.conf.sample
</ins><span class="cx">    (rename &amp; omit .sample)
</span><span class="cx"> 
</span><span class="cx">    Set the following variable to the ip address of your ZABBIX server to\
</span><span class="lines">@@ -284,18 +289,18 @@
</span><span class="cx"> 
</span><span class="cx"> 2) Set zabbix_agentd to run at system boot
</span><span class="cx"> 
</span><del>-     sudo port load zabbix2-agent
</del><ins>+     sudo port load zabbix3-agent
</ins><span class="cx"> 
</span><span class="cx"> 3) A Win32 agent is in ${prefix}/share/zabbix/zabbix_agent_win32 for\
</span><span class="cx">    installation on Windows NT 4.0, Windows 2000, and Windows XP.
</span><span class="cx"> 
</span><del>-#### End ZABBIX2 agent installation section ####
</del><ins>+#### End ZABBIX3 agent installation section ####
</ins><span class="cx"> ####                                        ####
</span><span class="cx"> &quot;
</span><span class="cx"> } else {
</span><span class="cx">     notes &quot;
</span><span class="cx"> ####                                                 ####
</span><del>-#### Begin ZABBIX2 local server installation section ####
</del><ins>+#### Begin ZABBIX3 local server installation section ####
</ins><span class="cx"> 
</span><span class="cx">  (Installing with +full_server will add all of the dependants; configuration
</span><span class="cx">   will still be required.)
</span><span class="lines">@@ -305,31 +310,17 @@
</span><span class="cx">     sudo port install mysql5-server
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-2) Setup the ZABBIX MySQL database
</del><ins>+2) Setup the ZABBIX database
</ins><span class="cx"> 
</span><del>- For other databases, follow documentation from 
- https://www.zabbix.com/documentation/2.4/manual/appendix/install/db_scripts
</del><ins>+    Follow the directions at :
</ins><span class="cx"> 
</span><del>--Create the ZABBIX database
-    mysql5 -u root -p (enter password at prompt)
-    mysql&gt; create database zabbix character set utf8;
-    mysql&gt; quit;
</del><ins>+  https://www.zabbix.com/documentation/3.0/manual/appendix/install/db_scripts
</ins><span class="cx"> 
</span><del>--Import the ZABBIX Schema
-    cd ${prefix}/share/zabbix/schema
-    cat mysql.sql | mysql5 -u root -p zabbix
-    cd ${prefix}/share/zabbix/data
-    cat images.sql | mysql5 -u root -p zabbix
-    cat data.sql | mysql5 -u root -p zabbix
</del><ins>+    The *.sql files it refers to are in ${prefix}/share/zabbix/scripts/
+    ** NOTE THAT THESE ARE FOR YOUR SELECTED DATABASE VARIANT!!! **
</ins><span class="cx"> 
</span><del>--Create a MySQL 'zabbix' user and password
-    mysql5 -u root -p
-    mysql&gt; grant all privileges on zabbix.* to zabbix@localhost identified by '&lt;zabbix-mysql-password&gt;';
-    mysql&gt; grant all privileges on zabbix.* to zabbix identified by '&lt;zabbix-mysql-password&gt;';
-    mysql&gt; quit;
</del><span class="cx"> 
</span><del>-
-3) Edit the sample .conf file ${prefix}/etc/zabbix/zabbix_server.conf
</del><ins>+3) Edit the sample .conf file ${prefix}/etc/zabbix3/zabbix_server.conf
</ins><span class="cx">    (rename &amp; omit .sample)
</span><span class="cx"> 
</span><span class="cx">    Modify these variables at the very least:
</span><span class="lines">@@ -347,13 +338,10 @@
</span><span class="cx">     sudo ln -s ${prefix}/share/zabbix/frontends/php &lt;Apache-docroot&gt;/zabbix
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-5) Set zabbix_server to run at system boot, then start it
</del><ins>+5) Set zabbix_server to run at system boot, then start it:
</ins><span class="cx"> 
</span><del>-    sudo port load zabbix2
</del><ins>+    sudo port load zabbix3
</ins><span class="cx"> 
</span><del>-   To start Zabbix manually, use: 
-    ${prefix}/share/zabbix/zabbix_server.init start (stop|status)
-
</del><span class="cx">  !! Note: Your shared memory will likely need to be increased  !!
</span><span class="cx">  !!       (see http://support.apple.com/kb/HT4022)             !!
</span><span class="cx"> 
</span><span class="lines">@@ -363,32 +351,46 @@
</span><span class="cx">    the ReadMe.txt for instructions.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-7) Open http://localhost/zabbix/ in your browser and walk through the setup,
</del><ins>+7) Enable your desired php version in httpd.conf and make sure the following
+   are set in the associated php.ini:
+   
+    max_execution_time = 300
+    max_input_time = 300
+    post_max_size = 16M
+    date.timezone = &lt; Your TZ; see http://php.net/manual/en/timezones.php &gt;
+
+   And for php56:
+    always_populate_raw_post_data = -1
+
+
+8) Open http://localhost/zabbix/ in your browser and walk through the setup,
</ins><span class="cx">    then login with default user 'Admin' and password 'zabbix'.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-8) Read the fine manual at http://www.zabbix.com/documentation/
</del><ins>+9) Read the fine manual at http://www.zabbix.com/documentation/
</ins><span class="cx"> 
</span><span class="cx"> 
</span><del>-#### End ZABBIX2 local server installation section   ####
</del><ins>+#### End ZABBIX3 local server installation section   ####
</ins><span class="cx"> ####                                                 ####
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</span><del>-!! ZABBIX -&gt; ZABBIX2 Server Upgrade process !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</del><ins>+!! ZABBIX2 -&gt; ZABBIX3 Server Upgrade process !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</ins><span class="cx"> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</span><span class="cx"> !!  0) BACK UP YOUR DATABASE                                              !!
</span><span class="cx"> !!                                                                        !!
</span><del>-!!  1) Be sure to use 'sudo port unload zabbix' to stop the background    !!
-!!     server before deactivating zabbix, and then use                    !!
-!!     'sudo port load zabbix2' **AFTER UPGRADING THE DATABASE** as       !!
-!!     described below.                                                   !!
</del><ins>+!!  1) Be sure to use 'sudo port unload zabbix2' to stop the background   !!
+!!     server before deactivating zabbix2.                                !!
</ins><span class="cx"> !!                                                                        !!
</span><del>-!!  2) For upgrading from 1.8 (zabbix -&gt; zabbix2), upgrade scripts are    !!
-!!     located in ${prefix}/share/zabbix/upgrades                        !!
</del><ins>+!!  2) Create ${prefix}/etc/zabbix3/zabbix_server.conf                   !!
+!!        zabbix_server.conf.sample is available for reference.           !!
+!!        There are new features to consider.                             !!
+!!        ** NOTE conf dir is etc/zabbix3 **                              !!
</ins><span class="cx"> !!                                                                        !!
</span><ins>+!!  3) 'sudo port load zabbix3' after installing.                         !!
+!!                                                                        !!
</ins><span class="cx"> !!  For upgrade procedure, please see                                     !!
</span><del>-!!    http://www.zabbix.com/documentation/2.0/manual/installation/upgrade !!
</del><ins>+!!    http://www.zabbix.com/documentation/3.0/manual/installation/upgrade !!
</ins><span class="cx"> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</span><span class="cx"> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</span><span class="cx"> &quot;
</span></span></pre></div>
<a id="trunkdportsnetzabbix3fileszabbix_serverinitmysql"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/zabbix3/files/zabbix_server.init.mysql (145673 => 152440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/zabbix2/files/zabbix_server.init.mysql        2016-02-12 20:11:33 UTC (rev 145673)
+++ trunk/dports/net/zabbix3/files/zabbix_server.init.mysql        2016-09-09 04:28:04 UTC (rev 152440)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">     stop)
</span><span class="cx">         echo &quot;Shutting down zabbix_server&quot;
</span><span class="cx">         pid=`ps -U zabbix | grep 'zabbix_server[^:]' | awk '{print $1}'`
</span><del>-        bin/kill $pid
</del><ins>+        /bin/kill $pid
</ins><span class="cx">         MAX_WAIT=10
</span><span class="cx">         while [ `netstat -an | grep -q '\.10051. *LISTEN' &amp;&amp; echo 1 || echo 0` \
</span><span class="cx">                 == &quot;1&quot; ]; do
</span></span></pre>
</div>
</div>

</body>
</html>