saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index bdfc58a588946fe53689626d7143441a378cef80..1b9a8e6b351f61273428aa05f3500d2393726d1c 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -906,10 +906,40 @@ maybe chmod 0644 'icinga2/zones.d/master/salt.conf'
 maybe chmod 0644 'icinga2/zones.d/master/services.conf'
 maybe chgrp 'icingaweb2' 'icingaweb2'
 maybe chmod 2770 'icingaweb2'
+maybe chown 'www-data' 'icingaweb2/authentication.ini'
+maybe chgrp 'icingaweb2' 'icingaweb2/authentication.ini'
+maybe chmod 0660 'icingaweb2/authentication.ini'
+maybe chown 'www-data' 'icingaweb2/config.ini'
+maybe chgrp 'icingaweb2' 'icingaweb2/config.ini'
+maybe chmod 0660 'icingaweb2/config.ini'
+maybe chown 'www-data' 'icingaweb2/enabledModules'
+maybe chgrp 'icingaweb2' 'icingaweb2/enabledModules'
+maybe chmod 2750 'icingaweb2/enabledModules'
+maybe chown 'www-data' 'icingaweb2/groups.ini'
+maybe chgrp 'icingaweb2' 'icingaweb2/groups.ini'
+maybe chmod 0660 'icingaweb2/groups.ini'
 maybe chgrp 'icingaweb2' 'icingaweb2/modules'
 maybe chmod 2770 'icingaweb2/modules'
+maybe chown 'www-data' 'icingaweb2/modules/monitoring'
+maybe chgrp 'icingaweb2' 'icingaweb2/modules/monitoring'
+maybe chmod 2770 'icingaweb2/modules/monitoring'
+maybe chown 'www-data' 'icingaweb2/modules/monitoring/backends.ini'
+maybe chgrp 'icingaweb2' 'icingaweb2/modules/monitoring/backends.ini'
+maybe chmod 0660 'icingaweb2/modules/monitoring/backends.ini'
+maybe chown 'www-data' 'icingaweb2/modules/monitoring/commandtransports.ini'
+maybe chgrp 'icingaweb2' 'icingaweb2/modules/monitoring/commandtransports.ini'
+maybe chmod 0660 'icingaweb2/modules/monitoring/commandtransports.ini'
+maybe chown 'www-data' 'icingaweb2/modules/monitoring/config.ini'
+maybe chgrp 'icingaweb2' 'icingaweb2/modules/monitoring/config.ini'
+maybe chmod 0660 'icingaweb2/modules/monitoring/config.ini'
 maybe chmod 0755 'icingaweb2/modules/translation'
 maybe chmod 0644 'icingaweb2/modules/translation/config.ini'
+maybe chown 'www-data' 'icingaweb2/resources.ini'
+maybe chgrp 'icingaweb2' 'icingaweb2/resources.ini'
+maybe chmod 0660 'icingaweb2/resources.ini'
+maybe chown 'www-data' 'icingaweb2/roles.ini'
+maybe chgrp 'icingaweb2' 'icingaweb2/roles.ini'
+maybe chmod 0660 'icingaweb2/roles.ini'
 maybe chmod 0755 'init'
 maybe chmod 0755 'init.d'
 maybe chmod 0644 'init.d/README'

diff --git a/group b/group
index caa093a7056f2f2977b068403bf2f7c79f932557..18750932df6957e2f0f3a911d2e77ee762ce24b4 100644 (file)
--- a/group
+++ b/group
@@ -58,3 +58,4 @@ messagebus:x:117:
 _chrony:x:118:
 nagios:x:119:
 icingaweb2:x:120:www-data
+icingacmd:x:121:www-data

diff --git a/group- b/group-
index ff4e78231b9db23b4fb9f2679ee376cf9dbfa3c2..d428dcbb409ec064c38fd4c84f86de90ab10456d 100644 (file)
--- a/group-
+++ b/group-
@@ -57,4 +57,5 @@ postgres:x:116:
 messagebus:x:117:
 _chrony:x:118:
 nagios:x:119:
-icingaweb2:x:120:
+icingaweb2:x:120:www-data
+icingacmd:x:121:

diff --git a/gshadow b/gshadow
index 4f1ce2661af604f421bcdd000d62fed741084ffa..49226a21dd2375ab008fb125b841c3590c1b02d4 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -58,3 +58,4 @@ messagebus:!::
 _chrony:!::
 nagios:!::
 icingaweb2:!::www-data
+icingacmd:!::www-data

diff --git a/gshadow- b/gshadow-
index 63c98b9c8117f18da3cf0bd08b91cd18655bc6a7..e19fe3cc925b7e19f598f2128cf3ccd0d5422d6d 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -57,4 +57,5 @@ postgres:!::
 messagebus:!::
 _chrony:!::
 nagios:!::
-icingaweb2:!::
+icingaweb2:!::www-data
+icingacmd:!::

diff --git a/icinga2/features-enabled/ido-pgsql.conf b/icinga2/features-enabled/ido-pgsql.conf
new file mode 120000 (symlink)
index 0000000..ac459c7
--- /dev/null
+++ b/icinga2/features-enabled/ido-pgsql.conf
@@ -0,0 +1 @@
+../features-available/ido-pgsql.conf
\ No newline at end of file

diff --git a/icingaweb2/authentication.ini b/icingaweb2/authentication.ini
new file mode 100644 (file)
index 0000000..6852ece
--- /dev/null
+++ b/icingaweb2/authentication.ini
@@ -0,0 +1,3 @@
+[icingaweb2]
+backend = "db"
+resource = "icingaweb_db"

diff --git a/icingaweb2/config.ini b/icingaweb2/config.ini
new file mode 100644 (file)
index 0000000..fa9888e
--- /dev/null
+++ b/icingaweb2/config.ini
@@ -0,0 +1,11 @@
+[global]
+show_stacktraces = "1"
+show_application_state_messages = "1"
+config_backend = "db"
+config_resource = "icingaweb_db"
+
+[logging]
+log = "syslog"
+level = "INFO"
+application = "icingaweb2"
+facility = "local6"

diff --git a/icingaweb2/enabledModules/monitoring b/icingaweb2/enabledModules/monitoring
new file mode 120000 (symlink)
index 0000000..c201d00
--- /dev/null
+++ b/icingaweb2/enabledModules/monitoring
@@ -0,0 +1 @@
+/usr/share/icingaweb2/modules/monitoring
\ No newline at end of file

diff --git a/icingaweb2/groups.ini b/icingaweb2/groups.ini
new file mode 100644 (file)
index 0000000..6852ece
--- /dev/null
+++ b/icingaweb2/groups.ini
@@ -0,0 +1,3 @@
+[icingaweb2]
+backend = "db"
+resource = "icingaweb_db"

diff --git a/icingaweb2/modules/monitoring/backends.ini b/icingaweb2/modules/monitoring/backends.ini
new file mode 100644 (file)
index 0000000..702a1a4
--- /dev/null
+++ b/icingaweb2/modules/monitoring/backends.ini
@@ -0,0 +1,3 @@
+[icinga]
+type = "ido"
+resource = "icinga_ido"

diff --git a/icingaweb2/modules/monitoring/commandtransports.ini b/icingaweb2/modules/monitoring/commandtransports.ini
new file mode 100644 (file)
index 0000000..d0163da
--- /dev/null
+++ b/icingaweb2/modules/monitoring/commandtransports.ini
@@ -0,0 +1,6 @@
+[icinga2]
+transport = "api"
+host = "localhost"
+port = "5665"
+username = "root"
+password = "fe5ff0896bafec3e"

diff --git a/icingaweb2/modules/monitoring/config.ini b/icingaweb2/modules/monitoring/config.ini
new file mode 100644 (file)
index 0000000..9b69fe8
--- /dev/null
+++ b/icingaweb2/modules/monitoring/config.ini
@@ -0,0 +1,2 @@
+[security]
+protected_customvars = "*pw*,*pass*,community"

diff --git a/icingaweb2/resources.ini b/icingaweb2/resources.ini
new file mode 100644 (file)
index 0000000..adeaebe
--- /dev/null
+++ b/icingaweb2/resources.ini
@@ -0,0 +1,21 @@
+[icingaweb_db]
+type = "db"
+db = "pgsql"
+host = "localhost"
+port = "5432"
+dbname = "icinga2"
+username = "icinga2"
+password = "aiqu3rieNoy="
+charset = "utf-8"
+use_ssl = "0"
+
+[icinga_ido]
+type = "db"
+db = "pgsql"
+host = "localhost"
+port = "5432"
+dbname = "icinga2"
+username = "icinga2"
+password = "aiqu3rieNoy="
+charset = "utf-8"
+use_ssl = "0"

diff --git a/icingaweb2/roles.ini b/icingaweb2/roles.ini
new file mode 100644 (file)
index 0000000..5e1c6ab
--- /dev/null
+++ b/icingaweb2/roles.ini
@@ -0,0 +1,4 @@
+[Administratoren]
+users = "admin"
+permissions = "*"
+groups = "Administratoren"

diff --git a/php/7.0/apache2/php.ini b/php/7.0/apache2/php.ini
index 86be54b2526ccd506dd812404d0297bfdff5c000..74b686b83c5f0662c9c76310eecad008b73be66c 100644 (file)
--- a/php/7.0/apache2/php.ini
+++ b/php/7.0/apache2/php.ini
@@ -922,6 +922,7 @@ cli_server.color = On
 ; Defines the default timezone used by the date functions
 ; http://php.net/date.timezone
 ;date.timezone =
+date.timezone = "Europe/Berlin"
 
 ; http://php.net/date.default-latitude
 ;date.default_latitude = 31.7667

diff --git a/postgresql/9.6/main/pg_hba.conf b/postgresql/9.6/main/pg_hba.conf
index 0fbb8276bb3b095b6bb10db67b5b5cb2c82db3b4..84119e3251109cb6bd1efcbb81158796bdbcd32b 100644 (file)
--- a/postgresql/9.6/main/pg_hba.conf
+++ b/postgresql/9.6/main/pg_hba.conf
@@ -88,6 +88,7 @@ local   all             postgres                                peer
 
 # "local" is for Unix domain socket connections only
 local   all             root                                    md5
+local  all             icinga2                                 md5
 local   all             all                                     peer
 # IPv4 local connections:
 host    all             all             127.0.0.1/32            md5