From: Frank Brehm <frank@brehm-online.com>
Date: Sat, 17 Apr 2021 04:25:04 +0000 (+0200)
Subject: daily autocommit
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=0df2409de7bb52c1b6c9781a5d76fca26ac62b51;p=config%2Fhelga-hetzner%2Fetc.git

daily autocommit
---

diff --git a/fstab b/fstab
index cc1ac12..32c4361 100644
--- a/fstab
+++ b/fstab
@@ -10,6 +10,7 @@ UUID=0898636c-989a-4733-a7a7-c4d27fd648ad	/		ext4		errors=remount-ro	0	1
 # /boot/efi was on /dev/sda2 during installation
 UUID=B45B-E011					/boot/efi	vfat		umask=0077		0	1
 /dev/sr0					/media/cdrom0	udf,iso9660	user,noauto		0	0
+/swap						none		swap		sw			0	0
 /dev/data/backup				/var/backup	ext4		noatime			0	0
 /dev/data/home					/home		ext4		acl,user_xattr		0	0
 /dev/data/mysql					/var/lib/mysql	ext4		noatime			0	0
diff --git a/icinga2/features-available/api.conf b/icinga2/features-available/api.conf
index 677a96e..21fb7ed 100644
--- a/icinga2/features-available/api.conf
+++ b/icinga2/features-available/api.conf
@@ -2,10 +2,12 @@
  * The API listener is used for distributed monitoring setups.
  */
 object ApiListener "api" {
-  cert_path = SysconfDir + "/icinga2/pki/" + NodeName + ".crt"
-  key_path = SysconfDir + "/icinga2/pki/" + NodeName + ".key"
-  ca_path = SysconfDir + "/icinga2/pki/ca.crt"
+  # cert_path = SysconfDir + "/icinga2/pki/" + NodeName + ".crt"
+  # key_path = SysconfDir + "/icinga2/pki/" + NodeName + ".key"
+  # ca_path = SysconfDir + "/icinga2/pki/ca.crt"
 
   accept_config = true
   accept_commands = true
+
+  ticket_salt = TicketSalt
 }
diff --git a/icinga2/icinga2.conf b/icinga2/icinga2.conf
index 187834f..b1f0c03 100644
--- a/icinga2/icinga2.conf
+++ b/icinga2/icinga2.conf
@@ -49,6 +49,12 @@ include <nscp>
  */
 include "features-enabled/*.conf"
 
+/**
+ * The repository.d directory contains all configuration objects
+ * managed by the 'icinga2 repository' CLI commands.
+ */
+# include_recursive "repository.d"
+
 /**
  * Although in theory you could define all your objects in this file
  * the preferred way is to create separate directories and files in the conf.d
@@ -56,3 +62,6 @@ include "features-enabled/*.conf"
  */
 // Disabled by the node setup CLI command on 2021-04-15 13:33:04 +0200
 // include_recursive "conf.d"
+
+/* vim: filetype=icinga2
+*/
diff --git a/icinga2/zones.conf b/icinga2/zones.conf
index bfa71ed..1236389 100644
--- a/icinga2/zones.conf
+++ b/icinga2/zones.conf
@@ -4,28 +4,34 @@
  */
 
 object Endpoint "ns1.uhu-banane.de" {
-	host = "ns1.uhu-banane.de"
-	port = "5665"
 }
 
 object Zone "master" {
 	endpoints = [ "ns1.uhu-banane.de" ]
 }
 
-object Endpoint "helga.uhu-banane.de" {
+object Endpoint NodeName {
 }
 
-object Zone "helga.uhu-banane.de" {
-	endpoints = [ "helga.uhu-banane.de" ]
-	parent = "master"
+object Zone ZoneName {
+        endpoints = [ NodeName ]
+        parent = "master"
 }
 
-object Zone "global-templates" {
-	global = true
-}
-
-object Zone "director-global" {
-	global = true
-}
+# object Endpoint "helga.uhu-banane.de" {
+# }
+# 
+# object Zone "helga.uhu-banane.de" {
+# 	endpoints = [ "helga.uhu-banane.de" ]
+# 	parent = "master"
+# }
+# 
+# object Zone "global-templates" {
+# 	global = true
+# }
+# 
+# object Zone "director-global" {
+# 	global = true
+# }
 
 
diff --git a/logrotate.d/icinga2 b/logrotate.d/icinga2
index df45df7..9831814 100644
--- a/logrotate.d/icinga2
+++ b/logrotate.d/icinga2
@@ -1,23 +1,28 @@
-/var/log/icinga2/icinga2.log /var/log/icinga2/debug.log {
+# /var/log/icinga2/icinga2.log /var/log/icinga2/debug.log {
+/var/log/icinga2/*.log {
 	daily
 	rotate 7
 	compress
 	delaycompress
 	missingok
 	notifempty
-	create 644 nagios nagios
+	minsize 4M
+	olddir /var/log/icinga2/.old
+	create 644 nagios adm
 	postrotate
 		/bin/kill -USR1 $(cat /run/icinga2/icinga2.pid 2> /dev/null) 2> /dev/null || true
 	endscript
 }
 
-/var/log/icinga2/error.log {
-	daily
-	rotate 90
-	compress
-	delaycompress
-	missingok
-	notifempty
-	create 644 nagios nagios
-	# TODO: figure out how to get Icinga to re-open this log file
-}
+# /var/log/icinga2/error.log {
+# 	daily
+# 	rotate 90
+# 	compress
+# 	delaycompress
+# 	missingok
+# 	notifempty
+# 	create 644 nagios nagios
+# 	# TODO: figure out how to get Icinga to re-open this log file
+# }
+
+# vim: ts=4 filetype=conf noet
diff --git a/motd b/motd
index bd5093e..89cebfc 100644
--- a/motd
+++ b/motd
@@ -6,9 +6,29 @@ Debian GNU/Linux 10 (buster)
 |_| |_|\___|_|\__, |\__,_|
               |___/       
 
-Vertraue keinem Kostenplan, von dem Du keinen Quellcode
-(detaillierte Aufstellung) bekommst.
-		-- Michael Uhlemann
+  Kleine Geschichte
 
-Today is Sweetmorn, the 33rd day of Discord in the YOLD 3187
+Litt einst ein Fähnlein große Not,
+halb war es gelb, halb war es rot
+und wollte gern zusammen
+zu einer lichten Flammen.
+
+Es zog sich, wand sich, wellte sich,
+es knitterte, es schnellte sich -
+umsonst! es mocht nicht glücken,
+die Naht zu überbrücken.
+
+Da kam ein Wolkenbruch daher
+und wusch das Fähnlein kreuz und quer,
+daß Rot und Gelb, zerflossen,
+voll Inbrunst sich genossen.
+
+Des Fähnleins Herren freilich war
+des Vorgangs Freudigkeit nicht klar -
+indes, die sich besaßen,
+nun alle Welt vergaßen.
+
+		-- Christian Morgenstern
+
+Today is Boomtime, the 34th day of Discord in the YOLD 3187