diff -Nru djagios-0.1.3+dfsg/debian/changelog djagios-0.1.3+dfsg/debian/changelog --- djagios-0.1.3+dfsg/debian/changelog 2016-09-24 21:58:51.000000000 +0000 +++ djagios-0.1.3+dfsg/debian/changelog 2016-12-11 17:17:44.000000000 +0000 @@ -1,3 +1,16 @@ +djagios (0.1.3+dfsg-8) unstable; urgency=medium + + * Don't depend on nagios3 which has been removed from Debian. + Thank's to Bas Couwenberg for the patch. + (Closes: #846875) + * debian/control: + - Bumped to DH 10. + - Replaced nagios3 to icinga in Suggests field. + * debian/patches/icinga.patch + - Created to set default paths for icinga in Debian. + + -- Giovani Augusto Ferreira Sun, 11 Dec 2016 15:17:44 -0200 + djagios (0.1.3+dfsg-7) unstable; urgency=medium * debian/control: diff -Nru djagios-0.1.3+dfsg/debian/compat djagios-0.1.3+dfsg/debian/compat --- djagios-0.1.3+dfsg/debian/compat 2015-11-20 23:44:44.000000000 +0000 +++ djagios-0.1.3+dfsg/debian/compat 2016-12-11 17:17:44.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru djagios-0.1.3+dfsg/debian/control djagios-0.1.3+dfsg/debian/control --- djagios-0.1.3+dfsg/debian/control 2016-09-24 21:58:51.000000000 +0000 +++ djagios-0.1.3+dfsg/debian/control 2016-12-11 17:17:44.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional XS-Python-Version: >= 2.5 Maintainer: Giovani Augusto Ferreira -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), python-all (>= 2.5), dh-python Standards-Version: 3.9.8 @@ -20,7 +20,7 @@ python-mysqldb | python-pysqlite2 | python-psycopg2 Recommends: apache2, libapache2-mod-wsgi | libapache2-mod-python -Suggests: nagios3 +Suggests: icinga XB-Python-Version: ${python:Versions} Description: tool to help configure nagios written in Django Djagios is an open source Nagios web based configuration tool with a complete diff -Nru djagios-0.1.3+dfsg/debian/patches/icinga.patch djagios-0.1.3+dfsg/debian/patches/icinga.patch --- djagios-0.1.3+dfsg/debian/patches/icinga.patch 1970-01-01 00:00:00.000000000 +0000 +++ djagios-0.1.3+dfsg/debian/patches/icinga.patch 2016-12-11 17:17:44.000000000 +0000 @@ -0,0 +1,104 @@ +Description: Update default paths for icinga on Debian. +Author: Bas Couwenberg +Last Update: 2016-12-11 + +--- a/djagios/core/models.py ++++ b/djagios/core/models.py +@@ -1172,23 +1172,23 @@ class NagiosCfg(NagiosObject, models.Mod + FILE_NAME = 'nagios.cfg' + server_name = models.CharField(max_length=255, default='localhost', unique=True) + log_file = models.ForeignKey(CfgPath, related_name='NC_lf_CP',\ +- default=lambda : CfgPath.get('/var/log/nagios/nagios.log').id) ++ default=lambda : CfgPath.get('/var/log/icinga/icinga.log').id) + cfg_file = models.ManyToManyField(CfgPath, related_name='NC_cfg_file_CP',\ + blank=True,null=True) + cfg_dir = models.ManyToManyField(CfgPath, related_name='NC_cfg_dir_CP',\ + blank=True,null=True) + object_cache_file = models.ForeignKey(CfgPath, related_name='NC_ocf_CP',\ +- default=lambda : CfgPath.get('/var/nagios/objects.cache').id) ++ default=lambda : CfgPath.get('/var/cache/icinga/objects.cache').id) + precached_object_file = models.ForeignKey(CfgPath, related_name='NC_pof_CP',\ +- default=lambda : CfgPath.get('/var/nagios/objects.precache').id) ++ default=lambda : CfgPath.get('/var/cache/icinga/objects.precache').id) + resource_file = models.ForeignKey(CfgPath, related_name='NC_rf_CP',\ +- default=lambda : CfgPath.get('/etc/nagios/resource.cfg').id) ++ default=lambda : CfgPath.get('/etc/icinga/resource.cfg').id) + temp_file = models.ForeignKey(CfgPath, related_name='NC_tf_CP',\ +- default=lambda : CfgPath.get('/var/nagios/nagios.tmp').id) ++ default=lambda : CfgPath.get('/var/cache/icinga/icinga.tmp').id) + temp_path = models.ForeignKey(CfgPath, related_name='NC_tp_CP',\ + default=lambda : CfgPath.get('/tmp').id) + status_file = models.ForeignKey(CfgPath, related_name='NC_sf_CP',\ +- default=lambda : CfgPath.get('/var/nagios/status.dat').id) ++ default=lambda : CfgPath.get('/var/lib/icinga/status.dat').id) + status_update_interval = models.IntegerField(default=1) + nagios_user = models.CharField(max_length=20, default='nagios') + nagios_group = models.CharField(max_length=20, default='nagios') +@@ -1200,19 +1200,19 @@ class NagiosCfg(NagiosObject, models.Mod + enable_event_handlers = models.NullBooleanField(blank=True,null=True) + log_rotation_method = models.CharField(max_length=1, choices=LOG_ROTATION_METHODS, default='n') + log_archive_path = models.ForeignKey(CfgPath, related_name='NC_laf_CP',\ +- default=lambda : CfgPath.get('/var/log/nagios/archives').id) ++ default=lambda : CfgPath.get('/var/log/icinga/archives').id) + check_external_commands = models.NullBooleanField(blank=True,null=True) + command_check_interval = models.IntegerField(default=1) + command_file = models.ForeignKey(CfgPath, related_name='NC_cf_CP',\ +- default=lambda : CfgPath.get('/var/nagios/rw/nagios.cmd').id) ++ default=lambda : CfgPath.get('/var/lib/icinga/rw/icinga.cmd').id) + external_command_buffer_slots = models.IntegerField(default=512) + check_for_updates = models.NullBooleanField(blank=True,null=True) + bare_update_checks = models.NullBooleanField(default=False) + lock_file = models.ForeignKey(CfgPath, related_name='NC_lckf_CP',\ +- default=lambda : CfgPath.get('/var/nagios/rw/nagios.cmd').id) ++ default=lambda : CfgPath.get('/var/lib/icinga/rw/icinga.cmd').id) + retain_state_information = models.NullBooleanField(blank=True,null=True) + state_retention_file = models.ForeignKey(CfgPath, related_name='NC_srf_CP',\ +- default=lambda : CfgPath.get('/var/nagios/retention.dat').id) ++ default=lambda : CfgPath.get('/var/cache/icinga/retention.dat').id) + retention_update_interval = models.IntegerField(default=60) + use_retained_program_state = models.NullBooleanField(blank=True,null=True) + use_retained_scheduling_info = models.NullBooleanField(blank=True,null=True) +@@ -1242,7 +1242,7 @@ class NagiosCfg(NagiosObject, models.Mod + check_result_reaper_frequency = models.IntegerField(default=10) + max_check_result_reaper_time = models.IntegerField(default=60) + check_result_path = models.ForeignKey(CfgPath, related_name='NC_crp_CP',\ +- default=lambda : CfgPath.get('/var/nagios/spool/checkresults').id) ++ default=lambda : CfgPath.get('/var/lib/icinga/spool/checkresults').id) + max_check_result_file_age = models.IntegerField(default=3600) + # users can insert a choice or a proper value. This is why we keep it as a charfield + host_inter_check_delay_method = models.CharField(max_length=6) +@@ -1329,7 +1329,7 @@ class NagiosCfg(NagiosObject, models.Mod + choices=(('0','basic'),('1','detailed'),('1','extreme'))) + max_debug_file_size = models.IntegerField(default=1000000) + p1_file = models.ForeignKey(CfgPath, related_name='NC_p1f_CP',\ +- default=lambda : CfgPath.get('/usr/bin/p1.pl').id) ++ default=lambda : CfgPath.get('/usr/lib/icinga/p1.pl').id) + daemon_dumps_core = models.NullBooleanField(default=False) + bare_update_check = models.NullBooleanField(default=False) + +--- a/djagios/common/utils.py ++++ b/djagios/common/utils.py +@@ -52,9 +52,9 @@ class Exporter(): + # creating the objects dir + if not os.path.exists(os.path.join(path, 'objects')): + os.mkdir(os.path.join(path, 'objects')) +- # removing previous nagios.cfg +- if os.path.exists(os.path.join(path, 'nagios.cfg')): +- os.remove(os.path.join(path, 'nagios.cfg')) ++ # removing previous icinga.cfg ++ if os.path.exists(os.path.join(path, 'icinga.cfg')): ++ os.remove(os.path.join(path, 'icinga.cfg')) + OBJECT_LIST = (Host, HostGroup, Service, ServiceGroup, Command, TimePeriod,\ + Contact, ContactGroup,) + for o in OBJECT_LIST: +--- a/djagios/import.py ++++ b/djagios/import.py +@@ -759,7 +759,7 @@ if __name__ == '__main__': + help="Submit the server name for the config"), + make_option("-p", "--path", + action="store", dest="path", +- default='/etc/nagios/nagios.cfg', ++ default='/etc/icinga/icinga.cfg', + help="Path of the main configuration file."), + make_option("-d", "--debuglevel", + action="store", dest="debuglevel", diff -Nru djagios-0.1.3+dfsg/debian/patches/series djagios-0.1.3+dfsg/debian/patches/series --- djagios-0.1.3+dfsg/debian/patches/series 2015-11-09 11:25:05.000000000 +0000 +++ djagios-0.1.3+dfsg/debian/patches/series 2016-12-11 17:17:44.000000000 +0000 @@ -1 +1,2 @@ 0001-Remove-version-from-jquery.min.js-include.patch +icinga.patch