Skip to content

Commit

Permalink
Merge commit '23159e45ff0f09be8b9cbf1665b60d310c0f9d54' into maint
Browse files Browse the repository at this point in the history
  • Loading branch information
John C. Frickson committed Oct 17, 2016
2 parents fe006d2 + 23159e4 commit b3079d4
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 56 deletions.
8 changes: 5 additions & 3 deletions macros/ax_nagios_get_distrib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,12 @@ AC_SUBST(dist_ver)
[bsd],
dist_type=`uname -s | tr ["[A-Z]" "[a-z]"]`
dist_ver=`uname -r`,
[aix|hp-ux],
dist_ver=$OSTYPE,
[aix],
dist_ver="`uname -v`.`uname -r`",
[hp-ux],
dist_ver=`uname -r | cut -d'.' -f1-3`,
[solaris],
dist_ver=`echo $OSTYPE | cut -d'.' -f2`,
dist_ver=`uname -r | cut -d'.' -f2`,
[*],
dist_ver=$OSTYPE
)
Expand Down
2 changes: 1 addition & 1 deletion macros/ax_nagios_get_files
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ AS_CASE([$init_type],
fi,

[launchd],
src_init="mac-init.plist"
src_init="mac-init.plist",

[*],
src_init="unknown"
Expand Down
15 changes: 10 additions & 5 deletions macros/ax_nagios_get_init
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,19 @@ AC_SUBST(init_type)
elif test "$dist_type" = "slackware"; then
init_type="bsd"
init_type_wanted=no
elif test "$dist_type" = "aix"; then
init_type="bsd"
init_type_wanted=no
elif test "$dist_type" = "hp-ux"; then
init_type="unknown"
init_type_wanted=no
fi
fi

PSCMD="ps -p1 -o args"
AS_CASE([$dist_type],
[aix], PSCMD="env UNIX95=1; ps -p1 -o args",
[solaris], PSCMD="env UNIX95=1; ps -p1 -o args",
[hp-ux], PSCMD="env UNIX95=1; ps -p1 -o args")
if test $dist_type = solaris; then
PSCMD="env UNIX95=1; ps -p1 -o args"
fi

if test "$init_type_wanted" = yes; then
pid1=`$PSCMD | grep -vi COMMAND | cut -d' ' -f1`
Expand Down Expand Up @@ -173,7 +178,7 @@ AC_SUBST(init_type)

if test "$init_type_wanted" = yes; then
if test "$pid1" = "/sbin/init" -o "$pid1" = "/usr/sbin/init"; then
if `/sbin/init --version 2>/dev/null | grep "upstart" >/dev/null`; then
if `$pid1 --version 2>/dev/null | grep "upstart" >/dev/null`; then
init_type="upstart"
init_type_wanted=no
elif test -f "/etc/rc" -a ! -L "/etc/rc"; then
Expand Down
106 changes: 59 additions & 47 deletions macros/ax_nagios_get_paths
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,21 @@ AS_CASE([$dist_type],
[*solaris*|*hp-ux*|*aix*|*osx*], opsys=unix)


need_cgi=no
need_web=no
need_brk=no
need_plg=no
need_pipe=no
need_spl=no
need_loc=no
need_log_subdir=no
need_etc_subdir=no
need_pls_dir=no
# Does this package need to know:
need_cgi=no # where the cgi-bin directory is
need_web=no # where the website directory is
need_brk=no # where the event broker modules directory is
need_plg=no # where the plugins directory is
need_pipe=no # where the pipe directory is
need_spl=no # where the spool directory is
need_loc=no # where the locale directory is
need_log_subdir=no # where the loc sub-directory is
need_etc_subdir=no # where the etc sub-directory is
need_pls_dir=no # where the package locate state directory is

if test x"$INIT_PROG" = x; then
INIT_PROG="$PKG_NAME"
fi

AS_CASE([$PKG_NAME],
[nagios],
Expand All @@ -143,6 +148,7 @@ AS_CASE([$PKG_NAME],
need_web=yes,

[ndoutils],
need_brk=yes
need_spl=yes,

[nrpe],
Expand Down Expand Up @@ -284,14 +290,14 @@ tmpfilesd=${tmpfilesd="/usr/lib/tmpfiles.d"}
if test ! -d "$tmpfilesd"; then
tmpfilesd="N/A"
else
tmpfilesd="$tmpfilesd/$PKG_NAME.conf"
tmpfilesd="$tmpfilesd/$INIT_PROG.conf"
fi
subsyslockdir=${subsyslockdir="/var/lock/subsys"}
if test ! -d "$subsyslockdir"; then
subsyslockdir="N/A"
subsyslockfile="N/A"
else
subsyslockfile="$subsyslockdir/$PKG_NAME"
subsyslockfile="$subsyslockdir/$INIT_PROG"
fi
if test "$need_loc" = no; then
localedir="N/A"
Expand Down Expand Up @@ -372,23 +378,23 @@ elif test $opsys = "linux"; then
fi
privatesysconfdir=${privatesysconfdir="$pkgsysconfdir/private"}
if test $need_log_subdir = yes; then
logdir=${logdir="$localstatedir/log/$PKG_NAME"}
logdir=${logdir="$localstatedir/log/$INIT_PROG"}
else
logdir=${logdir="$localstatedir/log"}
fi
piddir=${piddir="$localstatedir/run/${PKG_NAME}"}
piddir=${piddir="$localstatedir/run/${INIT_PROG}"}
if test "$need_pipe" = yes; then
pipedir=${pipedir="$localstatedir/run/${PKG_NAME}"}
pipedir=${pipedir="$localstatedir/run/${INIT_PROG}"}
else
pipedir="N/A"
fi
if test "$need_pls_dir" = yes; then
pkglocalstatedir=${pkglocalstatedir="$localstatedir/lib/$PKG_NAME"}
pkglocalstatedir=${pkglocalstatedir="$localstatedir/lib/$INIT_PROG"}
else
pkglocalstatedir="N/A"
fi
if test "$need_spl" = yes; then
spooldir=${spooldir="$localstatedir/spool/$PKG_NAME"}
spooldir=${spooldir="$localstatedir/spool/$INIT_PROG"}
else
spooldir="N/A"
fi
Expand Down Expand Up @@ -437,15 +443,15 @@ elif test $opsys = "unix"; then
fi
privatesysconfdir=${privatesysconfdir="$pkgsysconfdir/private"}
if test "$need_pls_dir" = yes; then
pkglocalstatedir=${pkglocalstatedir="$localstatedir/lib/$PKG_NAME"}
pkglocalstatedir=${pkglocalstatedir="$localstatedir/lib/$INIT_PROG"}
else
pkglocalstatedir="N/A"
fi
if test "$need_loc" = yes; then
localedir=${localedir="/usr/local/share/locale/<lang>/LC_MESSAGES/nagios-plugins.mo"}
fi
if test "$need_spl" = yes; then
spooldir=${spooldir="$localstatedir/spool/$PKG_NAME"}
spooldir=${spooldir="$localstatedir/spool/$INIT_PROG"}
else
spooldir="N/A"
fi
Expand All @@ -471,14 +477,14 @@ elif test $opsys = "unix"; then
logdir=${logdir="$pkglocalstatedir/log"},

[*],
piddir=${piddir="$localstatedir/run/${PKG_NAME}"}
piddir=${piddir="$localstatedir/run/${INIT_PROG}"}
if test "$need_pipe" = yes; then
pipedir=${pipedir="$localstatedir/run/${PKG_NAME}"}
pipedir=${pipedir="$localstatedir/run/${INIT_PROG}"}
else
pipedir="N/A"
fi
if test $need_log_subdir = yes; then
logdir=${logdir="$localstatedir/log/$PKG_NAME"}
logdir=${logdir="$localstatedir/log/$INIT_PROG"}
else
logdir=${logdir="$localstatedir/log"}
fi
Expand Down Expand Up @@ -528,15 +534,15 @@ elif test $opsys = "bsd"; then
fi
privatesysconfdir=${privatesysconfdir="$pkgsysconfdir/private"}
if test "$need_pls_dir" = yes; then
pkglocalstatedir=${pkglocalstatedir="$localstatedir/lib/$PKG_NAME"}
pkglocalstatedir=${pkglocalstatedir="$localstatedir/lib/$INIT_PROG"}
else
pkglocalstatedir="N/A"
fi
if test "$need_loc" = yes; then
localedir=${localedir="/usr/local/share/locale/<lang>/LC_MESSAGES/nagios-plugins.mo"}
fi
if test "$need_spl" = yes; then
spooldir=${spooldir="$localstatedir/spool/$PKG_NAME"}
spooldir=${spooldir="$localstatedir/spool/$INIT_PROG"}
else
spooldir="N/A"
fi
Expand All @@ -561,14 +567,14 @@ elif test $opsys = "bsd"; then
else
cgibindir="N/A"
fi
piddir=${piddir="$localstatedir/run/${PKG_NAME}"}
piddir=${piddir="$localstatedir/run/${INIT_PROG}"}
if test "$need_pipe" = yes; then
pipedir=${pipedir="$localstatedir/run/${PKG_NAME}"}
pipedir=${pipedir="$localstatedir/run/${INIT_PROG}"}
else
pipedir="N/A"
fi
if test $need_log_subdir = yes; then
logdir=${logdir="$localstatedir/log/$PKG_NAME"}
logdir=${logdir="$localstatedir/log/$INIT_PROG"}
else
logdir=${logdir="$localstatedir/log"}
fi
Expand Down Expand Up @@ -604,6 +610,7 @@ eval libexecdir=$libexecdir
eval brokersdir=$brokersdir
eval pluginsdir=$pluginsdir
eval cgibindir=$cgibindir
eval localstatedir=$localstatedir
eval pkglocalstatedir=$pkglocalstatedir
eval webdir=$webdir
eval localedir=$localedir
Expand All @@ -622,59 +629,64 @@ AS_CASE([$init_type],
else
initdir=${initdir="/etc/init.d"}
fi
initname=${initname="$PKG_NAME"}
initname=${initname="$INIT_PROG"}
initconfdir=${initconfdir="/etc/conf.d"}
initconf=${initconf="$initconfdir/$PKG_NAME"},
initconf=${initconf="$initconfdir/$INIT_PROG"},

[systemd],
if test $dist_type = "debian"; then
initdir=${initdir="/lib/systemd/system"}
else
initdir=${initdir="/usr/lib/systemd/system"}
fi
initname=${initname="$PKG_NAME.service"},
initname=${initname="$INIT_PROG.service"},

[bsd],
initdir=${initdir="/etc/rc.d"}
initname=${initname="rc.$PKG_NAME"},
if test $dist_type = "aix"; then
initdir=${initdir="/sbin/rc.d/init.d"}
initname=${initname="$INIT_PROG"}
else
initdir=${initdir="/etc/rc.d"}
initname=${initname="rc.$INIT_PROG"}
fi,

[newbsd],
initdir=${initdir="/etc/rc.d"}
initname=${initname="$PKG_NAME"},
initname=${initname="$INIT_PROG"},

[gentoo],
initdir=${initdir="/etc/init.d"}
initname=${initname="$PKG_NAME"}
initname=${initname="$INIT_PROG"}
initconfdir=${initconfdir="/etc/init.d"}
initconf=${initconf="$initconfdir/$PKG_NAME"},
initconf=${initconf="$initconfdir/$INIT_PROG"},

[openrc],
initdir=${initdir="/etc/init.d"}
initname=${initname="$PKG_NAME"}
initname=${initname="$INIT_PROG"}
initconfdir=${initconfdir="/etc/conf.d"}
initconf=${initconf="$initconfdir/$PKG_NAME"},
initconf=${initconf="$initconfdir/$INIT_PROG"},

[smf*],
if test $init_type = smf10; then
initdir=${initdir="/var/svc/manifest/network/nagios"}
else
initdir=${initdir="/lib/svc/manifest/network/nagios"}
fi
initname=${initname="$PKG_NAME.xml"}
initname=${initname="$INIT_PROG.xml"}
initconfdir=unknown
initconf=unknown,

[upstart],
initdir=${initdir="/etc/init"}
initname=${initname="$PKG_NAME.conf"}
initname=${initname="$INIT_PROG.conf"}
initconfdir=${initconfdir="/etc/default"}
initconf=${initconf="$initconfdir/$PKG_NAME"},
initconf=${initconf="$initconfdir/$INIT_PROG"},

[launchd],
initdir=${initdir="/Library/LaunchDaemons"}
initname=${initname="org.nagios.$PKG_NAME.plist"},
initname=${initname="org.nagios.$INIT_PROG.plist"},
# initconfdir=${initconfdir="/private/etc"}
# initconf=${initconf="$initconfdir/$PKG_NAME"},
# initconf=${initconf="$initconfdir/$INIT_PROG"},


[*],
Expand All @@ -691,31 +703,31 @@ AS_CASE([$inetd_type],

[xinetd],
inetddir=${inetddir="/etc/xinetd.d"}
inetdname=${inetdname="$PKG_NAME"},
inetdname=${inetdname="$INIT_PROG"},

[systemd],
if test $dist_type = "debian"; then
inetddir=${inetddir="/lib/systemd/system"}
else
inetddir=${inetddir="/usr/lib/systemd/system"}
fi
netdname=${inetdname="$PKG_NAME.socket"},
netdname=${inetdname="$INIT_PROG.socket"},

[smf*],
if test $init_type = smf10; then
inetddir=${inetddir="/var/svc/manifest/network/nagios"}
else
inetddir=${inetddir="/lib/svc/manifest/network/nagios"}
fi
inetdname=${inetdname="$PKG_NAME.xml"},
inetdname=${inetdname="$INIT_PROG.xml"},

# [upstart],
# inetddir=${inetddir="/etc/init.d"}
# inetdname=${inetdname="$PKG_NAME"},
# inetdname=${inetdname="$INIT_PROG"},

[launchd],
inetddir=${inetddir="/Library/LaunchDaemons"}
inetdname=${inetdname="org.nagios.$PKG_NAME.plist"},
inetdname=${inetdname="org.nagios.$INIT_PROG.plist"},

[*],
inetddir=${inetddir="unknown"}
Expand Down

0 comments on commit b3079d4

Please sign in to comment.