Update to nagstamon-1.0.

This commit is contained in:
ajacoutot 2014-08-10 08:11:06 +00:00
parent 712f0d4d4c
commit 63b0cb5e2a
5 changed files with 61 additions and 47 deletions

View File

@ -1,36 +1,37 @@
# $OpenBSD: Makefile,v 1.14 2013/09/11 10:21:36 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.15 2014/08/10 08:11:06 ajacoutot Exp $
COMMENT= nagios status monitor for the Desktop
COMMENT= nagios status monitor for the Desktop
MODPY_EGG_VERSION= 0.9.11
DISTNAME= Nagstamon-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:L}
MODPY_EGG_VERSION= 1.0
DISTNAME= Nagstamon-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:L}
WRKDIST= ${WRKDIR}/Nagstamon
CATEGORIES= x11 net
CATEGORIES= x11 net
HOMEPAGE= http://nagstamon.ifw-dresden.de/
HOMEPAGE= http://nagstamon.ifw-dresden.de/
MAINTAINER= Nicolas P. M. Legrand <nlegrand@ethelred.fr>
MAINTAINER= Nicolas P. M. Legrand <nlegrand@ethelred.fr>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagstamon/}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagstamon/}
PKG_ARCH= *
PKG_ARCH= *
MODULES= lang/python
MODULES= lang/python
RUN_DEPENDS= textproc/py-lxml \
x11/py-gtk2 \
audio/sox
RUN_DEPENDS= audio/sox \
security/py-keyring \
textproc/py-lxml \
x11/py-gtk2
NO_TEST= Yes
NO_TEST= Yes
MODPY_ADJ_FILES=nagstamon.py \
Nagstamon/Server/Multisite.py
MODPY_ADJ_FILES= nagstamon.py
post-install:
cd ${PREFIX}/bin && ln -s nagstamon.py nagstamon
cd ${PREFIX}/bin && mv nagstamon.py nagstamon
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (Nagstamon-0.9.11.tar.gz) = DtQaxoYbvSLh3GmQR4eSyj3//hPiVaRKJSJCbSBMP4I=
SIZE (Nagstamon-0.9.11.tar.gz) = 399329
SHA256 (Nagstamon-1.0.tar.gz) = z8xfZz9jhq8EVLTGQA/yRg92kApjFvdmdja0TAzZSy0=
SIZE (Nagstamon-1.0.tar.gz) = 470199

View File

@ -1,23 +1,23 @@
--- Nagstamon/Config.py.orig Wed Sep 11 08:53:31 2013
+++ Nagstamon/Config.py Wed Sep 11 12:13:34 2013
@@ -603,15 +603,15 @@ class Config(object):
--- Nagstamon/Config.py.orig Mon Jul 28 10:46:23 2014
+++ Nagstamon/Config.py Mon Jul 28 16:13:32 2014
@@ -681,15 +681,15 @@ class Config(object):
else:
# the Linux settings
defaultactions = { "RDP": Action(name="RDP", description="Connect via RDP.",\
- type="command", string="/usr/bin/rdesktop -g 1024x768 $ADDRESS$"),\
+ type="command", string="${LOCALBASE}/bin/rdesktop -g 1024x768 $ADDRESS$"),\
"VNC": Action(name="VNC", description="Connect via VNC.",\
- type="command", string="/usr/bin/vncviewer $ADDRESS$"),\
+ type="command", string="${LOCALBASE}/bin/vncviewer $ADDRESS$"),\
"SSH": Action(name="SSH", description="Connect via SSH.",\
- type="command", string="/usr/bin/gnome-terminal -x ssh root@$ADDRESS$"),\
+ type="command", string="${X11BASE}/bin/xterm -e ssh root@$ADDRESS$"),\
"Telnet": Action(name="Telnet", description="Connect via Telnet.",\
- type="command", string="/usr/bin/gnome-terminal -x telnet root@$ADDRESS$"),\
+ type="command", string="${X11BASE}/bin/xterm -e telnet root@$ADDRESS$"),\
"Update-Linux": Action(name="Update-Linux", description="Run remote update script.",\
- type="command", string="/usr/bin/terminator -x ssh root@$HOST$ update.sh",\
+ type="command", string="${LOCALBASE}/bin/terminator -x ssh root@$HOST$ update.sh",\
enabled=False)\
defaultactions = { "RDP": Action(name="RDP", description="Connect via RDP.",
- type="command", string="/usr/bin/rdesktop -g 1024x768 $ADDRESS$"),
+ type="command", string="${LOCALBASE}/bin/rdesktop -g 1024x768 $ADDRESS$"),
"VNC": Action(name="VNC", description="Connect via VNC.",
- type="command", string="/usr/bin/vncviewer $ADDRESS$"),
+ type="command", string="${LOCALBASE}/bin/vncviewer $ADDRESS$"),
"SSH": Action(name="SSH", description="Connect via SSH.",
- type="command", string="/usr/bin/gnome-terminal -x ssh root@$ADDRESS$"),
+ type="command", string="${X11BASE}/bin/xterm -e ssh root@$ADDRESS$"),
"Telnet": Action(name="Telnet", description="Connect via Telnet.",
- type="command", string="/usr/bin/gnome-terminal -x telnet root@$ADDRESS$"),
+ type="command", string="${X11BASE}/bin/xterm -e telnet root@$ADDRESS$"),
"Update-Linux": Action(name="Update-Linux", description="Run remote update script.",
- type="command", string="/usr/bin/terminator -x ssh root@$HOST$ update.sh",
+ type="command", string="${LOCALBASE}/bin/terminator -x ssh root@$HOST$ update.sh",
enabled=False)
}
# OS agnostic actions as examples

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-setup_py,v 1.3 2012/04/13 15:40:00 ajacoutot Exp $
--- setup.py.orig Fri Apr 13 14:40:16 2012
+++ setup.py Fri Apr 13 17:28:36 2012
$OpenBSD: patch-setup_py,v 1.4 2014/08/10 08:11:06 ajacoutot Exp $
--- setup.py.orig Mon Jul 28 10:46:23 2014
+++ setup.py Mon Jul 28 16:11:31 2014
@@ -50,6 +50,6 @@ setup(name = 'nagstamon',
packages = ['Nagstamon', 'Nagstamon.Server'],
packages = ['Nagstamon', 'Nagstamon.Server', 'Nagstamon.thirdparty'],
package_dir = {'Nagstamon':'Nagstamon'},
package_data = {'Nagstamon':['resources/*']},
- data_files = [('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1'])]

View File

@ -1,11 +1,8 @@
@comment $OpenBSD: PLIST,v 1.5 2013/09/11 10:21:37 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2014/08/10 08:11:06 ajacoutot Exp $
bin/nagstamon
bin/nagstamon.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Actions.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Actions.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/BeautifulSoup.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/BeautifulSoup.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Config.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Config.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Custom.py
@ -31,8 +28,12 @@ lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Opsview.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Opsview.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Thruk.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Thruk.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Zabbix.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Zabbix.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/__init__.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/op5Monitor.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/op5Monitor.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/__init__.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/
@ -53,6 +54,7 @@ lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/menu.svg
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagios.png
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagios.svg
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.1
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.appdata.xml
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.desktop
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.icns
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.ico
@ -60,6 +62,8 @@ lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.png
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.svg
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_acknowledged.png
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_acknowledged.svg
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_appindicator.png
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_appindicator.svg
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_black.png
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_black.svg
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_darkred.png
@ -70,6 +74,8 @@ lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_error.png
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_error.svg
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_flapping.png
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_flapping.svg
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_fresh.png
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_fresh.svg
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_green.png
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_green.svg
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon_label.png
@ -97,5 +103,12 @@ lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/settings_dialog.ui
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/settings_server_dialog.ui
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/submit_check_result_dialog.ui
lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/warning.wav
lib/python${MODPY_VERSION}/site-packages/Nagstamon/thirdparty/
lib/python${MODPY_VERSION}/site-packages/Nagstamon/thirdparty/BeautifulSoup.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/thirdparty/BeautifulSoup.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/thirdparty/__init__.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/thirdparty/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/Nagstamon/thirdparty/zabbix_api.py
lib/python${MODPY_VERSION}/site-packages/Nagstamon/thirdparty/zabbix_api.pyc
lib/python${MODPY_VERSION}/site-packages/nagstamon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
@man man/man1/nagstamon.1