summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-07-30 22:10:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-07-30 22:11:08 +0000
commitfbff8914bd71765616884f120a39841f7020e0c4 (patch)
tree360a6c73737a101116a9261cda5d7e39c1b9c293
parentMerging upstream version 2.11.0~rc1. (diff)
downloadicinga2-fbff8914bd71765616884f120a39841f7020e0c4.tar.xz
icinga2-fbff8914bd71765616884f120a39841f7020e0c4.zip
Merging debian version 2.11.0~rc1-1~exp1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog15
-rw-r--r--debian/classicui/README6
-rw-r--r--debian/classicui/apache2.conf31
-rw-r--r--debian/classicui/autocomplete.js151
-rw-r--r--debian/classicui/cgi.cfg74
-rw-r--r--debian/classicui/index.html21
-rw-r--r--debian/classicui/menu.html90
-rw-r--r--debian/control36
-rw-r--r--debian/copyright25
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/icinga2-classicui.NEWS7
-rw-r--r--debian/icinga2-classicui.config37
-rw-r--r--debian/icinga2-classicui.dirs2
-rw-r--r--debian/icinga2-classicui.install4
-rw-r--r--debian/icinga2-classicui.links12
-rw-r--r--debian/icinga2-classicui.lintian-overrides6
-rw-r--r--debian/icinga2-classicui.maintscript2
-rw-r--r--debian/icinga2-classicui.postinst130
-rw-r--r--debian/icinga2-classicui.postrm44
-rw-r--r--debian/icinga2-classicui.templates34
-rw-r--r--debian/patches/postgres-checkcommand.patch2
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/spelling-errors.patch27
-rw-r--r--debian/po/POTFILES.in1
-rw-r--r--debian/po/cs.po54
-rw-r--r--debian/po/da.po55
-rw-r--r--debian/po/de.po58
-rw-r--r--debian/po/es.po55
-rw-r--r--debian/po/fr.po56
-rw-r--r--debian/po/it.po54
-rw-r--r--debian/po/ja.po53
-rw-r--r--debian/po/nl.po58
-rw-r--r--debian/po/pl.po55
-rw-r--r--debian/po/pt.po55
-rw-r--r--debian/po/pt_BR.po55
-rw-r--r--debian/po/ru.po53
-rw-r--r--debian/po/sv.po42
-rw-r--r--debian/po/templates.pot48
-rw-r--r--debian/po/tr.po53
39 files changed, 58 insertions, 1506 deletions
diff --git a/debian/changelog b/debian/changelog
index 087d667..6217161 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+icinga2 (2.11.0~rc1-1~exp1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream release candidate.
+ * Bump Standards-Version to 4.4.0, no changes.
+ * Update copyright file, changes:
+ - Update copyright years for Icinga GmbH
+ - Add license & copyright for nlohmann_json & utf8cpp sources
+ * Drop icinga2-classicui package, Icinga 1.x is EOL.
+ * Refresh patches.
+ * Add additional boost build dependencies, drop libyajl-dev.
+ * Add patch to fix spelling errors.
+
+ -- Bas Couwenberg <sebastic@debian.org> Sat, 27 Jul 2019 08:06:39 +0200
+
icinga2 (2.10.5-1~progress5+u1) engywuck-backports; urgency=medium
* Uploading to engywuck-backports, remaining changes:
diff --git a/debian/classicui/README b/debian/classicui/README
deleted file mode 100644
index d34b314..0000000
--- a/debian/classicui/README
+++ /dev/null
@@ -1,6 +0,0 @@
-These webpages are copied from the icinga classic interface, for being able
-to provide this interface for Icinga 2.
-
-Unfortunatly some modifications have to be made...
-
--- Markus Frosch <markus@lazyfrosch.de>
diff --git a/debian/classicui/apache2.conf b/debian/classicui/apache2.conf
deleted file mode 100644
index 9b81bef..0000000
--- a/debian/classicui/apache2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# apache configuration for icinga
-
-ScriptAlias /cgi-bin/icinga2-classicui /usr/lib/cgi-bin/icinga2-classicui
-
-# Where the stylesheets (config files) reside
-Alias /icinga2-classicui/stylesheets /etc/icinga2-classicui/stylesheets
-
-# Where the HTML pages live
-Alias /icinga2-classicui /usr/share/icinga2/classicui
-
-<LocationMatch "^/cgi-bin/icinga2-classicui">
- SetEnv ICINGA_CGI_CONFIG /etc/icinga2-classicui/cgi.cfg
-</LocationMatch>
-
-<DirectoryMatch "^(?:/usr/share/icinga2/classicui/htdocs|/usr/lib/cgi-bin/icinga2-classicui|/etc/icinga2-classicui/stylesheets)/">
- Options FollowSymLinks
-
- DirectoryIndex index.html
-
- AllowOverride AuthConfig
-
- <IfVersion < 2.3>
- Order Allow,Deny
- Allow From All
- </IfVersion>
-
- AuthName "Icinga Access"
- AuthType Basic
- AuthUserFile /etc/icinga2-classicui/htpasswd.users
- Require valid-user
-</DirectoryMatch>
diff --git a/debian/classicui/autocomplete.js b/debian/classicui/autocomplete.js
deleted file mode 100644
index c86e4d7..0000000
--- a/debian/classicui/autocomplete.js
+++ /dev/null
@@ -1,151 +0,0 @@
-// Written by Kepi (kepi.cz)
-
-$(document).ready(function() {
- 'use strict';
- var min_char = 3;
- var max_items_per_cat = 10;
- var display_services = true;
-
- window.icingaAC = {
- // This is number of miliseconds to cache partial result
- // so we don't query server again and again for same terms
- expireMsecs: 60000,
-
- // internal variables
- shorten: undefined,
- results: {}
- }
-
- // extension for category support in autocomplete result
- $.widget("custom.catcomplete", $.ui.autocomplete, {
- _renderMenu: function( ul, items ) {
- var that = this;
- var currentCategory = "";
- var current_id = 0;
- $.each( items, function( index, item ) {
- if (item.category != currentCategory) {
- $('<li/>').addClass('ui-autocomplete-category').html(item.category).appendTo(ul);
- currentCategory = item.category;
- current_id = 0;
- }
- if (current_id < max_items_per_cat)
- that._renderItemData( ul, item );
- if (current_id == max_items_per_cat)
- $('<li/>').addClass('ui-menu-item').html("...").appendTo(ul);
- current_id++;
- });
- }
- });
-
- // extend renderItem so we can add custom class
- $.extend( $.ui.autocomplete.prototype, {
- _renderItem: function( ul, item ) {
- return $( '<li class="status' + item.status + '">' )
- .append( $( "<a>" ).text( item.label ) )
- .appendTo( ul );
- }
- });
-
- // autocomplete function
- $("#autocomplete").catcomplete( { minLength: min_char, delay : 700 }, {
- // select function is used to open url for selected item
- select: function( event, ui ) { top.frames['main'].location.href = ui.item.url },
- // get results from icinga API
- source: function(request, response) {
- var shorten = request.term.substring(0, min_char);
- var output = [];
-
- if (window.icingaAC.shorten === undefined || shorten != window.icingaAC.shorten || window.icingaAC.results[window.icingaAC.shorten].expire < (new Date).getTime()) {
- $.ajax({
- async: false,
- url: '/cgi-bin/icinga2-classicui/status.cgi?livesearchdata',
- dataType: 'json',
- data: {
- search_string: shorten // parameter for API search
- },
- success: function(data) {
-
- // prepare hosts data
- if ( data.status.hosts ) {
- $.each( data.status.hosts, function(index, item) {
- output.push( {
- category: 'Hosts',
- url: '/cgi-bin/icinga2-classicui/status.cgi?search_string=' + encodeURIComponent(item.host_name),
- label: item.host_display_name,
- local_match: new Array( item.host_name, item.host_display_name, item.host_alias, item.host_address, item.host_address6 ),
- status: item.status
- });
- });
- }
-
- // prepare services data
- if ( data.status.services && display_services) {
- $.each( data.status.services, function(index, item) {
- output.push( {
- category: 'Services ' + item.host_name,
- url: '/cgi-bin/icinga2-classicui/extinfo.cgi?type=2&host=' + encodeURIComponent(item.host_name) + '&service=' + encodeURIComponent(item.service_description),
- label: item.service_display_name,
- local_match: new Array( item.service_description, item.service_display_name,
- item.host_name + ' ' + item.service_description,
- item.host_name + ' ' + item.service_display_name,
- item.host_display_name + ' ' + item.service_description,
- item.host_display_name + ' ' + item.service_display_name ),
- value: item.host_name + ' ' + item.service_description,
- status: item.status
- });
- });
- }
-
- // prepare host groups data
- if ( data.status.hostgroups ) {
- $.each( data.status.hostgroups, function(index, item) {
- output.push( {
- category: 'Hostgroups',
- url: '/cgi-bin/icinga2-classicui/status.cgi?style=overview&hostgroup=' + encodeURIComponent(item.hostgroup_name),
- local_match: new Array( item.hostgroup_name, item.hostgroup_alias ),
- label: item.hostgroup_alias,
- status: "group"
- });
- });
- }
-
- // prepare service groups data
- if ( data.status.servicegroups ) {
- $.each( data.status.servicegroups, function(index, item) {
- output.push( {
- category: 'Servicegroups',
- url: '/cgi-bin/icinga2-classicui/status.cgi?style=overview&servicegroup=' + encodeURIComponent(item.servicegroup_name),
- local_match: new Array( item.servicegroup_name, item.servicegroup_alias ),
- label: item.servicegroup_alias,
- status: "group"
- });
- });
- }
-
- window.icingaAC.shorten = shorten;
- window.icingaAC.results[window.icingaAC.shorten] = {
- expire: (new Date).getTime() + window.icingaAC.expireMsecs,
- data: output
- }
- }
- })
- }
-
- var matcher = new RegExp( request.term.replace(/\*/g, ".*"), "i" );
- response( $.grep( window.icingaAC.results[window.icingaAC.shorten].data, function( item ){
- var match_result = false;
- $.each( item.local_match, function( index, match_item ) {
- if (match_item !== undefined && matcher.test( match_item )) {
- match_result = true;
- return;
- }
- });
-
- return match_result;
- }) );
-
- }
- }).bind('focus', function(){ $(this).catcomplete("search"); } );
-});
-
-// vim: syntax=javascript ts=2 sw=2 sts=2 sr et
diff --git a/debian/classicui/cgi.cfg b/debian/classicui/cgi.cfg
deleted file mode 100644
index 8b77730..0000000
--- a/debian/classicui/cgi.cfg
+++ /dev/null
@@ -1,74 +0,0 @@
-# Icinga 2 Classic UI configuration
-#
-# requires icinga-gui package
-# check https://icinga.com/docs/ for option details
-standalone_installation=1
-physical_html_path=/usr/share/icinga
-url_html_path=/icinga2-classicui
-url_stylesheets_path=/icinga2-classicui/stylesheets
-http_charset=utf-8
-refresh_rate=30
-refresh_type=1
-escape_html_tags=1
-result_limit=50
-show_tac_header=1
-use_pending_states=1
-first_day_of_week=0
-suppress_maintenance_downtime=0
-action_url_target=main
-notes_url_target=main
-use_authentication=1
-use_ssl_authentication=0
-lowercase_user_name=0
-authorized_for_system_information=icingaadmin
-authorized_for_configuration_information=icingaadmin
-authorized_for_full_command_resolution=icingaadmin
-authorized_for_system_commands=icingaadmin
-authorized_for_all_services=icingaadmin
-authorized_for_all_hosts=icingaadmin
-authorized_for_all_service_commands=icingaadmin
-authorized_for_all_host_commands=icingaadmin
-show_all_services_host_is_authorized_for=1
-show_partial_hostgroups=0
-show_partial_servicegroups=0
-default_statusmap_layout=5
-status_show_long_plugin_output=0
-display_status_totals=0
-highlight_table_rows=1
-add_notif_num_hard=28
-add_notif_num_soft=0
-use_logging=0
-cgi_log_file=/var/log/icinga/gui/icinga-cgi.log
-cgi_log_rotation_method=d
-cgi_log_archive_path=/var/log/icinga/gui
-enforce_comments_on_actions=0
-send_ack_notifications=1
-persistent_ack_comments=0
-lock_author_names=1
-default_downtime_duration=7200
-set_expire_ack_by_default=0
-default_expiring_acknowledgement_duration=86400
-default_expiring_disabled_notifications_duration=86400
-tac_show_only_hard_state=0
-show_tac_header_pending=1
-exclude_customvar_name=PASSWORD,COMMUNITY
-exclude_customvar_value=secret
-extinfo_show_child_hosts=0
-tab_friendly_titles=1
-######################################
-# STANDALONE (ICINGA 2) OPTIONS
-# requires standalone_installation=1
-######################################
-object_cache_file=/var/cache/icinga2/objects.cache
-status_file=/var/cache/icinga2/status.dat
-resource_file=/etc/icinga/resource.cfg
-command_file=/var/run/icinga2/cmd/icinga2.cmd
-check_external_commands=1
-interval_length=60
-status_update_interval=10
-log_file=/var/log/icinga2/compat/icinga.log
-log_rotation_method=h
-log_archive_path=/var/log/icinga2/compat/archives
-date_format=us
-url_cgi_path=/cgi-bin/icinga2-classicui
-# EOF
diff --git a/debian/classicui/index.html b/debian/classicui/index.html
deleted file mode 100644
index e097a61..0000000
--- a/debian/classicui/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
- <title>Icinga2 Classic</title>
- <meta name="robots" content="noindex, nofollow" />
- <link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico" />
-</head>
- <frameset frameborder="0" framespacing="0" rows="72,*" onLoad='document.title="Icinga2 Classic: "+window.location.hostname; document.getElementById("main").focus();'>
- <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-classicui/tac.cgi" name="main" id="main" />
- </frameset>
- </frameset>
- <noframes>
- <body>
- <p>These pages require a browser which supports frames.</p>
- </body>
- </noframes>
-</html>
diff --git a/debian/classicui/menu.html b/debian/classicui/menu.html
deleted file mode 100644
index daa4ce2..0000000
--- a/debian/classicui/menu.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W4C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Web Interface Monitoring</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="Content-Language" content="en" />
- <meta name="robots" content="noindex, nofollow" />
- <link rel="stylesheet" type="text/css" href="stylesheets/menu.css" media="screen, projection" />
- <link rel="stylesheet" type="text/css" href="jquery-ui/themes/base/all.min.css" media="screen, projection" />
- <link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico" />
- <script type="text/javascript" src="jquery/jquery.min.js"></script>
- <script type="text/javascript" src="js/menu.js"></script>
- <script type="text/javascript" src="jquery-ui/ui/widget.min.js"></script>
- <script type="text/javascript" src="jquery-ui/ui/unique-id.min.js"></script>
- <script type="text/javascript" src="jquery-ui/ui/widgets/menu.min.js"></script>
- <script type="text/javascript" src="jquery-ui/ui/widgets/autocomplete.min.js"></script>
- <script type="text/javascript" src="jquery-ui/ui/safe-active-element.min.js"></script>
- <script type="text/javascript" src="jquery-ui/ui/position.min.js"></script>
- <script type="text/javascript" src="jquery-ui/ui/keycode.min.js"></script>
-</head>
-<body>
- <div id="menu">
- <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-classicui/status.cgi" target="main">
- <input type='text' name='search_string' id="autocomplete" style="width: 150px; padding: 2px; margin-left: 10px; border: 1px solid grey">
- </form>
- </div>
- </li>
- </ul>
- <h2>Status</h2>
- <ul>
- <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&amp;style=overview" target="main">Hostgroup Overview</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/status.cgi?hostgroup=all&amp;style=summary" target="main">Hostgroup Summary</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/status.cgi?servicegroup=all&amp;style=overview" target="main">Servicegroup Overview</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/status.cgi?servicegroup=all&amp;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-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&amp;hoststatustypes=3&amp;serviceprops=2097162" target="main">Unhandled Services</a></li>
- <li class="menuli_style1"><a href="/cgi-bin/icinga2-classicui/status.cgi?style=hostdetail&amp;hoststatustypes=12" target="main">Host Problems</a></li>
- <li class="menuli_style2"><a href="/cgi-bin/icinga2-classicui/status.cgi?style=hostdetail&amp;hoststatustypes=12&amp;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-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-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-classicui/config.cgi" target="main">View Config</a></li>
- </ul>
- </div>
- <script type="text/javascript" src="autocomplete.js"></script>
-</body>
-</html>
diff --git a/debian/control b/debian/control
index 2becc3b..267cd10 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,9 @@ Build-Depends: bash-completion,
flex,
g++ (>= 1.96),
libboost-dev,
+ libboost-context-dev,
+ libboost-coroutine-dev,
+ libboost-filesystem-dev,
libboost-program-options-dev,
libboost-regex-dev,
libboost-system-dev,
@@ -26,15 +29,14 @@ Build-Depends: bash-completion,
libpq-dev,
libssl-dev,
libsystemd-dev,
- libyajl-dev,
libwxgtk3.0-dev,
make (>= 3.81),
po-debconf
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
Vcs-Browser: https://git.progress-linux.org/distributions/engywuck-backports/packages/icinga2
Vcs-Git: https://git.progress-linux.org/distributions/engywuck-backports/packages/icinga2
XSBC-Original-Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-icinga2
-XSBC-Original-Vcs-Git: https://salsa.debian.org/nagios-team/pkg-icinga2.git
+XSBC-Original-Vcs-Git: https://salsa.debian.org/nagios-team/pkg-icinga2.git -b experimental
Homepage: https://icinga.com
Package: icinga2
@@ -144,34 +146,6 @@ Description: host and network monitoring system - documentation
.
This package provides the Icinga 2 documentation.
-Package: icinga2-classicui
-Architecture: all
-Depends: apache2-utils,
- dpkg (>= 1.15.7.2),
- icinga-cgi-bin (>= 1.11.5~),
- icinga2-bin (>= 2.2.0~),
- icinga2-common (= ${source:Version}),
- ${misc:Depends}
-Recommends: apache2 | httpd
-Description: host and network monitoring system - classic UI
- Icinga 2 is a general-purpose monitoring application to fit the needs of
- any size of network. Icinga 1.x was a Nagios fork; this new generation
- has been rewritten from scratch in C++, with multi-threading and cluster
- support.
- .
- Features:
- * all standard features of Icinga and Nagios;
- * much faster and more scalable than Icinga 1 and Nagios;
- * new, more intuitive, template-based configuration format;
- * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
- SMTP, etc.) by executing checks (see monitoring-plugins*);
- * any small script following the Nagios plugin API can be used as a
- check plugin;
- * notifications about alerts for any custom script (with examples);
- * native support for Livestatus and Graphite.
- .
- This package provides support for the Icinga Classic User Interface.
-
Package: icinga2-ido-mysql
Architecture: any
Depends: dbconfig-common,
diff --git a/debian/copyright b/debian/copyright
index 69ad21f..a1e7dfc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: https://github.com/Icinga/icinga2
Files: *
Copyright: 2012-2018, Icinga Development Team (https://icinga.com)
- 2012, Icinga GmbH
+ 2012, 2019, Icinga GmbH
License: GPL-2+ with OpenSSL exception
Files: etc/icinga2/scripts/mail-host-notification.sh
@@ -46,14 +46,18 @@ Copyright: 1990, Jarkko Oikarinen
1996, Run <carlo@runaway.xs4all.nl>
License: GPL-1+
+Files: third-party/nlohmann_json/*
+Copyright: 2013-2018, Niels Lohmann <http://nlohmann.me>
+License: Expat
+
Files: third-party/socketpair/socketpair.c
third-party/socketpair/socketpair.h
Copyright: 2007, 2010, Nathan C. Myers <ncm@cantrip.org>
License: BSD-3-clause
-Files: third-party/yajl/*
-Copyright: 2007-2014, Lloyd Hilaiel <me@lloyd.io>
-License: ISC
+Files: third-party/utf8cpp/*
+Copyright: 2006-2016, Nemanja Trifunovic
+License: BSL-1.0
Files: debian/*
Copyright: 2012-2014, Alexander Wirt <formorer@debian.org>
@@ -225,19 +229,6 @@ License: GPL-2+ with OpenSSL exception
this exception statement from all source files in the program, then
also delete it here.
-License: ISC
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
License: LGPL-2.1+
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/debian/gbp.conf b/debian/gbp.conf
index e3daba6..7cfab70 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,7 +6,7 @@ upstream-branch = upstream
# The default name for the Debian branch is "master".
# Change it if the name is different (for instance, "debian/unstable").
-debian-branch = master
+debian-branch = experimental
# git-import-orig uses the following names for the upstream tags.
# Change the value if you are not using git-import-orig
diff --git a/debian/icinga2-classicui.NEWS b/debian/icinga2-classicui.NEWS
deleted file mode 100644
index a0e2d3d..0000000
--- a/debian/icinga2-classicui.NEWS
+++ /dev/null
@@ -1,7 +0,0 @@
-icinga2 (2.2.0-1) unstable; urgency=medium
-
- To protect sensitive configuration files of icinga2
- the configuration files for classicui were moved to
- /etc/icinga2-classicui.
-
- -- Alexander Wirt <formorer@debian.org> Thu, 20 Nov 2014 21:41:55 +0100
diff --git a/debian/icinga2-classicui.config b/debian/icinga2-classicui.config
deleted file mode 100644
index cc1f21d..0000000
--- a/debian/icinga2-classicui.config
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -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.dirs b/debian/icinga2-classicui.dirs
deleted file mode 100644
index b157ad5..0000000
--- a/debian/icinga2-classicui.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/icinga2-classicui
-usr/share/icinga2/classicui
diff --git a/debian/icinga2-classicui.install b/debian/icinga2-classicui.install
deleted file mode 100644
index effae19..0000000
--- a/debian/icinga2-classicui.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/classicui/apache2.conf etc/icinga2-classicui
-debian/classicui/cgi.cfg etc/icinga2-classicui
-debian/classicui/*.html usr/share/icinga2/classicui
-debian/classicui/*.js usr/share/icinga2/classicui
diff --git a/debian/icinga2-classicui.links b/debian/icinga2-classicui.links
deleted file mode 100644
index d5fca56..0000000
--- a/debian/icinga2-classicui.links
+++ /dev/null
@@ -1,12 +0,0 @@
-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/images usr/share/icinga2/classicui/images
-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/robots.txt usr/share/icinga2/classicui/robots.txt
-usr/share/icinga/htdocs/ssi usr/share/icinga2/classicui/ssi
-usr/share/javascript/jquery usr/share/icinga2/classicui/jquery
-usr/share/javascript/jquery-ui usr/share/icinga2/classicui/jquery-ui
diff --git a/debian/icinga2-classicui.lintian-overrides b/debian/icinga2-classicui.lintian-overrides
deleted file mode 100644
index 3b019ee..0000000
--- a/debian/icinga2-classicui.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# ignoring apache2 warning
-# this is actually not a problem, because the handling is backwards compatible
-apache2-reverse-dependency-calls-invoke-rc.d postrm
-apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
-apache2-reverse-dependency-calls-invoke-rc.d postinst
-
diff --git a/debian/icinga2-classicui.maintscript b/debian/icinga2-classicui.maintscript
deleted file mode 100644
index 05cb468..0000000
--- a/debian/icinga2-classicui.maintscript
+++ /dev/null
@@ -1,2 +0,0 @@
-mv_conffile /etc/icinga2/classicui/apache2.conf /etc/icinga2-classicui/apache2.conf 2.2.0-1~
-mv_conffile /etc/icinga2/classicui/cgi.cfg /etc/icinga2-classicui/cgi.cfg 2.2.0-1~
diff --git a/debian/icinga2-classicui.postinst b/debian/icinga2-classicui.postinst
deleted file mode 100644
index 8cd4aea..0000000
--- a/debian/icinga2-classicui.postinst
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-# postinst script for icinga2-classicui
-
-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
-}
-
-is_fresh_install()
-{
- if [ -z "$2" ] ; then
- return 0
- fi
- return 1
-}
-
-enable_features_for_classic() {
- if is_fresh_install $@; then
- echo "enabling icinga2 features for classicui"
- icinga2 feature enable compatlog statusdata command
-
- echo "reloading icinga2"
- [ -x $(which invoke-rc.d) ] && invoke-rc.d icinga2 reload
- fi
- # handle new default features here in the future
-}
-
-case "$1" in
- configure)
- enable_features_for_classic $@
-
- if [ -f '/etc/icinga2/classicui/htpasswd.users' ] && [ ! -f '/etc/icinga2-classicui/htpasswd.users' ];
- then
- echo "Move classicui password file to new location"
- mv -f /etc/icinga2/classicui/htpasswd.users \
- /etc/icinga2-classicui/htpasswd.users
- rmdir /etc/icinga2/classicui || true
- fi
-
- echo "enabling Apache2 config..."
- COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
-
- # NEW method for Apache >= 2.4
- if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
- . /usr/share/apache2/apache2-maintscript-helper
-
- apache2_invoke enmod cgi
- apache2_invoke enconf icinga2-classicui
-
- # OLD methods for Apache < 2.4
- elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
- a2enmod cgi
- # create symlink if not existing
- [ -e /etc/apache2/conf.d/icinga2-classicui.conf ] || ln -vs $en/apache2.conf /etc/apache2/conf.d/icinga2-classicui.conf
-
- # reload webserver
- [ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload
- fi
-
- # check for an old symlink to the stylesheets
- test -L /etc/icinga2/classicui/stylesheets && rm \
- /etc/icinga2/classicui/stylesheets && rmdir /etc/icinga2/classicui || true
- ###
- # 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)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-init_failed ()
-{
- echo "Icinga 2 was unable to start due to configuration errors.";
- echo "Please fix them and manually restart the icinga2 daemon using";
- echo " ´service icinga2 start´";
-}
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/icinga2-classicui.postrm b/debian/icinga2-classicui.postrm
deleted file mode 100644
index ddb769a..0000000
--- a/debian/icinga2-classicui.postrm
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# postrm script for icinga2-common
-
-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)
- disable_apache2 "$@"
- rm -f "$en/htpasswd.users"
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- disable_apache2 "$@"
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/icinga2-classicui.templates b/debian/icinga2-classicui.templates
deleted file mode 100644
index dbcf1d7..0000000
--- a/debian/icinga2-classicui.templates
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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@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/patches/postgres-checkcommand.patch b/debian/patches/postgres-checkcommand.patch
index a508577..7582032 100644
--- a/debian/patches/postgres-checkcommand.patch
+++ b/debian/patches/postgres-checkcommand.patch
@@ -5,7 +5,7 @@ Bug-Debian: https://bugs.debian.org/898833
--- a/itl/plugins-contrib.d/databases.conf
+++ b/itl/plugins-contrib.d/databases.conf
-@@ -525,7 +525,7 @@ object CheckCommand "oracle_health" {
+@@ -508,7 +508,7 @@ object CheckCommand "oracle_health" {
object CheckCommand "postgres" {
import "ipv4-or-ipv6"
diff --git a/debian/patches/series b/debian/patches/series
index 6bcd417..09684e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
21_config_changes
postgres-checkcommand.patch
+spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
new file mode 100644
index 0000000..393d5ec
--- /dev/null
+++ b/debian/patches/spelling-errors.patch
@@ -0,0 +1,27 @@
+Description: Fix spelling errors.
+ * UNKNWON -> UNKNOWN
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: https://github.com/Icinga/icinga2/pull/7365
+
+--- a/doc/19-technical-concepts.md
++++ b/doc/19-technical-concepts.md
+@@ -1713,7 +1713,7 @@ Message updates will be dropped when:
+
+ The receiver constructs a virtual host object and looks for the local CheckCommand object.
+
+-Returns UNKNWON as check result to the sender
++Returns UNKNOWN as check result to the sender
+
+ * when the CheckCommand object does not exist.
+ * when there was an exception triggered from check execution, e.g. the plugin binary could not be executed or similar.
+--- a/plugins/check_nscp_api.cpp
++++ b/plugins/check_nscp_api.cpp
+@@ -146,7 +146,7 @@ static int FormatOutput(const Dictionary
+ { "OK", 0 },
+ { "WARNING", 1},
+ { "CRITICAL", 2},
+- { "UNKNWON", 3}
++ { "UNKNOWN", 3}
+ };
+
+ String state = static_cast<String>(payload->Get("result")).ToUpper();
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 50e9a1f..0350c80 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1,3 +1,2 @@
-[type: gettext/rfc822deb] icinga2-classicui.templates
[type: gettext/rfc822deb] icinga2-ido-mysql.templates
[type: gettext/rfc822deb] icinga2-ido-pgsql.templates
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 6330cda..e5ae914 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -16,60 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Heslo pro správu Icinga 2 ClassicUI:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr ""
-"Uveďte prosím heslo, které se vytvořit spolu s uživatelem \"icingaadmin\"."
-
-#. 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 ""
-"Toto uživatelské jméno a heslo se bude po dokončení nastavování používat při "
-"připojování k serveru Icinga. Pokud heslo neuvedete, budete muset později na "
-"serveru Icinga nastavit přístup ručně."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Znovu zadejte heslo:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr ""
-"Zadejte prosím znovu stejné heslo uživatele k ověření, že jste jej napsali "
-"správně."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Chyba při zadávání hesla"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr "Hesla, která jste zadali nejsou stejná. Zkuste to prosím znovu."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/da.po b/debian/po/da.po
index cdaaecb..487f32e 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -17,61 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Administrationsadgangskode for Icinga 2 ClassicUI"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr ""
-"Angiv venligst adgangskoden som skal oprettes med brugeren »icingaadmin«."
-
-#. 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 ""
-"Dette er brugernavnet og adgangskoden, der skal anvendes, når der forbindes "
-"med Icingaserveren efter færdiggørelse af konfigurationen. Hvis du ikke "
-"angiver en adgangskode, så skal du konfigurere adgang til Icinga manuelt "
-"senere."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Indtast adgangskoden igen for at verificere:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr ""
-"Indtast venligst den samme brugeradgangskode igen for at verificere at du "
-"har tastet korrekt."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Indtastningsfejl for adgangskode"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr "De to indtastede adgangskoder var ikke ens. Prøv igen."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/de.po b/debian/po/de.po
index 5775bd7..bd2abda 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -16,64 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Administrationspasswort der ClassicUI von Icinga 2:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr ""
-"Bitte geben Sie das Passwort an, das für den Benutzer »icingaadmin« angelegt "
-"werden soll."
-
-#. 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 ""
-"Dies sind der Benutzername und das Passwort, die nach Abschluss der "
-"Konfiguration zum Verbinden mit dem Icinga-Server verwendet werden. Falls "
-"Sie kein Passwort angeben, müssen Sie den Zugriff auf Icinga später manuell "
-"einrichten."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Geben Sie dass Passwort zu Kontrolle erneut ein:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr ""
-"Bitte geben Sie dasselbe Passwort erneut ein, um zu prüfen, ob Sie es "
-"korrekt eingetippt haben."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Passworteingabefehler"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-"Die beiden von Ihnen eingegebenen Passwörter sind nicht gleich. Bitte "
-"versuchen Sie es erneut."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/es.po b/debian/po/es.po
index d168694..36a2a7e 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -37,61 +37,6 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Contraseña de administración para ClassicUI de Icinga 2:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr ""
-"Introduzca la contraseña con la que se creará el usuario «icingaadmin»."
-
-#. 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 ""
-"Este es el nombre de usuario y la contraseña que se utilizarán para "
-"conectarse al servidor Icinga luego de completar la configuración. Si no "
-"provee una contraseña, deberá configurar el acceso a Icinga de forma manual "
-"luego."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Ingrese la contraseña nuevamente para verificar:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr ""
-"Ingrese la misma contraseña de usuario nuevamente para verificar que la "
-"ingresó correctamente."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Error en el ingreso de la contraseña"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr "Las dos contraseñas ingresadas no coinciden. Inténtelo nuevamente."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 9c3cbd6..cd0b2a9 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -16,62 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Mot de passe pour l'administrateur d'Icinga 2 ClassicUI :"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr "Veuillez indiquer le mot de passe pour l'utilisateur « icingaadmin »."
-
-#. 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 ""
-"L'identifiant « icingaadmin » et le mot de passe entré ci-dessous sont à "
-"utiliser pour se connecter au serveur Icinga à la fin de la configuration. "
-"Si vous n'indiquez pas de mot de passe ici, vous devrez configurer l'accès à "
-"Icinga plus tard."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Confirmation du mot de passe :"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr ""
-"Veuillez entrer à nouveau le mot de passe pour l'utilisateur afin de "
-"vérifier qu'il a été saisi correctement."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Erreur de saisie du mot de passe"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-"Les deux mots de passe que vous avez indiqués sont différents. Veuillez "
-"recommencer."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/it.po b/debian/po/it.po
index a34753a..43efa74 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -17,60 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Virtaal 0.7.1\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Password di amministrazione per Icinga 2 ClassicUI:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr "Inserire la password da creare insieme all'utente «icingaadmin»."
-
-#. 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 ""
-"Questi sono il nome utente e la password da usare quando ci si connette al "
-"server Icinga dopo aver completato la configurazione. Se non viene fornita "
-"una password sarà necessario configurare in seguito a mano l'accesso a "
-"Icinga."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Reinserire la password per conferma:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr ""
-"Inserire nuovamente la stessa password utente per verificare di averla "
-"digitata correttamente."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Errore di inserimento della password"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr "Le due password inserite non erano identiche. Provare di nuovo."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/ja.po b/debian/po/ja.po
index fd6e137..211f80b 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -16,59 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Icinga 2 ClassicUI 管理用パスワード:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr "「icingaadmin」ユーザの作成にあたり、パスワードを提供してください。"
-
-#. 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 ""
-"これは設定完了後 Icinga サーバへの接続時に利用するユーザ名及びパスワードで"
-"す。パスワードをここで提供しない場合、Icinga へのアクセス権を後で手作業により"
-"設定する必要があります。"
-
-#. 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 "入力された2つのパスワードが一致しません。やり直してください。"
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 815b10a..cf70d94 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -18,64 +18,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.6\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Beheerderswachtwoord voor Icinga 2 ClassicUI:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr ""
-"Gelieve het wachtwoord op te geven voor de aan te maken gebruiker "
-"\"icingaadmin\"."
-
-#. 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 ""
-"Deze gebruikersnaam en het wachtwoord moeten gebruikt worden om verbinding "
-"te maken met de Icinga-server na het voltooien van de configuratie. Indien u "
-"geen wachtwoord opgeeft, zult u later de toegang tot Icinga handmatig moeten "
-"instellen."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Voer ter controle het wachtwoord nogmaals in:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr ""
-"Geef hetzelfde gebruikerswachtwoord nogmaals in om een mogelijke tikfout uit "
-"te sluiten."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Fout bij het invoeren van het wachtwoord"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-"De twee ingevoerde wachtwoorden zijn niet identiek. Gelieve opnieuw te "
-"proberen."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/pl.po b/debian/po/pl.po
index b5b4f6f..24073bc 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -19,61 +19,6 @@ msgstr ""
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.4\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Hasło administratora ClassicUI Icinga 2:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr "Proszę podać hasło dla użytkownika \"icingaadmin\"."
-
-#. 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 ""
-"Po zakończeniu konfiguracji ta nazwa użytkownika oraz hasło zostaną użyte do "
-"zalogowania się do serwera Icinga. Jeśli hasło nie zostanie podane, "
-"konieczne będzie ręczne skonfigurowanie dostępu do Icinga."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Proszę wprowadzić hasło ponownie:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr ""
-"Proszę wprowadzić to samo hasło ponownie, aby sprawdzić, czy zostało wpisane "
-"poprawnie."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Błąd wprowadzania hasła"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-"Dwa hasła, które zostały wprowadzone, nie są identyczne. Proszę spróbować "
-"ponownie."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 036aa12..b65db54 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -18,61 +18,6 @@ msgstr ""
"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Palavra-passe de administração do Icinga 2 ClassicUI:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr ""
-"Por favor indique uma palavra-passe para ser criada com o utilizador "
-"\"icingaadmin\"."
-
-#. 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 ""
-"Este é o nome de utilizador e palavra-passe a usar ao ligar ao servidor "
-"Icinga após completar a configuração. Se não disponibilizar uma palavra-"
-"passe, irá ter que configurar manualmente o acesso ao Icinga posteriormente."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Insira de novo a palavra-passe para verificação:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr ""
-"Por favor insira de novo correctamente a mesma palavra-passe que escreveu."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Erro de entrada de palavra-passe"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-"As duas palavras-passe que inseriu não são iguais. Por favor tente de novo."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index d9d0a6a..11f855b 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -17,61 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Senha de administração para Icinga 2 ClassicUI:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr "Por favor, informe a senha a ser criada com o usuário \"icingaadmin\"."
-
-#. 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 ""
-"Esse é o nome de usuário e a senha para usar ao se conectar no servidor "
-"Icinga depois de completar a configuração. Se você não fornecer uma senha, "
-"você terá que configurar o acesso ao Icinga manualmente mais tarde."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Redigite a senha para verificação:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr ""
-"Por favor, digite a mesma senha de usuário novamente para verificar se você "
-"a digitou corretamente."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Erro de entrada da senha"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-"As duas senhas que você informou não foram as mesmas. Por favor, tente "
-"novamente."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/ru.po b/debian/po/ru.po
index ed59317..37be651 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -18,59 +18,6 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Пароль для администрирования Icinga 2 через ClassicUI:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr "Введите пароль для создаваемой учётной записи «icingaadmin»."
-
-#. 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 ""
-"Эта учётная запись и пароль будут использованы для доступа к серверу Icinga "
-"после завершения настройки. Если вы не укажите пароль, то вам нужно будет "
-"настроить доступ к Icinga самостоятельно."
-
-#. 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 "Два введённых пароля не одинаковы. Повторите ввод."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 0b426cb..ea09a8f 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -18,48 +18,6 @@ msgstr ""
"X-Generator: Poedit 1.8.11\n"
"Language-Team: \n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Icinga2 ClassicUI administrationslösenord:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Please provide the password to be created with the \"icingaadmin\" user."
-msgstr "Ange lösenordet som ska skapas med \"icingaadmin\"-användaren."
-
-#. 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 "Detta är det användarnamn och lösenord som ska användas för att ansluta till Icinga-servern efter att konfigurationen slutförts. Om du inte anger ett lösenord, måste du konfigurera tillträde till Icinga manuellt senare."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Återange lösenord för att verifiera:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Please enter the same user password again to verify you have typed it correctly."
-msgstr "Ange samma lösenord igen för att bekräfta att du skrev det rätt."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Inmatingsfel för lösenord"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr "De två lösenorden du angav överensstämde inte. Var god försök igen."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 7547ba0..38c4085 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -17,54 +17,6 @@ msgstr ""
"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 ""
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
diff --git a/debian/po/tr.po b/debian/po/tr.po
index f6fec7f..30096e6 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -17,59 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid "Icinga 2 ClassicUI administration password:"
-msgstr "Icinga 2 ClassicUI yönetim parolası:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:2001
-msgid ""
-"Please provide the password to be created with the \"icingaadmin\" user."
-msgstr ""
-"Lütfen yeni oluşturulacak olan \"icingaadmin\" kullanıcısının kullanacağı "
-"parolayı girin."
-
-#. 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 ""
-"Bu kullanıcı adı ve parola, yapılandırılması tamamlandıktan sonra Icinga "
-"sunucusuna bağlanmak için kullanılacaktır. Eğer şimdi bir parola girmezseniz "
-"Icinga'yı daha sonra elle yapılandırmanız gerekecektir."
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid "Re-enter password to verify:"
-msgstr "Parolayı doğrulamak için tekrar girin:"
-
-#. Type: password
-#. Description
-#: ../icinga2-classicui.templates:3001
-msgid ""
-"Please enter the same user password again to verify you have typed it "
-"correctly."
-msgstr "Lütfen doğru yazıldığından emin olmak için aynı parolayı tekrar girin."
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "Password input error"
-msgstr "Parola girme hatası"
-
-#. Type: error
-#. Description
-#: ../icinga2-classicui.templates:4001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr "Girdiğiniz iki parola aynı değil. Lütfen tekrar deneyin."
-
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001