From 968ede12df4dfb0cb5d583cd8aa9e5908bc6f905 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 19 Nov 2014 13:43:58 +0100
Subject: [PATCH] Packages: Remove files from rpm subdirectory

Those files are superseded by those beneath files.
---
 packages/rpm/etc/httpd/conf.d/icingaweb.conf  | 32 -------------------
 .../rpm/etc/icingaweb2/authentication.ini     |  6 ----
 .../modules/monitoring/backends.ini           |  8 -----
 .../modules/monitoring/instances.ini          |  2 --
 packages/rpm/etc/icingaweb2/resources.ini     | 28 ----------------
 packages/rpm/usr/bin/icingacli                |  6 ----
 6 files changed, 82 deletions(-)
 delete mode 100644 packages/rpm/etc/httpd/conf.d/icingaweb.conf
 delete mode 100644 packages/rpm/etc/icingaweb2/authentication.ini
 delete mode 100644 packages/rpm/etc/icingaweb2/modules/monitoring/backends.ini
 delete mode 100644 packages/rpm/etc/icingaweb2/modules/monitoring/instances.ini
 delete mode 100644 packages/rpm/etc/icingaweb2/resources.ini
 delete mode 100755 packages/rpm/usr/bin/icingacli

diff --git a/packages/rpm/etc/httpd/conf.d/icingaweb.conf b/packages/rpm/etc/httpd/conf.d/icingaweb.conf
deleted file mode 100644
index 1db9f20f2..000000000
--- a/packages/rpm/etc/httpd/conf.d/icingaweb.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-Alias /icingaweb "/usr/share/icingaweb2/public"
-
-<Directory "/usr/share/icingaweb2/public">
-    Options SymLinksIfOwnerMatch
-    AllowOverride None
-
-    <IfModule mod_authz_core.c>
-        # Apache 2.4
-        <RequireAll>
-            Require all granted
-        </RequireAll>
-    </IfModule>
-
-    <IfModule !mod_authz_core.c>
-        # Apache 2.2
-        Order allow,deny
-        Allow from all
-    </IfModule>
-
-    SetEnv ICINGAWEB_CONFIGDIR /etc/icingaweb2
-
-    EnableSendfile Off
-
-    RewriteEngine on
-    RewriteBase /icingaweb/
-    RewriteCond %{REQUEST_FILENAME} -s [OR]
-    RewriteCond %{REQUEST_FILENAME} -l [OR]
-    RewriteCond %{REQUEST_FILENAME} -d
-    RewriteRule ^.*$ - [NC,L]
-    RewriteRule ^.*$ index.php [NC,L]
-</Directory>
-
diff --git a/packages/rpm/etc/icingaweb2/authentication.ini b/packages/rpm/etc/icingaweb2/authentication.ini
deleted file mode 100644
index 3ec9c033a..000000000
--- a/packages/rpm/etc/icingaweb2/authentication.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[autologin]
-backend                 = autologin
-
-[internal_db_authentication]
-backend  = db
-resource = internal_db
diff --git a/packages/rpm/etc/icingaweb2/modules/monitoring/backends.ini b/packages/rpm/etc/icingaweb2/modules/monitoring/backends.ini
deleted file mode 100644
index 6dd67d4b5..000000000
--- a/packages/rpm/etc/icingaweb2/modules/monitoring/backends.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[localdb]
-type            = ido
-resource        = "ido"
-
-[locallive]
-disabled        = "1"
-type            = livestatus
-resource        = livestatus
diff --git a/packages/rpm/etc/icingaweb2/modules/monitoring/instances.ini b/packages/rpm/etc/icingaweb2/modules/monitoring/instances.ini
deleted file mode 100644
index 037baa8b9..000000000
--- a/packages/rpm/etc/icingaweb2/modules/monitoring/instances.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[icinga]
-path                = "/var/run/icinga2/cmd/icinga2.cmd"
diff --git a/packages/rpm/etc/icingaweb2/resources.ini b/packages/rpm/etc/icingaweb2/resources.ini
deleted file mode 100644
index 833f84ba8..000000000
--- a/packages/rpm/etc/icingaweb2/resources.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[internal_db]
-type                = db
-db                  = mysql
-host                = localhost
-port                = 3306
-password            = icingaweb
-username            = icingaweb
-dbname              = icingaweb
-
-[ido]
-type                = db
-db                  = mysql
-host                = localhost
-port                = 3306
-password            = icinga
-username            = icinga
-dbname              = icinga
-
-[livestatus]
-type                = livestatus
-socket              = /var/run/icinga2/cmd/livestatus
-
-[logfile]
-type                = file
-filename            = "/var/log/icingaweb2/icingaweb2.log"
-fields              = "/^(?<datetime>[0-9]{4}(-[0-9]{2}){2}T[0-9]{2}(:[0-9]{2}){2}(\\+[0-9]{2}:[0-9]{2})?) - (?<loglevel>[A-Za-z]+) - (?<message>.*)$/"
-; format: PCRE
-;
diff --git a/packages/rpm/usr/bin/icingacli b/packages/rpm/usr/bin/icingacli
deleted file mode 100755
index d6c4010b6..000000000
--- a/packages/rpm/usr/bin/icingacli
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/php
-<?php
-
-use Icinga\Application\Cli;
-require_once '/usr/share/icingaweb2/library/Icinga/Application/Cli.php';
-Cli::start()->dispatch();