Fixed configuration inporter

Vitexus · Vitexus · commit 478e0cbcac6d · 2016-08-02T00:57:17.000+02:00
Added manpage for configuration inporter
Updated Config File for Icinga Exchange
diff --git a/debian/README.Debian b/debian/README.Debian
@@ -1,7 +1,8 @@
-Ease framework for Debian
+IcingaEditor for Debian
 -------------------
     
-    Is installed by standart way in /usr/share/php/Ease
+    Is installed by standard way in /usr/share/icinga-editor
+    By default you can use on: http://localhost/icinga-editor
 
- -- Vítězslav Dvořák <vitex@hippy.cz>  Ne říj 21 15:17:56 CEST 2012
+ -- Vítězslav Dvořák <vitex@hippy.cz>  Po Srp 01 00:00:00 CEST 2016
 
diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-icinga-editor (1.0-1) UNRELEASED; urgency=medium
+icinga-editor (1.0-11) UNRELEASED; urgency=medium
 
   [ dvorak ]
   * Initial release. (Closes: #XXXXXX)
@@ -92,5 +92,15 @@ icinga-editor (1.0-1) UNRELEASED; urgency=medium
   * Screenshots cropped
   * Screenshots cropped
   * Screenshots cropped
+  * Fixed config files import during debian package install process
+  * Fixed config files import during debian package install process
+  * Fixed config files import during debian package install process
+  * Fixed config files import during debian package install process
+  * Fixed config files import during debian package install process
+  * Fixed config files import during debian package install process
+  * Fixed config files import during debian package install process
+  * Fixed config files import during debian package install process
+  * Fixed config files import during debian package install process
+  * Fixed config files import during debian package install process
 
- -- vitex <vitex@developer.kancl.brevnov.czf>  Mon, 01 Aug 2016 20:55:29 +0200
+ -- vitex <vitex@developer.kancl.brevnov.czf>  Tue, 02 Aug 2016 00:41:20 +0200
diff --git a/debian/conf/composer.json b/debian/conf/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "vitexsoftware/icinga-editor",
     "description": "Editor of Icinga Configuration files (debianized)",
-    "version": "1.0.1",
+    "version": "1.0.11",
     "authors": [
         {
             "name": "vitex",
diff --git a/debian/control b/debian/control
@@ -12,7 +12,7 @@ Recommends: mysql-server,icinga-web, icinga-web-config-icinga, graphicsmagick-im
 Architecture: all
 Section: web
 Priority: optional
-Description: Editor konfigurace icingy
- Vygeneruje konfiguraci Iingy pro jednotlivé uživatele a jimi zvolené způsoby notifikace
+Description: Icinga Configuration Web Interface
+ Tool for generation icinga 1.x configuration for multiplete users.
 
 
diff --git a/debian/docs/iecfgimporter.1 b/debian/docs/iecfgimporter.1
@@ -0,0 +1,20 @@
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+.TH iecfgimporter 1 "August 2, 2016" "" "Icinga Editor Config importer"
+
+.SH NAME
+iecfgimporter \- program for import icinga/nagios config files into Icinga Editor database
+
+.SH SYNOPSIS
+.B iecfgimporter
+.br
+
+.SH DESCRIPTION
+This manual page explains the use of 
+.B iecfgimporter
+Simply run /usr/bin/iecfgimporter. It read all configuration files in /etc/icinga/directory and import it into Icinga Editor database. Thus you can generate an copy of original configuration from web interface.
+.PP
+\fBiecfgimporter\fP is for initial database population.
+
+.SH "SEE ALSO"
+https://github.com/VitexSoftware/Icinga-Editor
diff --git a/debian/manpages b/debian/manpages
@@ -0,0 +1,3 @@
+debian/docs/iecfgimporter.1
+
+
diff --git a/debian/postinst b/debian/postinst
@@ -111,7 +111,7 @@ if [ ! -f $IECFG ] ; then
             # Check their answer.
             db_get icinga-editor/IMPORT_CONFIG
             if [ "$RET" = "true" ]; then
-                /usr/bin/iecfgimporter
+                iecfgimporter
             fi
     fi
 
diff --git a/debian/revison b/debian/revison
@@ -1 +1 @@
-1
+11
diff --git a/debian/rules b/debian/rules
@@ -7,6 +7,6 @@ override_dh_install:
 	dh_install
 	sed -i -e 's/..\//.\//g' debian/icinga-editor/usr/share/icinga-editor/about.php
 	sed -i -e 's/..\/locale/\/usr\/share\/locale/g' debian/icinga-editor/usr/share/icinga-editor/includes/IEInit.php
+	sed -i -e 's/..\/includes/\/usr\/share\/icinga-editor\/includes/g' debian/icinga-editor/usr/bin/iecfgimporter.php
 	sed -i -e 's/..\/i18n/\/usr\/share\/locale/g' debian/icinga-editor/usr/share/icinga-editor/includes/IEInit.php
-        mv debian/icinga-editor/usr/bin/iecfgimporter.php debian/icinga-editor/usr/bin/iecfgimporter
-
+	mv debian/icinga-editor/usr/bin/iecfgimporter.php debian/icinga-editor/usr/bin/iecfgimporter
diff --git a/debian/templates b/debian/templates
@@ -1,16 +1,18 @@
 Template: icinga-editor/SEND_MAILS_FROM
 Type: string
-Description: mail address of icinga admin 
+Description: mail address of icinga admin:
+ Where to send info about new signups etc.
  Or simply press enter to use auto genrated name
 
 Template: icinga-editor/ICINGA_SERVER_IP
 Type: string
-Description: IP address of ICINGA server
+Description: IP address of ICINGA server:
+ Enter public IP of this machine 
  Or simply press enter to use auto genrated value
 
 Template: icinga-editor/IMPORT_CONFIG
 Type: boolean
 Default: true
 Description: Import icinga config files ?
- Choose yes to import all config files in /etc/icinga directory into database.
+ Now you can import all config files in /etc/icinga directory into database.
  Imported files remain renamed to *.disabled
diff --git a/icingaexchange.yml b/icingaexchange.yml
@@ -1,6 +1,6 @@
-name: icinga_configurator
+name: Icinga Editor
 description: "file:///README.md"
-url: "https://www.vitexsoftware.cz/monitoring.php"
+url: "https://github.com/VitexSoftware/Icinga-Editor"
 tags: Monitoring, Configurator
 vendor: Debian
 target: Inventory,Database
diff --git a/src/bin/iecfgimporter.php b/src/bin/iecfgimporter.php
@@ -1,4 +1,4 @@
-#!/usr/bin/env php -q
+#!/usr/bin/env php
 <?php
 //namespace Icinga\Editor;
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vitexsoftware/icinga-editor",`
`3`	`3`	`"description": "Editor of Icinga Configuration files (debianized)",`
`4`		`- "version": "1.0.1",`
	`4`	`+ "version": "1.0.11",`
`5`	`5`	`"authors": [`
`6`	`6`	`{`
`7`	`7`	`"name": "vitex",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+debian/docs/iecfgimporter.1`
	`2`	`+`
	`3`	`+`