Attachment 150309 Details for Bug 195015 – [patch] 0.6.24 against upstream git repo

[patch] [patch] 0.6.24 against upstream git repo

pnp-0.6.24.diff (text/plain), 19.60 KB, created by Olli Hauer on 2014-12-07 17:27:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2014-12-07 17:27:22 UTC

Size: 19.60 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 374216)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pnp
>-PORTVERSION=	0.6.21
>+PORTVERSION=	0.6.24
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=pnp4nagios/PNP-0.6
>@@ -41,7 +41,6 @@
> PNP_SPOOL=	${PNP_STATE}/perfspool
> PNP_URL?=	${NAGIOSHTMURL}/pnp
> FPDF_DIR?=	share/fpdf
>-SPOOL_DIRS=	${PNP_STATE}:${NAGIOSUSER}:${NAGIOSGROUP}:0750%${PNP_RRDS}:${NAGIOSUSER}:${NAGIOSGROUP}:0750%${PNP_SPOOL}:${NAGIOSUSER}:${NAGIOSGROUP}:0750
> 
> .if ! ${PORT_OPTIONS:MPDF}
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-disable-pdf
>@@ -64,12 +63,14 @@
> MAKE_ARGS=	INSTALL_OPTS=
> INSTALL_TARGET=	install install-config
> 
>-PLIST_SUB+=	NAGIOSDIR=${NAGIOSDIR}
>-SUB_FILES=	pkg-install \
>-		pkg-deinstall \
>-		pkg-message
>-SUB_LIST=	SPOOL_DIRS=${SPOOL_DIRS} \
>-		PNP_RRDS=${PNP_RRDS} \
>+PLIST_SUB+=	NAGIOSDIR=${NAGIOSDIR} \
>+		NAGIOSUSER=${NAGIOSUSER} \
>+		NAGIOSGROUP=${NAGIOSGROUP} \
>+		WWWOWN=${WWWOWN} \
>+		WWWGRP=${WWWGRP}
>+
>+SUB_FILES=	pkg-message
>+SUB_LIST=	PNP_RRDS=${PNP_RRDS} \
> 		PNP_URL=${PNP_URL} \
> 		NAGIOSUSER=${NAGIOSUSER} \
> 		NAGIOSGROUP=${NAGIOSGROUP}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 374216)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (pnp4nagios-0.6.21.tar.gz) = bb5d36a7cc49dcbcfcb424d437dc3739baa647816cffc610fb621216c4f5992a
>-SIZE (pnp4nagios-0.6.21.tar.gz) = 2917588
>+SHA256 (pnp4nagios-0.6.24.tar.gz) = 87412ef01257c6096aa5c84fdb47db950b851c596e1306180be8ba45401793cf
>+SIZE (pnp4nagios-0.6.24.tar.gz) = 2919182
>Index: files/patch-sample-config__Makefile.in
>===================================================================
>--- files/patch-sample-config__Makefile.in	(revision 374216)
>+++ files/patch-sample-config__Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- ./sample-config/Makefile.in.orig	2013-03-24 17:25:56.000000000 +0100
>-+++ ./sample-config/Makefile.in	2014-05-02 09:00:07.000000000 +0200
>-@@ -40,35 +40,18 @@
>+--- sample-config/Makefile.in.orig	2014-07-30 10:32:23 UTC
>++++ sample-config/Makefile.in
>+@@ -40,35 +40,18 @@ install:
>  	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
>  	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
>  	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR)
>Index: files/patch-share_pnp_application_controllers_graph.php
>===================================================================
>--- files/patch-share_pnp_application_controllers_graph.php	(revision 0)
>+++ files/patch-share_pnp_application_controllers_graph.php	(working copy)
>@@ -0,0 +1,11 @@
>+--- share/pnp/application/controllers/graph.php.orig	2014-12-07 16:03:24 UTC
>++++ share/pnp/application/controllers/graph.php
>+@@ -48,7 +48,7 @@ class Graph_Controller extends System_Co
>+         if($this->host != "" && $this->service != ""){
>+             $this->service = pnp::clean($this->service);
>+             $this->host    = pnp::clean($this->host);
>+-            $this->url     = "?host=".$this->host."&srv=".$this->service;
>++            $this->url     = "?host=".urlencode($this->host)."&srv=".urlencode($this->service);
>+             $services      = $this->data->getServices($this->host);
>+             #Landingpage for mobile devices
>+             if($this->isMobileDevice()){
>
>Property changes on: files/patch-share_pnp_application_controllers_graph.php
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-share_pnp_application_controllers_system.php
>===================================================================
>--- files/patch-share_pnp_application_controllers_system.php	(revision 0)
>+++ files/patch-share_pnp_application_controllers_system.php	(working copy)
>@@ -0,0 +1,19 @@
>+--- share/pnp/application/controllers/system.php.orig	2014-12-07 16:04:45 UTC
>++++ share/pnp/application/controllers/system.php
>+@@ -23,13 +23,13 @@ class System_Controller extends Template
>+         // Check for mod_rewrite
>+         $this->check_mod_rewrite();
>+ 
>+-        $this->start             = pnp::clean($this->input->get('start',FALSE));
>+-        $this->end               = pnp::clean($this->input->get('end',FALSE));
>++        $this->start             = $this->input->get('start',FALSE);
>++        $this->end               = $this->input->get('end',FALSE);
>+         $this->theme             = pnp::clean($this->input->get('theme',FALSE));
>+         $this->view              = pnp::clean($this->input->get('view', ""));
>+         $this->host              = pnp::clean($this->input->get('host',NULL));
>+         $this->service           = pnp::clean($this->input->get('srv',NULL));
>+-        $this->source            = pnp::clean($this->input->get('source',0));
>++        $this->source            = pnp::clean($this->input->get('source',NULL));
>+         $this->version           = pnp::clean($this->input->get('version',NULL));
>+         $this->tpl               = pnp::clean($this->input->get('tpl'));
>+         $this->controller        = Router::$controller;
>
>Property changes on: files/patch-share_pnp_application_controllers_system.php
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-share_pnp_application_controllers_zoom.php
>===================================================================
>--- files/patch-share_pnp_application_controllers_zoom.php	(revision 0)
>+++ files/patch-share_pnp_application_controllers_zoom.php	(working copy)
>@@ -0,0 +1,11 @@
>+--- share/pnp/application/controllers/zoom.php.orig	2014-12-07 16:06:09 UTC
>++++ share/pnp/application/controllers/zoom.php
>+@@ -70,7 +70,7 @@ class Zoom_Controller extends System_Con
>+             $this->template->source  = $this->source;
>+             $this->template->end     = $this->end;
>+             $this->template->start   = $this->start;
>+-            $this->url               = "?host=".$this->host."&srv=".$this->service;
>++            $this->url               = "?host=".urlencode($this->host)."&srv=".urlencode($this->service);
>+             $this->template->graph_height = $this->graph_height;
>+             $this->template->graph_width  = $this->graph_width;
>+         }else{
>
>Property changes on: files/patch-share_pnp_application_controllers_zoom.php
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-share_pnp_application_helpers_pnp.php
>===================================================================
>--- files/patch-share_pnp_application_helpers_pnp.php	(revision 0)
>+++ files/patch-share_pnp_application_helpers_pnp.php	(working copy)
>@@ -0,0 +1,11 @@
>+--- share/pnp/application/helpers/pnp.php.orig	2014-12-07 16:06:39 UTC
>++++ share/pnp/application/helpers/pnp.php
>+@@ -44,6 +44,8 @@ class pnp_Core {
>+     *
>+     */
>+     public static function zoom_icon($host,$service,$start,$end,$source,$view,$graph_width,$graph_height){
>++        $service = urlencode(urlencode($service));
>++        $host = urlencode(urlencode($host));
>+         print "<a href=\"javascript:Gzoom('".url::base(TRUE)."zoom?host=$host&srv=$service&view=$view&source=$source&end=$end&start=$start&graph_width=$graph_width&graph_height=$graph_height');\" title=\"Zoom into the Graph\"><img src=\"".url::base()."media/images/zoom.png\"></a>\n";
>+     }
>+ 
>
>Property changes on: files/patch-share_pnp_application_helpers_pnp.php
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-share_pnp_application_models_data.php
>===================================================================
>--- files/patch-share_pnp_application_models_data.php	(revision 0)
>+++ files/patch-share_pnp_application_models_data.php	(working copy)
>@@ -0,0 +1,11 @@
>+--- share/pnp/application/models/data.php.orig	2014-12-07 16:07:13 UTC
>++++ share/pnp/application/models/data.php
>+@@ -661,7 +661,7 @@ class Data_Model extends System_Model
>+             if(!is_numeric($end)){
>+                 $timestamp = strtotime($end);
>+                 if(!$timestamp){
>+-                    throw new Kohana_User_Exception('Wrong Format', "$end");
>++                    throw new Kohana_User_Exception('Wrong Format', "End -> $end");
>+                 }else{
>+                     $end = $timestamp;
>+                 }
>
>Property changes on: files/patch-share_pnp_application_models_data.php
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-share_pnp_application_views_zoom.php
>===================================================================
>--- files/patch-share_pnp_application_views_zoom.php	(revision 0)
>+++ files/patch-share_pnp_application_views_zoom.php	(working copy)
>@@ -0,0 +1,10 @@
>+--- share/pnp/application/views/zoom.php.orig	2014-12-07 16:07:48 UTC
>++++ share/pnp/application/views/zoom.php
>+@@ -57,6 +57,7 @@ jQuery.noConflict();
>+ <div style="position:relative;">
>+ <?php 
>+ echo "<div start=$start end=$end style=\"width:".$graph_width."px; height:".$graph_height."px; position:absolute; top:33px\" class=\"graph\" id=\"".$this->url."\" ></div>";
>++$srv = urlencode($srv);
>+ if(!empty($tpl)){
>+     echo "<img class=\"graph\" src=\"image?source=$source"
>+ 	."&tpl=$tpl"
>
>Property changes on: files/patch-share_pnp_application_views_zoom.php
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-share_pnp_templates.dist_check__mssql__health.php
>===================================================================
>--- files/patch-share_pnp_templates.dist_check__mssql__health.php	(revision 0)
>+++ files/patch-share_pnp_templates.dist_check__mssql__health.php	(working copy)
>@@ -0,0 +1,11 @@
>+--- share/pnp/templates.dist/check_mssql_health.php.orig	2014-12-07 16:08:37 UTC
>++++ share/pnp/templates.dist/check_mssql_health.php
>+@@ -72,7 +72,7 @@ foreach ($this->DS as $KEY=>$VAL) {
>+         $def[$defcnt] .= rrd::area("ag","#$green");
>+         $def[$defcnt] .= rrd::area("ay","#$yellow");
>+         $def[$defcnt] .= rrd::area("ar","#$red");
>+-        $def[$defcnt] .= rrd::line1("fullscans","#000000", "Full table sacns");
>++        $def[$defcnt] .= rrd::line1("fullscans","#000000", "Full table scans");
>+         $def[$defcnt] .= rrd::gprint("fullscans",array("MAX", "AVERAGE", "LAST"),"%3.2lf");
>+         $defcnt++;
>+     }
>
>Property changes on: files/patch-share_pnp_templates.dist_check__mssql__health.php
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/pkg-deinstall.in
>===================================================================
>--- files/pkg-deinstall.in	(revision 374216)
>+++ files/pkg-deinstall.in	(working copy)
>@@ -1,57 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD$
>-#
>-
>-SPOOL_DIRS=%%SPOOL_DIRS%%
>-NAGIOSUSER=%%NAGIOSUSER%%
>-NAGIOSGROUP=%%NAGIOSGROUP%%
>-
>-dirs () {
>-	local kept spool_dirs_rev
>-
>-	IFS=%
>-	for i in $SPOOL_DIRS; do
>-		if [ -z "$spool_dirs_rev" ]; then
>-			spool_dirs_rev="$i"
>-		else
>-			spool_dirs_rev="$i$IFS$spool_dirs_rev"
>-		fi
>-	done
>-	for i in $spool_dirs_rev; do
>-		d="${i%%:*}"
>-		if ! [ -d "$d" ]; then
>-			continue
>-		fi
>-		gom_std="${i#*:}"
>-		go_cur=`stat -f %Su:%Sg "$d"`
>-		m_cur=`stat -f %Op "$d" | sed -e's/^.*$....$$/\1/'`
>-		if [ "$gom_std" != "$go_cur:$m_cur" ]; then
>-			kept="$kept $d"
>-			continue
>-		fi
>-		if ! rmdir "$d" > /dev/null 2>&1; then
>-			kept="$kept $d"
>-			continue
>-		fi
>-	done
>-
>-	if [ -n "$kept" ]; then
>-		echo
>-		cat << EOF
>-The following directories were not removed, because they are either
>-have non-default permissions or not empty:
>-EOF
>-		IFS=" "
>-		for i in $kept; do
>-			echo "  $i"
>-		done
>-		echo
>-		echo "Unless you're upgrading, remove them manually."
>-		echo
>-	fi
>-}
>-
>-if [ "x$2" = "xPOST-DEINSTALL" ]; then
>-	dirs
>-fi
>Index: files/pkg-install.in
>===================================================================
>--- files/pkg-install.in	(revision 374216)
>+++ files/pkg-install.in	(working copy)
>@@ -1,73 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD$
>-#
>-
>-SPOOL_DIRS=%%SPOOL_DIRS%%
>-NAGIOSUSER=%%NAGIOSUSER%%
>-NAGIOSGROUP=%%NAGIOSGROUP%%
>-
>-# Create directories with mode and ownership specified in SPOOL_DIRS
>-# as strings separated by '%' of format DIR:OWNER:GROUP:MODE
>-dirs () {
>-	IFS=%
>-	for i in $SPOOL_DIRS; do
>-		d="${i%%:*}"
>-		if ! [ -d "$d" ]; then
>-			go=`echo "$i" | cut -f 2-3 -d :`
>-			m="${i##*:}"
>-			mkdir -p "$d"
>-			chown "$go" "$d"
>-			chmod "$m" "$d"
>-		fi
>-	done
>-}
>-
>-check_sanity () {
>-	if ! pw group show "$NAGIOSGROUP" 2>&1 > /dev/null; then
>-		echo "No group '$NAGIOSGROUP'.  Create it and try again."
>-		exit 1
>-	fi
>-	if ! pw user show "$NAGIOSUSER" 2>&1 > /dev/null; then
>-		echo "No user '$NAGIOSUSER'.  Create it and try again."
>-		exit 1
>-	fi
>-}
>-
>-# I messed the proper way to create the configuration for PNP:
>-# config_local.php should be used for overrides and config.php
>-# will come modified at each upgrade.
>-#
>-# I was installing config.php as config.php-sample and hoping
>-# that people will use it as the base for original config.php.
>-#
>-# So, if we now have config.php at the installtion phase, then
>-# it means that config.php may be customized.  We save it as
>-# config.php.orig and informing the user about it.
>-fixup_config_local () {
>-	if [ -e "%%ETCDIR%%"/config.php ]; then
>-		cp "%%ETCDIR%%"/config.php "%%ETCDIR%%"/config.php.orig
>-		cat << "EOF"
>-======================================================================
>-WARNING:
>-
>-You have config.php for PNP; this means that you are probably
>-upgrading from an old port version, where config.php-sample was
>-installed instead of config.php and it was meant that you will
>-cope with config.php yourself.
>-
>-PNP's way to do the things is to let config.php be overwritten at each
>-upgrade and local overrides to it should go to config_local.php.
>-
>-Your existing config.php was saved as config.php.orig, please, review
>-your modifications and put them to config_local.php.
>-======================================================================
>-EOF
>-	fi
>-}
>-
>-if [ "x$2" = "xPRE-INSTALL" ]; then
>-	check_sanity
>-	dirs
>-	fixup_config_local
>-fi
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 374216)
>+++ pkg-plist	(working copy)
>@@ -346,6 +346,7 @@
> %%WWWDIR%%/application/views/graph.php
> %%WWWDIR%%/application/views/graph_content.php
> %%WWWDIR%%/application/views/graph_content_special.php
>+%%WWWDIR%%/application/views/graph_tiny.php
> %%WWWDIR%%/application/views/header.php
> %%WWWDIR%%/application/views/host_box.php
> %%WWWDIR%%/application/views/icon_box.php
>@@ -655,81 +656,19 @@
> %%WWWDIR%%/templates.special/advanced_loop.php-sample
> %%WWWDIR%%/templates.special/loop.php-sample
> %%WWWDIR%%/templates.special/static.php-sample
>-@dirrmtry %%ETCDIR%%/check_commands
>-@dirrmtry %%ETCDIR%%/config.d
>-@dirrmtry %%ETCDIR%%/pages
>-@dirrmtry %%ETCDIR%%
>-@dirrm lib/kohana/system/config
>-@dirrm lib/kohana/system/controllers
>-@dirrm lib/kohana/system/core/utf8
>-@dirrm lib/kohana/system/core
>-@dirrm lib/kohana/system/fonts
>-@dirrm lib/kohana/system/helpers
>-@dirrm lib/kohana/system/i18n/de_DE
>-@dirrm lib/kohana/system/i18n/en_US
>-@dirrm lib/kohana/system/i18n/es_ES
>-@dirrm lib/kohana/system/i18n/fr_FR
>-@dirrm lib/kohana/system/i18n/it_IT
>-@dirrm lib/kohana/system/i18n/nl_NL
>-@dirrm lib/kohana/system/i18n/ru_RU
>-@dirrm lib/kohana/system/i18n
>-@dirrm lib/kohana/system/libraries/drivers/Cache
>-@dirrm lib/kohana/system/libraries/drivers/Captcha
>-@dirrm lib/kohana/system/libraries/drivers/Database
>-@dirrm lib/kohana/system/libraries/drivers/Image
>-@dirrm lib/kohana/system/libraries/drivers/Session
>-@dirrm lib/kohana/system/libraries/drivers
>-@dirrm lib/kohana/system/libraries
>-@dirrm lib/kohana/system/views/kohana
>-@dirrm lib/kohana/system/views/pagination
>-@dirrm lib/kohana/system/views
>-@dirrm lib/kohana/system
>-@dirrm lib/kohana
>-@dirrm %%WWWDIR%%/application/cache
>-@dirrm %%WWWDIR%%/application/config
>-@dirrm %%WWWDIR%%/application/controllers
>-@dirrm %%WWWDIR%%/application/helpers
>-@dirrm %%WWWDIR%%/application/hooks
>-@dirrm %%WWWDIR%%/application/i18n/de_DE
>-@dirrm %%WWWDIR%%/application/i18n/en_US
>-@dirrm %%WWWDIR%%/application/i18n/es_ES
>-@dirrm %%WWWDIR%%/application/i18n/fr_FR
>-@dirrm %%WWWDIR%%/application/i18n/ru_RU
>-@dirrm %%WWWDIR%%/application/i18n
>-@dirrm %%WWWDIR%%/application/lib
>-@dirrm %%WWWDIR%%/application/models
>-@dirrm %%WWWDIR%%/application/vendor/fpdf/filters
>-@dirrm %%WWWDIR%%/application/vendor/fpdf/font
>-@dirrm %%WWWDIR%%/application/vendor/fpdf
>-@dirrm %%WWWDIR%%/application/vendor
>-@dirrm %%WWWDIR%%/application/views
>-@dirrm %%WWWDIR%%/application
>-@dirrm %%WWWDIR%%/documents/_media
>-@dirrm %%WWWDIR%%/documents/de_DE
>-@dirrm %%WWWDIR%%/documents/en_US
>-@dirrm %%WWWDIR%%/documents/images/smileys
>-@dirrm %%WWWDIR%%/documents/images
>-@dirrm %%WWWDIR%%/documents
>-@dirrm %%WWWDIR%%/media/css/images
>-@dirrm %%WWWDIR%%/media/css/ui-lightness/images
>-@dirrm %%WWWDIR%%/media/css/ui-lightness
>-@dirrm %%WWWDIR%%/media/css/ui-multisite/images
>-@dirrm %%WWWDIR%%/media/css/ui-multisite
>-@dirrm %%WWWDIR%%/media/css/ui-redmond/images
>-@dirrm %%WWWDIR%%/media/css/ui-redmond
>-@dirrm %%WWWDIR%%/media/css/ui-smoothness/images
>-@dirrm %%WWWDIR%%/media/css/ui-smoothness
>-@dirrm %%WWWDIR%%/media/css
>-@dirrm %%WWWDIR%%/media/images
>-@dirrm %%WWWDIR%%/media/js
>-@dirrm %%WWWDIR%%/media
>-@dirrmtry %%WWWDIR%%/templates
>-@dirrm %%WWWDIR%%/templates.dist
>-@dirrmtry %%WWWDIR%%/templates.special
>-@dirrmtry %%WWWDIR%%
>-@unexec rmdir "/var/log/kohana" >/dev/null 2>&1 || :
>-@unexec rmdir "/var/log/stats" >/dev/null 2>&1 || :
>-@unexec rmdir "%%NAGIOSDIR%%/pnp/perfspool" >/dev/null 2>&1 || :
>-@unexec rmdir "%%NAGIOSDIR%%/pnp/rrd" >/dev/null 2>&1 || :
>-@unexec rmdir "%%NAGIOSDIR%%/pnp" >/dev/null 2>&1 || :
>-@unexec rmdir "%%NAGIOSDIR%%" >/dev/null 2>&1 || :
>+@dir %%ETCDIR%%/check_commands
>+@dir %%ETCDIR%%/config.d
>+@dir %%ETCDIR%%/pages
>+@dir %%ETCDIR%%
>+@dir(%%WWWOWN%%,%%WWWGRP%%,755) %%WWWDIR%%/application/cache
>+@dir(%%WWWOWN%%,%%WWWGRP%%,755) %%WWWDIR%%/application/config
>+@dir(%%WWWOWN%%,%%WWWGRP%%,755) %%WWWDIR%%/application/hooks
>+@dir %%WWWDIR%%/templates
>+@dir %%WWWDIR%%/templates.special
>+@dir %%WWWDIR%%
>+@dir(%%WWWOWN%%,%%WWWGRP%%,0755) /var/log/kohana
>+@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,0750) /var/log/stats
>+@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,0750) %%NAGIOSDIR%%/pnp/perfspool
>+@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,0775) %%NAGIOSDIR%%/pnp/rrd
>+@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,0775) %%NAGIOSDIR%%/pnp
>+@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,0775) %%NAGIOSDIR%%

Actions: View | Diff

Attachments on bug 195015: 149414 | 150309