[icinga-checkins] icinga.org: icingaweb2/feature/redesign-7144: Remove config/*.in files

git at icinga.org git at icinga.org
Thu Nov 13 21:22:46 CET 2014


Module: icingaweb2
Branch: feature/redesign-7144
Commit: 684e01c9ea8965bac7e93c1d64f39ad610e0b634
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=684e01c9ea8965bac7e93c1d64f39ad610e0b634

Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Thu Oct 30 13:41:33 2014 +0100

Remove config/*.in files

---

 config/.gitignore                          |    6 ---
 config/authentication.ini.in               |   29 ---------------
 config/config.ini.in                       |   41 ---------------------
 config/modules/monitoring/backends.ini.in  |   19 ----------
 config/modules/monitoring/instances.ini.in |    2 -
 config/resources.ini.in                    |   55 ----------------------------
 6 files changed, 152 deletions(-)

diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100644
index 0a2f13d..0000000
--- a/config/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-authentication.ini
-config.ini
-modules/monitoring/backends.ini
-modules/monitoring/instances.ini
-resources.ini
-
diff --git a/config/authentication.ini.in b/config/authentication.ini.in
deleted file mode 100644
index 2a2d2a9..0000000
--- a/config/authentication.ini.in
+++ /dev/null
@@ -1,29 +0,0 @@
-; authentication.ini
-;
-; Each section listed in this configuration represents a backend used to authenticate users. The backend configurations
-; must define a resource referring to a configured database or LDAP connection in the INI file resources.ini.
-;
-; The backends will be processed from top to bottom using the first backend for authentication which reports that
-; the user trying to log in is available.
-
-[autologin]
-backend                 = autologin
-;
-; If you want to strip the domain
-; strip_username_regexp   = /\@[^$]+$/
-
-[internal_ldap_authentication]
- at ldap_auth_disabled@
-backend             = ldap
-resource            = internal_ldap
-user_class          = @ldap_user_objectclass@
-user_name_attribute = @ldap_attribute_username@
-group_base_dn = @ldap_group_base_dn@
-group_attribute = @ldap_group_attribute@
-group_member_attribute = @ldap_group_member_attribute@
-group_class = @ldap_group_class@
-
-[internal_db_authentication]
- at internal_auth_disabled@
-backend     = db
-resource    = internal_db
diff --git a/config/config.ini.in b/config/config.ini.in
deleted file mode 100644
index 560acf5..0000000
--- a/config/config.ini.in
+++ /dev/null
@@ -1,41 +0,0 @@
-[global]
-timezone            = "Europe/Berlin"
-
-; Contains the directories that will be searched for available modules. Modules that
-; don't exist in these directories can still be symlinked in the module folder, but
-; won't show up in the list of disabled modules
-; modulePath          = "/vagrant/modules:/usr/share/icingaweb/modules"
-
-[logging]
-enable              = true
-; Writing to a Stream
-type                = "file"
-; Write data to the following file
-target              = "@icingaweb_log_path@/icingaweb.log"
-; Write data to a PHP stream
-;target              = "php://output"
-
-; Writing to the System Log
-;type                = "syslog"
-; Prefix all syslog messages generated with the string "icingaweb"
-;application         = "icingaweb"
-;facility            = "LOG_USER"
-
-level               = 1
-; The default level is WARNING, which means that only events of this level and
-; above will be tracked. Level numbers descend in order of importance where
-; ERROR (0) is the most important level and DEBUG (3) is the least important
-; level:
-;
-; ERROR   = 0 - Error: error conditions
-; WARNING = 1 - Warning: warning conditions
-; INFO    = 2 - Informational: informational messages
-; DEBUG   = 3 - Debug: debug messages
-
-[preferences]
-; Use INI file storage to save preferences to a local disk
-type        = "ini"
-
-; Use database storage to save preferences in either a MySQL or PostgreSQL database
-;type        = db
-;resource    = icingaweb-mysql
diff --git a/config/modules/monitoring/backends.ini.in b/config/modules/monitoring/backends.ini.in
deleted file mode 100644
index 910f17f..0000000
--- a/config/modules/monitoring/backends.ini.in
+++ /dev/null
@@ -1,19 +0,0 @@
-[localdb]
- at ido_enabled@
-type            = ido
-resource        = "ido"
-
-[locallive]
- at livestatus_enabled@
-type            = livestatus
-resource        = livestatus
-
-[localfile]
- at statusdat_enabled@
-type            = statusdat
-resource        = statusdat
-
-;[localfailsafe]
-;enabled=false
-;type = combo
-;backends = localdb, locallive, localfile
diff --git a/config/modules/monitoring/instances.ini.in b/config/modules/monitoring/instances.ini.in
deleted file mode 100644
index f129553..0000000
--- a/config/modules/monitoring/instances.ini.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[icinga]
-path                = "@icinga_commandpipe@"
diff --git a/config/resources.ini.in b/config/resources.ini.in
deleted file mode 100644
index d4c617c..0000000
--- a/config/resources.ini.in
+++ /dev/null
@@ -1,55 +0,0 @@
-; resources.ini
-;
-; The configuration file *resources.ini* contains data sources that
-; can be referenced in other configurations. This allows you to manage
-; all connections to SQL databases in one single place, avoiding the need
-; to edit several different configuration files, when the connection
-; information of a resource change.
-;
-; Each section represents a resource, with the section name being the
-; identifier used to reference this certain section. Depending on the
-; resource type, each section contains different properties. The property
-; *type* defines the resource type and thus how the properties are going to
-; be interpreted. Currently only the resource type *db* is available.
-
-
-[internal_db]
-type                = db
-db                  = @internal_db_type@
-host                = @internal_db_host@
-port                = @internal_db_port@
-password            = @internal_db_password@
-username            = @internal_db_user@
-dbname              = @internal_db_name@
-
-[ido]
-type                = db
-db                  = @ido_db_type@
-host                = @ido_host@
-port                = @ido_port@
-password            = @ido_password@
-username            = @ido_user@
-dbname              = @ido_db_name@
-
-[statusdat]
-type                = statusdat
-status_file         = @statusdat_file@
-object_file         = @objects_cache_file@
-
-[livestatus]
-type                = livestatus
-socket              = @livestatus_socket@
-
-[internal_ldap]
-type                = ldap
-hostname            = @ldap_host@
-port                = @ldap_port@
-root_dn             = "@ldap_rootdn@"
-bind_dn             = "@ldap_binddn@"
-bind_pw             = @ldap_bindpass@
-
-[logfile]
-type                = file
-filename            = "@icingaweb_log_path@/icingaweb.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



More information about the icinga-checkins mailing list