From 4631e71492aa11408a10b5b615085bf8bda40f42 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 23 May 2017 13:45:29 +0200 Subject: [PATCH] switch to icinge --- debian/control | 2 +- debian/dirs | 6 +++--- debian/patches/50_nagios4_debian_pathes.patch | 2 +- debian/postinst | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index c0b75f5..365438a 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Homepage: http://www.nagiosql.org Package: nagiosql Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, php-ssh2 -Recommends: nagios4 +Recommends: icinga Description: Web based administration tool for Nagios 2 and above It helps you to easily build a complex configuration with all options, manage and use them. NagiosQL is based on a webserver with PHP, MySQL and diff --git a/debian/dirs b/debian/dirs index 75cc4d1..20a07b3 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,6 +1,6 @@ usr/share/nagiosql/htdocs -etc/nagiosql -etc/nagiosql/hosts -etc/nagiosql/services +etc/nagiosql/domain +etc/nagiosql/domain/hosts +etc/nagiosql/domain/services etc/nagiosql/backup/hosts etc/nagiosql/backup/services diff --git a/debian/patches/50_nagios4_debian_pathes.patch b/debian/patches/50_nagios4_debian_pathes.patch index 0ac65ab..ac7a3c5 100644 --- a/debian/patches/50_nagios4_debian_pathes.patch +++ b/debian/patches/50_nagios4_debian_pathes.patch @@ -6,7 +6,7 @@ diff -uNr nagiosql32.orig/install/sql/nagiosQL_v32_db_mysql.sql nagiosql32/insta -- -INSERT INTO `tbl_configtarget` (`id`, `target`, `alias`, `server`, `method`, `user`, `password`, `ssh_key_path`, `basedir`, `hostconfig`, `serviceconfig`, `backupdir`, `hostbackup`, `servicebackup`, `nagiosbasedir`, `importdir`, `picturedir`, `commandfile`, `binaryfile`, `pidfile`, `conffile`, `version`, `access_group`, `active`, `nodelete`, `last_modified`) VALUES(1, 'localhost', 'Local installation', 'localhost', '1', '', '', '', '/etc/nagiosql/', '/etc/nagiosql/hosts/', '/etc/nagiosql/services/', '/etc/nagiosql/backup/', '/etc/nagiosql/backup/hosts/', '/etc/nagiosql/backup/services/', '/etc/nagiosql/', '/opt/nagios/etc/objects/', '', '/var/nagios/rw/nagios.cmd', '/opt/nagios/bin/nagios', '/var/nagios/nagios.lock', '/etc/nagiosql/nagios.cfg', 3, 0, '1', '1', NOW()); -+INSERT INTO `tbl_configtarget` (`id`, `target`, `alias`, `server`, `method`, `user`, `password`, `ssh_key_path`, `basedir`, `hostconfig`, `serviceconfig`, `backupdir`, `hostbackup`, `servicebackup`, `nagiosbasedir`, `importdir`, `picturedir`, `commandfile`, `binaryfile`, `pidfile`, `conffile`, `version`, `access_group`, `active`, `nodelete`, `last_modified`) VALUES(1, 'localhost', 'Local installation', 'localhost', '1', '', '', '', '/etc/nagiosql/', '/etc/nagiosql/hosts/', '/etc/nagiosql/services/', '/etc/nagiosql/backup/', '/etc/nagiosql/backup/hosts/', '/etc/nagiosql/backup/services/', '/etc/nagiosql/', '/etc/nagios4/objects/', '', '/var/lib/nagios4/rw/nagios.cmd', '/usr/sbin/nagios4', '/var/run/nagios4/nagios4.pid', '/etc/nagios4/nagios.cfg', 3, 0, '1', '1', NOW()); ++INSERT INTO `tbl_configtarget` (`id`, `target`, `alias`, `server`, `method`, `user`, `password`, `ssh_key_path`, `basedir`, `hostconfig`, `serviceconfig`, `backupdir`, `hostbackup`, `servicebackup`, `nagiosbasedir`, `importdir`, `picturedir`, `commandfile`, `binaryfile`, `pidfile`, `conffile`, `version`, `access_group`, `active`, `nodelete`, `last_modified`) VALUES(1, 'localhost', 'Local installation', 'localhost', '1', '', '', '', '/etc/nagiosql/domain/', '/etc/nagiosql/domain/hosts/', '/etc/nagiosql/domain/services/', '/etc/nagiosql/backup/', '/etc/nagiosql/backup/hosts/', '/etc/nagiosql/backup/services/', '/etc/nagiosql/', '/etc/nagios4/objects/', '', '/var/lib/nagios4/rw/nagios.cmd', '/usr/sbin/nagios4', '/var/run/nagios4/nagios4.pid', '/etc/nagios4/nagios.cfg', 3, 0, '1', '1', NOW()); -- -------------------------------------------------------- diff --git a/debian/postinst b/debian/postinst index 06c0aff..3d8cab9 100644 --- a/debian/postinst +++ b/debian/postinst @@ -52,8 +52,8 @@ case "$1" in for file in `find /etc/nagiosql -type f -name \*.cfg 2> /dev/null`; do [ -f $file ] && setperm www-data nagios 0644 $file done - # -- /etc/nagios4 config files - for cfg in /etc/nagios4/nagios.cfg /etc/nagios/nagios4/cgi.cfg ; do + # -- /etc/icinga config files + for cfg in /etc/icinga/icinga.cfg /etc/nagios/icinga/cgi.cfg ; do [ -e $cfg ] && setgrperm www-data 0644 $cfg done # -- at last