From f1df3fb790843726a67c15a6e7be311d4bb4b329 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 8 Apr 2021 18:06:27 +0200 Subject: [PATCH] daily autocommit --- .etckeeper | 4 +++- dhcp/dhclient-enter-hooks.d/nodnsupdate | 6 ++++++ motd | 6 +++++- resolv.conf | 8 +++++--- salt/pki/minion/minion.pem | 27 +++++++++++++++++++++++++ salt/pki/minion/minion.pub | 9 +++++++++ 6 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 dhcp/dhclient-enter-hooks.d/nodnsupdate create mode 100644 salt/pki/minion/minion.pem create mode 100644 salt/pki/minion/minion.pub diff --git a/.etckeeper b/.etckeeper index 2141f39..1b35e07 100755 --- a/.etckeeper +++ b/.etckeeper @@ -27,7 +27,6 @@ mkdir -p './opt' mkdir -p './perl/CPAN' mkdir -p './qemu/fsfreeze-hook.d' mkdir -p './salt/minion.d' -mkdir -p './salt/pki/minion' mkdir -p './salt/proxy.d' mkdir -p './security/limits.d' mkdir -p './security/namespace.d' @@ -270,6 +269,7 @@ maybe chmod 0644 'deluser.conf' maybe chmod 0755 'dhcp' maybe chmod 0644 'dhcp/debug' maybe chmod 0755 'dhcp/dhclient-enter-hooks.d' +maybe chmod 0644 'dhcp/dhclient-enter-hooks.d/nodnsupdate' maybe chmod 0755 'dhcp/dhclient-exit-hooks.d' maybe chmod 0644 'dhcp/dhclient-exit-hooks.d/chrony' maybe chmod 0755 'dhcp/dhclient-exit-hooks.d/hook-dhclient' @@ -595,6 +595,8 @@ maybe chmod 0755 'salt/minion.d' maybe chmod 0644 'salt/minion_id' maybe chmod 0755 'salt/pki' maybe chmod 0700 'salt/pki/minion' +maybe chmod 0400 'salt/pki/minion/minion.pem' +maybe chmod 0644 'salt/pki/minion/minion.pub' maybe chmod 0644 'salt/proxy' maybe chmod 0755 'salt/proxy.d' maybe chmod 0644 'securetty' diff --git a/dhcp/dhclient-enter-hooks.d/nodnsupdate b/dhcp/dhclient-enter-hooks.d/nodnsupdate new file mode 100644 index 0000000..9f5c98d --- /dev/null +++ b/dhcp/dhclient-enter-hooks.d/nodnsupdate @@ -0,0 +1,6 @@ +#!/bin/sh + +# Don't overwrite /etc/resolv.conf +make_resolv_conf() { + : +} diff --git a/motd b/motd index 8f6bd27..14568f4 100644 --- a/motd +++ b/motd @@ -6,7 +6,11 @@ Debian GNU/Linux 10 (buster) |_| |_|\___|_|\__, |\__,_| |___/ -Bildung ist das was übrig bleibt, wenn man alles andere vergessen hat. + Anthropomorphism, + Erotomorphism. +Dass er alles was auch vorgeht, in sittlich-sinnlich Gefühl +auflöst und verwandelt. + -- Goethe, Maximen und Reflektionen, Nr. 1286 Today is Pungenday, the 25th day of Discord in the YOLD 3187 diff --git a/resolv.conf b/resolv.conf index 0af19f6..e237d8c 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,3 +1,5 @@ -nameserver 213.133.98.98 -nameserver 213.133.99.99 -nameserver 213.133.100.100 +search uhu-banane.de brehm-online.com hennig-berlin.org uhu-banane.net brehm-berlin.de +nameserver 127.0.0.1 +nameserver 213.133.98.98 +nameserver 213.133.99.99 +nameserver 213.133.100.100 diff --git a/salt/pki/minion/minion.pem b/salt/pki/minion/minion.pem new file mode 100644 index 0000000..3fbeb5f --- /dev/null +++ b/salt/pki/minion/minion.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAnfChobzZkyL/nk4QfhUhX8eBEgqJf4/op8jj2+5/sL7oklW1 +/PkJsvUgVvYIBuGY8NSh0G74OfqkKEVdwWUEgo8kDyy9PFrGvhw6qcPVIxtBR0E6 +bdJQdM+4uiR8+shqWIKtuZSGdfqyumFISUuAHnVrv+9mhEl4WaGer79G5Y2GKpR3 ++65Dx2jQTKrWilo1t8s+oM1cldAQQ23xNK/S6BkB73lfIPdZtX7xLSp42PNjq8na +L3Ky/HlCXrF3052jxk2PMAgkDqINgzJ/gTIk+5SSeibf48kUCp1Alg2eNFdVcrhh +jFVmzR3T7P++1PCe87pL80Y910ZeucqL5KLIZwIDAQABAoIBABf0HFdu0GLH3pPQ +TCELLF4d4F3vmi3uEf+McL503Ane0mALPsgorwdktOxrcQk2It93qDj38467jDUN +XCxOGVKByhrBEsw6CkVf+6euqz8hTZO0eVuZl5k3vdEBYrEYP0TAQP/R3li7Vmr9 +AR0Ypcw4y8g200oB6I5TfEE0VdjPkoepzu4sr5rViXDu9A0Sr4MpzRojEmG2nWrK +1cLGJP0RUwvaew1DZf6VIRxAjnuPc6wOd7miDCZDKzZ/1K1nIx93Fli4OMcZAdKw +dyQwNaEzCyHSKhF5BdgqfQexHb4bnHrEhUVyP3Ha6JysPMRLXpkzCvhTPzUx9ch0 +Op4MKdkCgYEAxpoXXQv3sVEjjcvcb9tXKLRaJ8UB3LwEFp6TmpD89j1LaIptYzp/ +8tcIvlW1Dk9JOJ7ZYmg7P5nvQNxl7XZH+jRchrCZWCCj01RnStMRh+wMDRjUu5sI +YEymFQ+tGEYTylih7lsbkC+hkh3FQF7Iz4FccfaDPRO+vtndpNg37f8CgYEAy5YY +QYGUCgu3DgbD13Rv5IrEhLi8nLCgTYUqrq7T38qDa2PmZVNP0kVxdF4Ufa8nbPWg +b/IhtJ3O03qeZHV4/F9WvCMBmtf9ghaGPG3BKsjQ82MDW4bi5c53ZzjmVtfiw3wJ +fmjo1s5B/4zv16CcR+r28JQfhF1aI+oFeMSQdZkCgYAYHmiN9UEceKUfuE1KDFI2 +cEiuob9LJk48zP9R+x+ta943kPAd5+HYBQNb0h7N4RUcWjY+PDhNzgz/TITYZM/y +8970wIeu6y/aH1r3/FAZuLHx+T0El5xZzZUx45h65S/MGB16S/g5937gttrYqWor +wSMP+AcSKM62cND5DwUj0wKBgQDIHc3R9jEyfrl9TCENlCK4n770RzL/Qo8QJCoE +c01I2aO82AIM74uywRf4rtGtiZJThE4kO/nttIEtV4aCcQZv7LcxT6ewMUe7q7Bf +jfMmvybFVzphqYE3K3ArQr8H9kWsqiwa2bymCTDOphbL+dAk0U3SxYcFcU29p7eh +MnZdYQKBgQDBjNckOZ4rlFy2avgMRwy9e1Rsbn0G5tO5kHD65HpnkTctc6svlU8J +0asiUltO94b7yJhgHb7pkWzSfsNpaR8mOPsSxxZNOQd7bJTDj8pxsto/wVCSVQTB +VQf23LISnUaSQjQay53UF6jNWkDVdk6pcdrf326NYfENwH0SmRQe0w== +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/salt/pki/minion/minion.pub b/salt/pki/minion/minion.pub new file mode 100644 index 0000000..74aa32b --- /dev/null +++ b/salt/pki/minion/minion.pub @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnfChobzZkyL/nk4QfhUh +X8eBEgqJf4/op8jj2+5/sL7oklW1/PkJsvUgVvYIBuGY8NSh0G74OfqkKEVdwWUE +go8kDyy9PFrGvhw6qcPVIxtBR0E6bdJQdM+4uiR8+shqWIKtuZSGdfqyumFISUuA +HnVrv+9mhEl4WaGer79G5Y2GKpR3+65Dx2jQTKrWilo1t8s+oM1cldAQQ23xNK/S +6BkB73lfIPdZtX7xLSp42PNjq8naL3Ky/HlCXrF3052jxk2PMAgkDqINgzJ/gTIk ++5SSeibf48kUCp1Alg2eNFdVcrhhjFVmzR3T7P++1PCe87pL80Y910ZeucqL5KLI +ZwIDAQAB +-----END PUBLIC KEY----- \ No newline at end of file -- 2.39.5