From 4590569a19062fb9934402bb6838c7de02943260 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 8 Apr 2021 21:05:35 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 3 ++- motd | 7 ++----- salt/minion | 1 + salt/minion.d/_schedule.conf | 3 +++ salt/pki/minion/minion_master.pub | 9 +++++++++ 5 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 salt/minion.d/_schedule.conf create mode 100644 salt/pki/minion/minion_master.pub diff --git a/.etckeeper b/.etckeeper index 1b35e07..370f9a4 100755 --- a/.etckeeper +++ b/.etckeeper @@ -26,7 +26,6 @@ mkdir -p './kernel/install.d' mkdir -p './opt' mkdir -p './perl/CPAN' mkdir -p './qemu/fsfreeze-hook.d' -mkdir -p './salt/minion.d' mkdir -p './salt/proxy.d' mkdir -p './security/limits.d' mkdir -p './security/namespace.d' @@ -592,11 +591,13 @@ maybe chmod 0644 'rsyslog.d/70-fb.conf' maybe chmod 0755 'salt' maybe chmod 0644 'salt/minion' maybe chmod 0755 'salt/minion.d' +maybe chmod 0644 'salt/minion.d/_schedule.conf' 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/pki/minion/minion_master.pub' maybe chmod 0644 'salt/proxy' maybe chmod 0755 'salt/proxy.d' maybe chmod 0644 'securetty' diff --git a/motd b/motd index 14568f4..f6de607 100644 --- a/motd +++ b/motd @@ -6,11 +6,8 @@ Debian GNU/Linux 10 (buster) |_| |_|\___|_|\__, |\__,_| |___/ - Anthropomorphism, - Erotomorphism. -Dass er alles was auch vorgeht, in sittlich-sinnlich Gefühl -auflöst und verwandelt. - -- Goethe, Maximen und Reflektionen, Nr. 1286 +Hertha war keineswegs nur auf die Gefährdung des eigenen Tores bedacht. + -- Bela Rethy Today is Pungenday, the 25th day of Discord in the YOLD 3187 diff --git a/salt/minion b/salt/minion index b87397e..1bca7fa 100644 --- a/salt/minion +++ b/salt/minion @@ -713,6 +713,7 @@ # before the initial key exchange. The master fingerprint can be found by running # "salt-key -f master.pub" on the Salt master. #master_finger: '' +master_finger: '5e:63:a2:13:40:08:32:5f:70:6c:92:5c:9c:d5:d6:1c:4c:4e:79:d7:61:95:d7:09:16:1d:ca:f9:c6:4f:d5:45' # Use TLS/SSL encrypted connection between master and minion. # Can be set to a dictionary containing keyword arguments corresponding to Python's diff --git a/salt/minion.d/_schedule.conf b/salt/minion.d/_schedule.conf new file mode 100644 index 0000000..087241f --- /dev/null +++ b/salt/minion.d/_schedule.conf @@ -0,0 +1,3 @@ +schedule: + __mine_interval: {enabled: true, function: mine.update, jid_include: true, maxrunning: 2, + minutes: 60, return_job: false, run_on_start: true} diff --git a/salt/pki/minion/minion_master.pub b/salt/pki/minion/minion_master.pub new file mode 100644 index 0000000..b677f0b --- /dev/null +++ b/salt/pki/minion/minion_master.pub @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwUbxQYMDoCPQTWHREbbu +lTBJ+BNLjeUalhTgXjaR7uNiGryiOoLGtSiQFwiYClJ/7QqUoSG7A9c5Xw1Qv6CI +H73sBAdniAFaC9jeY+4Pe22QlrIuE9AoWGNw9X2gDQ1/9MHGaFnlumDW5pLNvP+i +nd3DRVNuhSR+S0/sTJUbFpzXXIzN0WijIBLA+oqlR/ANPc89Y+XhXUaVje48yW0l +oEiedhRzHPGS5mGwyDs9MqLano1LeRdu4kdyhboljqX3c/SsVgc/Q3oD42+XerI1 +rz+mkLBNzHhNQWn6k6W8PdiYTnRXH6WUyMMxniBR/5QPWx3Owu5aeSy23Dhl6SRc +EQIDAQAB +-----END PUBLIC KEY----- \ No newline at end of file -- 2.39.5