Rename packages

diff --git a/debian/check-mk-config-icinga.install b/debian/check-mk-config-icinga.install
new file mode 100644 (file)
index 0000000..42d7836
--- /dev/null
+++ b/debian/check-mk-config-icinga.install
@@ -0,0 +1 @@
+usr/share/doc/check_mk/check_mk_templates.cfg etc/icinga/objects

diff --git a/debian/check-mk-config-icinga.links b/debian/check-mk-config-icinga.links
new file mode 100644 (file)
index 0000000..3bf633c
--- /dev/null
+++ b/debian/check-mk-config-icinga.links
@@ -0,0 +1,2 @@
+usr/share/check_mk/modules/defaults    usr/share/check_mk/web/htdocs/defaults.py
+

diff --git a/debian/check-mk-config-nagios3.install b/debian/check-mk-config-nagios3.install
new file mode 100644 (file)
index 0000000..42d7836
--- /dev/null
+++ b/debian/check-mk-config-nagios3.install
@@ -0,0 +1 @@
+usr/share/doc/check_mk/check_mk_templates.cfg etc/icinga/objects

diff --git a/debian/check-mk-config-nagios3.links b/debian/check-mk-config-nagios3.links
new file mode 100644 (file)
index 0000000..3bf633c
--- /dev/null
+++ b/debian/check-mk-config-nagios3.links
@@ -0,0 +1,2 @@
+usr/share/check_mk/modules/defaults    usr/share/check_mk/web/htdocs/defaults.py
+

diff --git a/debian/check-mk-multisite.install b/debian/check-mk-multisite.install
index c1229038c300c7e6a696c072cd32abf87ad18448..f56323b294b7aba24954c21d4b256078a8fba39f 100644 (file)
--- a/debian/check-mk-multisite.install
+++ b/debian/check-mk-multisite.install
@@ -1,4 +1,3 @@
 usr/share/check_mk/web
-etc/apache2/conf.d/zzz_check_mk.conf
 etc/check_mk/multisite.mk
 var/lib/check_mk/web

diff --git a/debian/check-mk-server-common.dirs b/debian/check-mk-server-common.dirs
deleted file mode 100644 (file)
index ed24ece..0000000
--- a/debian/check-mk-server-common.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/check_mk/conf.d
-var/lib/check_mk

diff --git a/debian/check-mk-server-common.install b/debian/check-mk-server-common.install
deleted file mode 100644 (file)
index dd0b09f..0000000
--- a/debian/check-mk-server-common.install
+++ /dev/null
@@ -1,6 +0,0 @@
-etc/check_mk/main.mk
-etc/check_mk/conf.d/README
-var/lib/check_mk/{autochecks,cache,counters,logwatch,packages,precompiled,rrd}
-usr/bin/check_mk
-usr/share/doc/check_mk/check_mk_templates.cfg
-usr/share/check_mk/modules

diff --git a/debian/check-mk-server-icinga.install b/debian/check-mk-server-icinga.install
deleted file mode 100644 (file)
index 42d7836..0000000
--- a/debian/check-mk-server-icinga.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/check_mk/check_mk_templates.cfg etc/icinga/objects

diff --git a/debian/check-mk-server-icinga.links b/debian/check-mk-server-icinga.links
deleted file mode 100644 (file)
index 3bf633c..0000000
--- a/debian/check-mk-server-icinga.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/check_mk/modules/defaults    usr/share/check_mk/web/htdocs/defaults.py
-

diff --git a/debian/check-mk-server-nagios3.links b/debian/check-mk-server-nagios3.links
deleted file mode 100644 (file)
index 3bf633c..0000000
--- a/debian/check-mk-server-nagios3.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/check_mk/modules/defaults    usr/share/check_mk/web/htdocs/defaults.py
-

diff --git a/debian/check-mk-server.debhelper.log b/debian/check-mk-server.debhelper.log
deleted file mode 100644 (file)
index 4607666..0000000
--- a/debian/check-mk-server.debhelper.log
+++ /dev/null
@@ -1,16 +0,0 @@
-dh_prep
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_install
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_shlibdeps
-dh_gencontrol
-dh_md5sums
-dh_builddeb

diff --git a/debian/check-mk-server.dirs b/debian/check-mk-server.dirs
new file mode 100644 (file)
index 0000000..ed24ece
--- /dev/null
+++ b/debian/check-mk-server.dirs
@@ -0,0 +1,2 @@
+etc/check_mk/conf.d
+var/lib/check_mk

diff --git a/debian/check-mk-server.install b/debian/check-mk-server.install
new file mode 100644 (file)
index 0000000..dd0b09f
--- /dev/null
+++ b/debian/check-mk-server.install
@@ -0,0 +1,6 @@
+etc/check_mk/main.mk
+etc/check_mk/conf.d/README
+var/lib/check_mk/{autochecks,cache,counters,logwatch,packages,precompiled,rrd}
+usr/bin/check_mk
+usr/share/doc/check_mk/check_mk_templates.cfg
+usr/share/check_mk/modules

diff --git a/debian/check-mk-server.substvars b/debian/check-mk-server.substvars
deleted file mode 100644 (file)
index abd3ebe..0000000
--- a/debian/check-mk-server.substvars
+++ /dev/null
@@ -1 +0,0 @@
-misc:Depends=

diff --git a/debian/control b/debian/control
index 98006a871747b026a176f1e1fe7a3bb1deeb41f8..ad83980ce102a39e20ab9bfdd83b2231445bda3c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -19,9 +19,9 @@ Description: general purpose nagios-plugin for retrieving data
  .
  This package contains the agent part of check-mk.
 
-Package: check-mk-server-common
+Package: check-mk-server
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, python, check-mk-config-nagios3 | check-mk-config-icinga
 Description: general purpose nagios-plugin for retrieving data
  Check_mk adopts a new a approach for collecting data from operating systems
  and network components. It obsoletes NRPE, check_by_ssh, NSClient and
@@ -32,10 +32,10 @@ Description: general purpose nagios-plugin for retrieving data
  .
  This package contains the server part of check_mk
 
-Package: check-mk-server-icinga
-Conflicts: check-mk-server-nagios3
+Package: check-mk-config-icinga
+Conflicts: check-mk-config-nagios3
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, check-mk-server-common
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: general purpose nagios-plugin for retrieving data
  Check_mk adopts a new a approach for collecting data from operating systems
  and network components. It obsoletes NRPE, check_by_ssh, NSClient and
@@ -46,10 +46,10 @@ Description: general purpose nagios-plugin for retrieving data
  .
  This package contains the icinga specific part of check_mk
 
-Package: check-mk-server-nagios3
+Package: check-mk-config-nagios3
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, check-mk-server-common
-Conflicts: check-mk-server-icinga
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: check-mk-config-icinga
 Description: general purpose nagios-plugin for retrieving data
  Check_mk adopts a new a approach for collecting data from operating systems
  and network components. It obsoletes NRPE, check_by_ssh, NSClient and
@@ -76,7 +76,7 @@ Description: general purpose nagios-plugin for retrieving data
 
 Package: check-mk-multisite
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libapache2-mod-python, check-mk-server-nagios3 | check-mk-server-icinga
+Depends: ${shlibs:Depends}, ${misc:Depends}, libapache2-mod-python, check-mk-config-nagios3 | check-mk-config-icinga
 Suggests: check-mk-livestatus
 Description: general purpose nagios-plugin for retrieving data
  Check_mk adopts a new a approach for collecting data from operating systems

diff --git a/debian/rules b/debian/rules
index fc00f3428b7814973cf027a6adc18df3020f2625..0dd93b56ea7778f2b8d957ac5b53e47ecf9bbf79 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,15 +59,18 @@ install: build
        # We need 2 different "defaults" files for Icinga and Nagios3
        rm debian/tmp/usr/share/check_mk/modules/defaults
        rm debian/tmp/usr/share/check_mk/web/htdocs/defaults.py
-       mkdir -p debian/check-mk-server-icinga/usr/share/check_mk/modules/
-       cp debian/defaults.icinga debian/check-mk-server-icinga/usr/share/check_mk/modules/defaults
-       mkdir -p debian/check-mk-server-nagios3/usr/share/check_mk/modules/
-       cp debian/defaults.nagios3 debian/check-mk-server-nagios3/usr/share/check_mk/modules/defaults
+       mkdir -p debian/check-mk-config-icinga/usr/share/check_mk/modules/
+       cp debian/defaults.icinga debian/check-mk-config-icinga/usr/share/check_mk/modules/defaults
+       mkdir -p debian/check-mk-config-nagios3/usr/share/check_mk/modules/
+       cp debian/defaults.nagios3 debian/check-mk-config-nagios3/usr/share/check_mk/modules/defaults
        # We need 2 different Apache configs
-       mkdir -p debian/check-mk-server-icinga/etc/apache2/conf.d/
-       cp debian/apache.icinga debian/check-mk-server-icinga/etc/apache2/conf.d/check-mk-multisite.conf
-       mkdir -p debian/check-mk-server-nagios3/etc/apache2/conf.d/
-       cp debian/apache.nagios3 debian/check-mk-server-nagios3/etc/apache2/conf.d/check-mk-multisite.conf
+       mkdir -p debian/check-mk-config-icinga/etc/apache2/conf.d/
+       cp debian/apache.icinga debian/check-mk-config-icinga/etc/apache2/conf.d/check-mk-multisite.conf
+       mkdir -p debian/check-mk-config-nagios3/etc/apache2/conf.d/
+       cp debian/apache.nagios3 debian/check-mk-config-nagios3/etc/apache2/conf.d/check-mk-multisite.conf
+       # Adjust path names
+       # sed -i 's#/nagios/cgi-bin/#/cgi-bin/icinga/#' debian/tmp/check-mk-config-icinga/etc/icinga/objects/check_mk_templates.cfg
+       # sed -i 's#/nagios/cgi-bin/#/cgi-bin/nagios3/#' debian/tmp/check-mk-config-nagios3/etc/nagios3/conf.d/check_mk_templates.cfg
        # Prepare agent files
        cp debian/tmp/usr/share/check_mk/agents/check_mk_agent.linux debian/check-mk-agent/usr/bin/check_mk_agent
        chmod +x debian/check-mk-agent/usr/bin/check_mk_agent