[Pkg-nagios-changes] [pkg-icingaweb2] 01/01: Merge icingaweb2-common and icingacli in icingaweb2
Markus Frosch
lazyfrosch at moszumanska.debian.org
Wed Mar 11 09:08:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
lazyfrosch pushed a commit to branch master
in repository pkg-icingaweb2.
commit 6cb006135c859789c8c0b229d52f473ba198a0ff
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Wed Mar 11 10:06:57 2015 +0100
Merge icingaweb2-common and icingacli in icingaweb2
---
debian/control | 42 ++++++----------------
debian/icingacli.install | 3 --
debian/icingaweb2-common.install | 1 -
debian/icingaweb2-common.postinst | 40 ---------------------
debian/{icingaweb2-common.dirs => icingaweb2.dirs} | 0
debian/icingaweb2.install | 5 +++
debian/icingaweb2.postinst | 21 +++++++++++
7 files changed, 36 insertions(+), 76 deletions(-)
diff --git a/debian/control b/debian/control
index 9cde869..07cfe49 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: icingaweb2
Section: admin
Priority: extra
-Maintainer: Icinga Development Team <info at icinga.org>
+Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
Uploaders:
Markus Frosch <lazyfrosch at debian.org>
Build-Depends:
@@ -16,7 +16,7 @@ Package: icingaweb2
Architecture: all
Depends:
adduser,
- icingaweb2-common,
+ php-icinga (= ${source:Version}),
# 4.4 in wheezy - TODO: test
php-htmlpurifier (>= 4.4),
php-dompdf (>= 0.6.1),
@@ -27,6 +27,7 @@ Depends:
Recommends:
apache2 | httpd,
php5 (>= 5.3.2),
+ php5-cli (>= 5.3.2),
php5-ldap,
icingaweb2-module-monitoring,
icingaweb2-module-doc,
@@ -41,36 +42,14 @@ Description: simple and responsive web interface for Icinga
.
Backends can be IDO and Livestatus, while supporting Icinga 1 and 2.
.
- This package installs the web interface with all needed dependencies.
-
-Package: icingaweb2-common
-Architecture: all
-Depends:
- adduser,
- php-icinga,
- ${misc:Depends}
-Description: simple and responsive web interface for Icinga - common files
- Icinga Web 2 is a very modular, fast and simple web interface for your Icinga
- monitoring environment.
- .
- This package provides common files and paths.
-
-Package: icingacli
-Architecture: all
-Depends:
- icingaweb2-common,
- php5-cli (>= 5.3.2),
- ${misc:Depends}
-Description: CLI tool for the Icinga Web 2 framework
- Icinga Web 2 is a very modular, fast and simple web interface for your Icinga
- monitoring environment.
- .
- Icinga CLI is a command line utility, allowing the admin to configure Icinga
+ `icingacli` is a command line utility, allowing the admin to configure Icinga
Web 2 and provides the possibility to query Icinga data from your shell.
+ .
+ This package installs the web interface with all needed dependencies.
Package: icingaweb2-module-monitoring
Architecture: all
-Depends: icingaweb2-common, ${misc:Depends}
+Depends: icingaweb2 (= ${source:Version}), ${misc:Depends}
Description: simple and responsive web interface for Icinga - monitoring module
Icinga Web 2 is a very modular, fast and simple web interface for your Icinga
monitoring environment.
@@ -80,7 +59,7 @@ Description: simple and responsive web interface for Icinga - monitoring module
Package: icingaweb2-module-doc
Section: doc
Architecture: all
-Depends: icingaweb2-common, ${misc:Depends}
+Depends: icingaweb2 (= ${source:Version}), ${misc:Depends}
Description: simple and responsive web interface for Icinga - documentation module
Icinga Web 2 is a very modular, fast and simple web interface for your Icinga
monitoring environment.
@@ -90,7 +69,7 @@ Description: simple and responsive web interface for Icinga - documentation modu
Package: icingaweb2-module-setup
Architecture: all
-Depends: icingaweb2-common, ${misc:Depends}
+Depends: icingaweb2 (= ${source:Version}), ${misc:Depends}
Description: simple and responsive web interface for Icinga - setup module
Icinga Web 2 is a very modular, fast and simple web interface for your Icinga
monitoring environment.
@@ -98,7 +77,7 @@ Description: simple and responsive web interface for Icinga - setup module
This module provides the setup wizard to bootstrap your Icinga Web 2
configuration.
.
- It will be disabled after setup, and can be removed later.
+ It will be disabled after the initial setup, and may be removed later.
Package: php-icinga
Section: php
@@ -107,7 +86,6 @@ Depends:
php5 (>= 5.3.2),
zendframework,
${misc:Depends}
-# | icingaweb-vendor-zend
Recommends:
php5-mysql | php5-mysqlnd | php5-pgsql,
php5-json
diff --git a/debian/icingacli.install b/debian/icingacli.install
deleted file mode 100644
index 463ffbc..0000000
--- a/debian/icingacli.install
+++ /dev/null
@@ -1,3 +0,0 @@
-packages/files/bin/icingacli usr/bin
-etc/bash_completion.d
-application/clicommands usr/share/icingaweb2/application
diff --git a/debian/icingaweb2-common.install b/debian/icingaweb2-common.install
deleted file mode 100644
index a7efd0e..0000000
--- a/debian/icingaweb2-common.install
+++ /dev/null
@@ -1 +0,0 @@
-application/locale usr/share/icingaweb2/application
diff --git a/debian/icingaweb2-common.postinst b/debian/icingaweb2-common.postinst
deleted file mode 100644
index 683d31a..0000000
--- a/debian/icingaweb2-common.postinst
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-setperm() {
- user="$1"
- group="$2"
- mode="$3"
- file="$4"
- shift 4
- # only do something when no setting exists
- if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
- chown "$user":"$group" "$file"
- chmod "$mode" "$file"
- fi
-}
-
-case "$1" in
- configure)
- if ! getent group icingaweb2 > /dev/null ; then
- echo 'Adding system-group for icingaweb2' 1>&2
- addgroup --system icingaweb2 >/dev/null
- fi
-
- # secure configuration directory and allow config access
- setperm root icingaweb2 2770 /etc/icingaweb2
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/icingaweb2-common.dirs b/debian/icingaweb2.dirs
similarity index 100%
rename from debian/icingaweb2-common.dirs
rename to debian/icingaweb2.dirs
diff --git a/debian/icingaweb2.install b/debian/icingaweb2.install
index 8b6478c..6870ecb 100644
--- a/debian/icingaweb2.install
+++ b/debian/icingaweb2.install
@@ -1,6 +1,10 @@
+packages/files/bin/icingacli usr/bin
+
public doc usr/share/icingaweb2
+application/clicommands usr/share/icingaweb2/application
application/controllers usr/share/icingaweb2/application
+application/locale usr/share/icingaweb2/application
# TODO: embedded font here
application/fonts usr/share/icingaweb2/application
application/forms usr/share/icingaweb2/application
@@ -8,6 +12,7 @@ application/layouts usr/share/icingaweb2/application
application/views usr/share/icingaweb2/application
etc/schema usr/share/icingaweb2/etc
+etc/bash_completion.d
packages/files/public/index.php usr/share/icingaweb2/public
debian/icingaweb2.conf etc/apache2/conf-available
diff --git a/debian/icingaweb2.postinst b/debian/icingaweb2.postinst
index ec7043d..fb85bee 100644
--- a/debian/icingaweb2.postinst
+++ b/debian/icingaweb2.postinst
@@ -2,8 +2,29 @@
set -e
+setperm() {
+ user="$1"
+ group="$2"
+ mode="$3"
+ file="$4"
+ shift 4
+ # only do something when no setting exists
+ if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
+ chown "$user":"$group" "$file"
+ chmod "$mode" "$file"
+ fi
+}
+
case "$1" in
configure)
+ if ! getent group icingaweb2 > /dev/null ; then
+ echo 'Adding system-group for icingaweb2' 1>&2
+ addgroup --system icingaweb2 >/dev/null
+ fi
+
+ # secure configuration directory and allow config access
+ setperm root icingaweb2 2770 /etc/icingaweb2
+
COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
if ! getent group icingaweb2 | grep -q www-data; then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git
More information about the Pkg-nagios-changes
mailing list