| Revision | ebc04902d2a6d5b743a86f936d559d5589715c37 (tree) |
|---|---|
| Time | 2020-03-18 20:48:03 |
| Author | Fumihisa TONAKA <fumi.ftnk@gmai...> |
| Commiter | Fumihisa TONAKA |
merge spec_SFEnagios-nrpe-jposug to default
specs/SFEnagios-nrpe-jposug.spec (diff) specs/ext-sources/svc-nagios-nrpe (diff)| @@ -25,6 +25,9 @@ | ||
| 25 | 25 | License: GPL |
| 26 | 26 | URL: http://www.nagios.org/ |
| 27 | 27 | Source: https://github.com/NagiosEnterprises/nrpe/archive/nrpe-%{tarball_version}.tar.gz |
| 28 | +Source1: nagios-nrpe-jposug.xml | |
| 29 | +Source2: svc-nagios-nrpe-jposug | |
| 30 | + | |
| 28 | 31 | BuildRoot: %{_tmppath}/%{name}-%{version}-build |
| 29 | 32 | |
| 30 | 33 | BuildREquires: jposug/library/security/libressl |
| @@ -68,7 +71,6 @@ | ||
| 68 | 71 | |
| 69 | 72 | make -j$CPUS all |
| 70 | 73 | |
| 71 | - | |
| 72 | 74 | %install |
| 73 | 75 | rm -rf %{buildroot} |
| 74 | 76 | make DESTDIR=%{buildroot} NAGIOS_INSTALL_OPTS="" NRPE_INSTALL_OPTS="" install |
| @@ -76,7 +78,9 @@ | ||
| 76 | 78 | install -m 0644 sample-config/nrpe.cfg %{buildroot}%{_sysconfdir}/nagios/nrpe.cfg |
| 77 | 79 | |
| 78 | 80 | install -d 0755 %{buildroot}%/var/svc/manifest/site |
| 79 | -install -m 0644 startup/solaris-init.xml %{buildroot}%/var/svc/manifest/site/nagios-nrpe-jposug.xml | |
| 81 | +install -m 0644 %{SOURCE1} %{buildroot}%/var/svc/manifest/site | |
| 82 | +install -d 0755 %{buildroot}%/lib/svc/method | |
| 83 | +install -m 0555 %{SOURCE2} %{buildroot}%/lib/svc/method | |
| 80 | 84 | |
| 81 | 85 | rm %{buildroot}%{_sbindir}/nrpe-uninstall |
| 82 | 86 |
| @@ -105,8 +109,13 @@ | ||
| 105 | 109 | %dir %attr (0755, root, sys) %{_localstatedir}/svc/manifest |
| 106 | 110 | %dir %attr (0755, root, sys) %{_localstatedir}/svc/manifest/site |
| 107 | 111 | %class(manifest) %attr(0444, root, sys) %{_localstatedir}/svc/manifest/site/nagios-nrpe-jposug.xml |
| 112 | +%dir %attr (0755, root, bin) /lib/svc | |
| 113 | +%dir %attr (0755, root, bin) /lib/svc/method | |
| 114 | +%attr (0555, root, bin) /lib/svc/method/svc-nagios-nrpe-jposug | |
| 108 | 115 | |
| 109 | 116 | %changelog |
| 117 | +* Fri Mar 13 2020 - Fumihisa TONAKA <fumi.ftnk@gmail.com> | |
| 118 | +- use JPOSUG's SMF manifest. using generated SMF manifest requries updating configuration | |
| 110 | 119 | * Fri Feb 07 2020 - Fumihisa TONAKA <fumi.ftnk@gmail.com> |
| 111 | 120 | - use generated SMF manifest instead of JPOUSG's |
| 112 | 121 | * Thu Feb 06 2020 - Fumihisa TONAKA <fumi.ftnk@gmail.com> |
| @@ -62,7 +62,6 @@ | ||
| 62 | 62 | case "$1" in |
| 63 | 63 | start) |
| 64 | 64 | # Start daemons. |
| 65 | - echo -n "Starting nrpe: " | |
| 66 | 65 | NrpeRunDir=`dirname $NrpeRunFile` |
| 67 | 66 | if [ ! -d $NrpeRunDir ] |
| 68 | 67 | then |
| @@ -75,15 +74,12 @@ | ||
| 75 | 74 | $NrpeBin -c $NrpeCfgFile -d |
| 76 | 75 | mkdir -p $NrpeLockDir |
| 77 | 76 | touch $NrpeLockDir/$NrpeLockFile |
| 78 | - echo " done." | |
| 79 | 77 | exit 0 |
| 80 | 78 | ;; |
| 81 | 79 | stop) |
| 82 | 80 | # Stop daemons. |
| 83 | - echo -n "Shutting down nrpe: " | |
| 84 | 81 | pid_nrpe |
| 85 | 82 | killproc_nrpe |
| 86 | - echo | |
| 87 | 83 | rm -f $NrpeLockDir/$NrpeLockFile $NrpeRunFile |
| 88 | 84 | ;; |
| 89 | 85 | restart) |
Fork