saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 7b14fd4934700c2fb5263a7ccb6b56195fbb8b78..f2d162c4469b4d314e0f7ef04124cccaf83b4fb7 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1384,6 +1384,12 @@ maybe chmod 2770 'icingaweb2/modules/director'
 maybe chown 'www-data' 'icingaweb2/modules/director/config.ini'
 maybe chgrp 'icingaweb2' 'icingaweb2/modules/director/config.ini'
 maybe chmod 0660 'icingaweb2/modules/director/config.ini'
+maybe chown 'www-data' 'icingaweb2/modules/graphite'
+maybe chgrp 'icingaweb2' 'icingaweb2/modules/graphite'
+maybe chmod 2770 'icingaweb2/modules/graphite'
+maybe chown 'www-data' 'icingaweb2/modules/graphite/config.ini'
+maybe chgrp 'icingaweb2' 'icingaweb2/modules/graphite/config.ini'
+maybe chmod 0660 'icingaweb2/modules/graphite/config.ini'
 maybe chown 'www-data' 'icingaweb2/modules/monitoring'
 maybe chgrp 'icingaweb2' 'icingaweb2/modules/monitoring'
 maybe chmod 2770 'icingaweb2/modules/monitoring'

diff --git a/icinga2/features-available/graphite.conf b/icinga2/features-available/graphite.conf
index ae8a9288ffdaf0fe2903e71142e3db9f8babd145..1f83635e55d9ddb0c952014aa3a4da2b7423d8dc 100644 (file)
--- a/icinga2/features-available/graphite.conf
+++ b/icinga2/features-available/graphite.conf
@@ -4,6 +4,7 @@
  */
 
 object GraphiteWriter "graphite" {
-  //host = "127.0.0.1"
-  //port = 2003
+  host = "127.0.0.1" 
+  port = 2003
+  enable_send_thresholds = true
 }

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

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

diff --git a/icingaweb2/modules/graphite/config.ini b/icingaweb2/modules/graphite/config.ini
new file mode 100644 (file)
index 0000000..9095faf
--- /dev/null
+++ b/icingaweb2/modules/graphite/config.ini
@@ -0,0 +1,5 @@
+[graphite]
+url = "https://207.180.228.45:2003"
+user = "admin"
+password = "LgnhywREd4INdvhsQdqYAsuicEju0Yxi"
+insecure = "0"

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 2f68550a91405aa532508a1f6f27673c2a31b3e7..7ddf81fe2f2029fd21d19739e52d506c9beb150e 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA+eWTX3A/DzvA/w76dR/SNncv3KnqVdjh23jPCvo4aR69GC6WbyBA
-+beEc11y2Cl53j6luI5PrMnHz260anxppCPyhUc8TlhDjEJHLUj7EJBOdctOGald
-Idz1H+MbftX7L2dt2nyGXPd31xSsFyWSnNeCI/A0g8isECOKNQmzsIQt66lKg6G/
-yVX8+ZcsEFZx0L48K3NFCpodTNYnbP2J6xH6aD29TZBjty/fHMfV3uosgFkAp+bx
-qTd2vTgkUy1Ey2RdZken9aHZxrCiSO79D3krreE7dpYV1Ylj3iTNVriSY8Jzhs5i
-QArKngVWKZVVQ0brl369rOU4RiVZm0X94wIBAg==
+MIIBCAKCAQEAgqJZlDR7VzbYPgmPRw1lWcI4eRDOR1ZPqoCkuXq99GEGM4lX5y5+
+x6ET3PrbadBARSpWKfzAIbI7r762tggR8gTcXx1D94XqO7YWxdejZmJE9cw58S8p
+pJu297/lI5+vJaTKWBHkril9jpRcaS0kqFPgUTD/Q1MJ6AvHLeiTvi/oM4vHm+rQ
+rJiaoGx2HYDAGrBV+GgQBuf8+2B/yZhvWo2tPDmAg4IL7SkPil+LzAeMQDe97/zo
+utsLf+/CixHRwBUerbKibxrX6VJSoTev3NrgNpcpw62fF/KWQeMUdmYX7TtXmBKm
+3urQXiGQgEbaVLrni+WAvFjMfKLYOtSdiwIBAg==
 -----END DH PARAMETERS-----