[Pkg-nagios-changes] [pkg-icinga2] 01/03: Updated classicui package
Markus Frosch
lazyfrosch-guest at alioth.debian.org
Tue Oct 22 12:52:26 UTC 2013
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga2.
commit 655458691b7c4de8fea95e4807b8b5820db88db8
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Tue Oct 22 14:51:35 2013 +0200
Updated classicui package
---
debian/classicui/apache2.conf | 10 +++---
debian/classicui/cgi.cfg | 4 +--
debian/classicui/index.html | 4 +--
debian/classicui/main.html | 42 -----------------------
debian/classicui/menu.html | 60 ++++++++++++++++----------------
debian/control | 7 ++--
debian/icinga2-classicui.config | 35 +++++++++++++++++++
debian/icinga2-classicui.links | 3 ++
debian/icinga2-classicui.postinst | 59 +++++++++++++++++++++++++++++---
debian/icinga2-classicui.postrm | 42 +++++++++++++++--------
debian/icinga2-classicui.templates | 34 +++++++++++++++++++
debian/po/templates.pot | 66 ++++++++++++++++++++++++++++++++++++
12 files changed, 265 insertions(+), 101 deletions(-)
diff --git a/debian/classicui/apache2.conf b/debian/classicui/apache2.conf
index 92e3949..cbc7661 100644
--- a/debian/classicui/apache2.conf
+++ b/debian/classicui/apache2.conf
@@ -1,18 +1,18 @@
# apache configuration for icinga
-ScriptAlias /cgi-bin/icinga2-classicui /usr/lib/cgi-bin/icinga
+ScriptAlias /cgi-bin/icinga2-classicui /usr/lib/cgi-bin/icinga2-classicui
# Where the stylesheets (config files) reside
-Alias /icinga2-classicui/stylesheets /etc/icinga/stylesheets
+Alias /icinga2-classicui/stylesheets /etc/icinga2/classicui/stylesheets
# Where the HTML pages live
-Alias /icinga2-classicui /usr/share/icinga/htdocs
+Alias /icinga2-classicui /usr/share/icinga2/classicui
<LocationMatch "^/cgi-bin/icinga2-classicui">
- SetEnv ICINGA_CGI_CONFIG /etc/icinga2/cgi.cfg
+ SetEnv ICINGA_CGI_CONFIG /etc/icinga2/classicui/cgi.cfg
</LocationMatch>
-<DirectoryMatch "^(?:/usr/share/icinga/htdocs|/usr/lib/cgi-bin/icinga|/etc/icinga/stylesheets)/">
+<DirectoryMatch "^(?:/usr/share/icinga2/classicui/htdocs|/usr/lib/cgi-bin/icinga2-classicui|/etc/icinga2/classicui/stylesheets)/">
Options FollowSymLinks
DirectoryIndex index.html
diff --git a/debian/classicui/cgi.cfg b/debian/classicui/cgi.cfg
index 64e823e..eb7316a 100644
--- a/debian/classicui/cgi.cfg
+++ b/debian/classicui/cgi.cfg
@@ -4,8 +4,8 @@
# check http://docs.icinga.org for option details
standalone_installation=1
physical_html_path=/usr/share/icinga
-url_html_path=/icinga2-classic
-url_stylesheets_path=/icinga2-classic/stylesheets
+url_html_path=/icinga2-classicui
+url_stylesheets_path=/icinga2-classicui/stylesheets
http_charset=utf-8
refresh_rate=30
refresh_type=1
diff --git a/debian/classicui/index.html b/debian/classicui/index.html
index e13dd55..1565646 100644
--- a/debian/classicui/index.html
+++ b/debian/classicui/index.html
@@ -7,10 +7,10 @@
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico" />
</head>
<frameset frameborder="0" framespacing="0" rows="72,*" onLoad='document.title="Icinga: "+window.location.hostname; document.getElementById("main").focus();'>
- <frame src="/cgi-bin/icinga2-classic/tac.cgi?tac_header" name="top" target="main" scrolling="no" />
+ <frame src="/cgi-bin/icinga2-classicui/tac.cgi?tac_header" name="top" target="main" scrolling="no" />
<frameset frameborder="0" framespacing="0" cols="200,*">
<frame src="menu.html" name="menu" target="main" scrolling="auto"/>
- <frame src="/cgi-bin/icinga2-classic/tac.cgi" name="main" />
+ <frame src="/cgi-bin/icinga2-classicui/tac.cgi" name="main" />
</frameset>
</frameset>
<noframes>
diff --git a/debian/classicui/main.html b/debian/classicui/main.html
deleted file mode 100644
index 24e4aa6..0000000
--- a/debian/classicui/main.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<HTML>
-
-<HEAD>
-<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
-<TITLE>Icinga</TITLE>
-<LINK REL='stylesheet' TYPE='text/css' HREF='stylesheets/common.css'>
-</HEAD>
-
-<BODY id="splashpage">
-
-
-<div id="mainbrandsplash">
-<div id="mainlogo">
-<a href="http://www.icinga.org/" target="_blank"><img src="images/logofullsize.png" border="0" alt="Icinga" title="Icinga"></a>
-</div>
-</div>
-
-<div id="currentversioninfo">
-<div class="version">Version 1.9.3</div>
-<div class="releasedate">July 07, 2013</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.9.3</a></div>
-</div>
-
-<div id="developer">
-<div class="doxygen"><a href="doxygen/html/index.html">Developer Docs</a><br>(only working if you installed them)</div>
-</div>
-
-<div id="mainfooter">
-<div id="maincopy">Copyright © 2009-2013 Icinga Development Team.<br>Portions copyright by Nagios/Icinga community members - see the THANKS file for more information.</div>
-<div CLASS="disclaimer">
-Icinga is licensed under the GNU General Public License and is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE. </div>
-<div CLASS="disclaimer">
-Nagios and the Nagios logo are trademarks, servicemarks, registered trademarks or registered servicemarks owned by Nagios Enterprises, LLC. Usage of the Nagios marks are governed by their <A href="http://www.nagios.org/legal/trademarkpolicy/">trademark policy</a>.
-</div>
-</div>
-
-
-</BODY>
-</HTML>
-
diff --git a/debian/classicui/menu.html b/debian/classicui/menu.html
index 9467560..b578352 100644
--- a/debian/classicui/menu.html
+++ b/debian/classicui/menu.html
@@ -15,17 +15,19 @@
<h2>General</h2>
<ul>
<li class="menuli_style1"><a href="main.html" target="main">Home</a></li>
+ <!-- hidden for icinga2-classicui
<li class="menuli_style2">
<div class="flag">Documentation
<a class="flag" href="docs/de/index.html" target="main"><img src="docs/images/flags/de.png" /></a>
<a class="flag" href="docs/en/index.html" target="main"><img src="docs/images/flags/um_gb.png" /></a>
</div>
</li>
+ -->
<!-- classic search -->
<li class="menuli_style3">Search:</li>
<li class="menuli_style2">
<div class="navbarsearch">
- <form method="get" action="/cgi-bin/icinga2-classic/status.cgi" target="main">
+ <form method="get" action="/cgi-bin/icinga2-classicui/status.cgi" target="main">
<input type='text' name='search_string' style="width: 150px; padding: 2px; margin-left: 10px; border: 1px solid grey">
</form>
</div>
@@ -33,46 +35,46 @@
</ul>
<h2>Status</h2>
<ul>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/tac.cgi" target="main">Tactical Overview</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/status.cgi?style=hostdetail" target="main">Host Detail</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/status.cgi" target="main">Service Detail</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/status.cgi?hostgroup=all&style=overview" target="main">Hostgroup Overview</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/status.cgi?hostgroup=all&style=summary" target="main">Hostgroup Summary</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/status.cgi?servicegroup=all&style=overview" target="main">Servicegroup Overview</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/status.cgi?servicegroup=all&style=summary" target="main">Servicegroup Summary</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/statusmap.cgi?host=all" target="main">Status Map</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/tac.cgi" target="main">Tactical Overview</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/status.cgi?style=hostdetail" target="main">Host Detail</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/status.cgi" target="main">Service Detail</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/status.cgi?hostgroup=all&style=overview" target="main">Hostgroup Overview</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/status.cgi?hostgroup=all&style=summary" target="main">Hostgroup Summary</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/status.cgi?servicegroup=all&style=overview" target="main">Servicegroup Overview</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/status.cgi?servicegroup=all&style=summary" target="main">Servicegroup Summary</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/statusmap.cgi?host=all" target="main">Status Map</a></li>
</ul>
<h2>Problems</h2>
<ul>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/status.cgi?servicestatustypes=28" target="main">Service Problems</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/status.cgi?servicestatustypes=28&hoststatustypes=3&serviceprops=2097162" target="main">Unhandled Services</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/status.cgi?style=hostdetail&hoststatustypes=12" target="main">Host Problems</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/status.cgi?style=hostdetail&hoststatustypes=12&hostprops=2097162" target="main">Unhandled Hosts</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/status.cgi?allunhandledproblems" target="main">All Unhandled Problems</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/status.cgi?allproblems" target="main">All Problems</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/outages.cgi" target="main">Network Outages</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/status.cgi?servicestatustypes=28" target="main">Service Problems</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/status.cgi?servicestatustypes=28&hoststatustypes=3&serviceprops=2097162" target="main">Unhandled Services</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/status.cgi?style=hostdetail&hoststatustypes=12" target="main">Host Problems</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/status.cgi?style=hostdetail&hoststatustypes=12&hostprops=2097162" target="main">Unhandled Hosts</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/status.cgi?allunhandledproblems" target="main">All Unhandled Problems</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/status.cgi?allproblems" target="main">All Problems</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/outages.cgi" target="main">Network Outages</a></li>
</ul>
<h2>System</h2>
<ul>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/extinfo.cgi?&type=3" target="main">Comments</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/extinfo.cgi?&type=6" target="main">Downtime</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/extinfo.cgi?&type=0" target="main">Process Info</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/extinfo.cgi?&type=4" target="main">Performance Info</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/extinfo.cgi?&type=7" target="main">Scheduling Queue</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/extinfo.cgi?&type=3" target="main">Comments</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/extinfo.cgi?&type=6" target="main">Downtime</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/extinfo.cgi?&type=0" target="main">Process Info</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/extinfo.cgi?&type=4" target="main">Performance Info</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/extinfo.cgi?&type=7" target="main">Scheduling Queue</a></li>
</ul>
<h2>Reporting</h2>
<ul>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/trends.cgi" target="main">Trends</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/avail.cgi" target="main">Availability</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/histogram.cgi" target="main">Alert Histogram</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/history.cgi?host=all" target="main">Alert History</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/summary.cgi" target="main">Alert Summary</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classic/notifications.cgi?contact=all" target="main">Notifications</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/showlog.cgi" target="main">Event Log</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/trends.cgi" target="main">Trends</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/avail.cgi" target="main">Availability</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/histogram.cgi" target="main">Alert Histogram</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/history.cgi?host=all" target="main">Alert History</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/summary.cgi" target="main">Alert Summary</a></li>
+ <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/notifications.cgi?contact=all" target="main">Notifications</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/showlog.cgi" target="main">Event Log</a></li>
</ul>
<h2>Configuration</h2>
<ul>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classic/config.cgi" target="main">View Config</a></li>
+ <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/config.cgi" target="main">View Config</a></li>
</ul>
</div>
</body>
diff --git a/debian/control b/debian/control
index 6d58b84..908df2c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,8 @@ Build-Depends: automake,
libmysqlclient-dev,
libssl-dev,
libtool,
- python-dev
+ python-dev,
+ po-debconf
Standards-Version: 3.9.4
Homepage: http://www.icinga.org
@@ -73,7 +74,9 @@ Description: host and network monitoring system - documentation
Package: icinga2-classicui
Architecture: all
-Depends: icinga-cgi (>= 1.9.0~), ${misc:Depends}
+Depends: icinga2-common (= ${source:Version}),
+ icinga-cgi (>= 1.9.0~),
+ ${misc:Depends}
Recommends: apache2 | httpd
Description: host and network monitoring system - classic ui integration
Icinga 2 is still in development and not ready for production use!
diff --git a/debian/icinga2-classicui.config b/debian/icinga2-classicui.config
new file mode 100644
index 0000000..1931e04
--- /dev/null
+++ b/debian/icinga2-classicui.config
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+db_fget icinga2-classicui/adminpassword seen || true
+password_seen="$RET"
+
+if [ "$1" = "reconfigure" ]; then
+ password_seen=false
+fi
+
+if [ "$password_seen" != "true" ]; then
+ # the passwords are reset at the end of every postinst run,
+ # however, they are left in the "seen" state so that the
+ # admin is not prompted for them at every upgrade.
+ while [ ! "$passwordsmatch" ]; do
+ #only ask for a password if no htpasswd exists
+ db_input high icinga2-classicui/adminpassword || true
+ db_input high icinga2-classicui/adminpassword-repeat || true
+ db_go || true
+ db_get icinga2-classicui/adminpassword
+ p1="$RET"
+ db_get icinga2-classicui/adminpassword-repeat
+ p2="$RET"
+ if [ "$p1" = "$p2" ]; then
+ passwordsmatch="yes"
+ else
+ db_fset icinga2-classicui/adminpassword seen false
+ db_fset icinga2-classicui/adminpassword-repeat seen false
+ db_fset icinga2-classicui/adminpassword-mismatch seen false
+ db_input critical icinga2-classicui/adminpassword-mismatch || true
+ fi
+ done
+fi
+db_go || true
diff --git a/debian/icinga2-classicui.links b/debian/icinga2-classicui.links
index 4700007..d211d0b 100644
--- a/debian/icinga2-classicui.links
+++ b/debian/icinga2-classicui.links
@@ -1,8 +1,11 @@
+etc/icinga/stylesheets etc/icinga2/classicui/stylesheets
etc/icinga2/classicui/apache2.conf etc/apache2/conf-available/icinga2-classicui.conf
+usr/lib/cgi-bin/icinga usr/lib/cgi-bin/icinga2-classicui
#usr/share/icinga/htdocs/docs usr/share/icinga2/classicui/docs
usr/share/icinga/htdocs/images usr/share/icinga2/classicui/images
usr/share/icinga/htdocs/jquery-ui usr/share/icinga2/classicui/jquery-ui
usr/share/icinga/htdocs/jquery-ui-addon usr/share/icinga2/classicui/jquery-ui-addon
usr/share/icinga/htdocs/js usr/share/icinga2/classicui/js
+usr/share/icinga/htdocs/main.html usr/share/icinga2/classicui/main.html
usr/share/icinga/htdocs/media usr/share/icinga2/classicui/media
usr/share/icinga/htdocs/ssi usr/share/icinga2/classicui/ssi
diff --git a/debian/icinga2-classicui.postinst b/debian/icinga2-classicui.postinst
index f6438c7..13309f5 100644
--- a/debian/icinga2-classicui.postinst
+++ b/debian/icinga2-classicui.postinst
@@ -3,12 +3,36 @@
set -e
+. /usr/share/debconf/confmodule
+
+# shorthand
+en="/etc/icinga2/classicui"
+
+# location of the default apache configuration for icinga
+apacheconf=$en/apache2.conf
+# location of the default htpasswd authentication file.
+htpw=$en/htpasswd.users
+
+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 [ -x "`which i2enfeature`" ]; then
- echo "enabling icinga2 feature compat-log and statusdat"
- i2enfeature compat-log
- i2enfeature statusdat
+ if [ -x "`which icinga2-enable-feature`" ]; then
+ echo "enabling icinga2 feature compatlog and statusdata"
+ icinga2-enable-feature compatlog
+ icinga2-enable-feature statusdata
echo "reloading icinga2"
[ -x $(which invoke-rc.d) ] && invoke-rc.d icinga2 reload
@@ -32,6 +56,33 @@ case "$1" in
[ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload
fi
+ ###
+ # Admin password
+ ###
+ db_get icinga2-classicui/adminpassword
+ admpass="$RET"
+
+ test -f "$htpw" || touch "$htpw"
+ setperm root www-data 0640 "$htpw"
+
+ # we reset the password every run, so if it exists we're running
+ # after being specifically given a password and can unconditionally set it.
+ # XXX there's no way of setting the pw w/out giving it on the cmdline? wtf?
+ if [ -n "$admpass" ]; then
+ #unfortunatly that method only works with 2.4
+ if htpasswd 2>&1 | grep -q ' -i'; then
+ echo "$admpass" | htpasswd -i "$htpw" icingaadmin
+ else
+ htpasswd -b "$htpw" icingaadmin "$admpass"
+ fi
+ fi
+
+ # everything went well, so now let's reset the password
+ db_set icinga2-classicui/adminpassword ""
+ db_set icinga2-classicui/adminpassword-repeat ""
+ # ... done with debconf here
+ db_stop
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/icinga2-classicui.postrm b/debian/icinga2-classicui.postrm
index 3dcdb0e..b3a2558 100644
--- a/debian/icinga2-classicui.postrm
+++ b/debian/icinga2-classicui.postrm
@@ -3,22 +3,34 @@
set -e
+# shorthand
+en="/etc/icinga2/classicui"
+
+. /usr/share/debconf/confmodule
+
+# Apache2
+disable_apache2() {
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ echo "disabling Apache2 configuration ..."
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke disconf icinga2-classicui
+ fi
+ if [ -L /etc/apache2/conf.d/icinga-web.conf ]; then
+ echo "removing link /etc/apache2/conf.d/icinga2-classicui.conf ..."
+ # remove link to config
+ rm -f /etc/apache2/conf.d/icinga2-classicui.conf
+ # reload webserver
+ [ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload || true
+ fi
+}
case "$1" in
- purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
- # Apache2
- if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
- echo "disabling Apache2 configuration ..."
- . /usr/share/apache2/apache2-maintscript-helper
- apache2_invoke disconf icinga2-classic
- fi
- if [ -L /etc/apache2/conf.d/icinga-web.conf ]; then
- echo "removing link /etc/apache2/conf.d/icinga2-classicui.conf ..."
- # remove link to config
- rm -f /etc/apache2/conf.d/icinga2-classicui.conf
- # reload webserver
- [ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload || true
- fi
+ purge)
+ disable_apache2 "$@"
+ rm -f "$en/htpasswd.users"
+ ;;
+
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ disable_apache2 "$@"
;;
diff --git a/debian/icinga2-classicui.templates b/debian/icinga2-classicui.templates
new file mode 100644
index 0000000..dbcf1d7
--- /dev/null
+++ b/debian/icinga2-classicui.templates
@@ -0,0 +1,34 @@
+# These templates have been copied from the icinga-cgi package
+#
+# Only slight modifications have been made.
+# ------------------------------------------------------------
+#
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: icinga2-classicui/adminpassword
+Type: password
+_Description: Icinga 2 ClassicUI administration password:
+ Please provide the password to be created with the "icingaadmin" user.
+ .
+ This is the username and password to use when connecting to the Icinga
+ server after completing the configuration. If you do not provide
+ a password, you will have to configure access to Icinga manually
+ later on.
+
+Template: icinga2-classicui/adminpassword-repeat
+Type: password
+_Description: Re-enter password to verify:
+ Please enter the same user password again to verify you have typed it
+ correctly.
+
+Template: icinga2-classicui/adminpassword-mismatch
+Type: error
+_Description: Password input error
+ The two passwords you entered were not the same. Please try again.
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 0000000..d9f1a4f
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga2\n"
+"Report-Msgid-Bugs-To: icinga2 at packages.debian.org\n"
+"POT-Creation-Date: 2013-10-22 14:29+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: password
+#. Description
+#: ../icinga2-classicui.templates:2001
+msgid "Icinga 2 ClassicUI administration password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga2-classicui.templates:2001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga2-classicui.templates:2001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga2-classicui.templates:3001
+msgid "Re-enter password to verify:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga2-classicui.templates:3001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../icinga2-classicui.templates:4001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../icinga2-classicui.templates:4001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git
More information about the Pkg-nagios-changes
mailing list