Current state

diff --git a/.etckeeper b/.etckeeper
index 8c9dbf2c09cace23cee077aa74d411cf41278112..db3918fc12c8cc27d2fe8e9efcab4f1fb842cf8e 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -27,7 +27,6 @@ mkdir -p './network/interfaces.d'
 mkdir -p './opt'
 mkdir -p './perl/CPAN'
 mkdir -p './salt/minion.d'
-mkdir -p './salt/pki/minion'
 mkdir -p './security/limits.d'
 mkdir -p './security/namespace.d'
 mkdir -p './ssl/private'
@@ -38,7 +37,7 @@ mkdir -p './udev/hwdb.d'
 mkdir -p './udev/rules.d'
 maybe chmod 0755 '.'
 maybe chmod 0700 '.etckeeper'
-maybe chmod 0644 '.gitignore'
+maybe chmod 0600 '.gitignore'
 maybe chmod 0755 'X11'
 maybe chmod 0755 'X11/Xsession.d'
 maybe chmod 0644 'X11/Xsession.d/60xdg-user-dirs-update'
@@ -467,7 +466,6 @@ maybe chmod 0644 'mke2fs.conf'
 maybe chmod 0755 'modprobe.d'
 maybe chmod 0644 'modules'
 maybe chmod 0755 'modules-load.d'
-maybe chmod 0644 'motd'
 maybe chmod 0644 'motd.tail'
 maybe chmod 0644 'nanorc'
 maybe chmod 0755 'network'
@@ -566,6 +564,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 0755 'sbuild'
 maybe chmod 0755 'sbuild/chroot'
 maybe chmod 0644 'sbuild/sbuild.conf'

diff --git a/.gitignore b/.gitignore
index 9196cf5ca490c1ab2ae91f7c359f8f52c50344f9..f1a53d8393d848847fa20da4838e8c67d4ee1661 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ cups/subscriptions.conf
 cups/subscriptions.conf.O
 fake-hwclock.data
 check_mk/logwatch.state
+/motd
 
 # editor temp files
 *~

diff --git a/logrotate.d/aptitude b/logrotate.d/aptitude
index 7fc7ee80cb5d92d644f94c64fb4fcb3c32e68926..c2b3959a1e8bcb86ab36ba0f0269fa16f1b0c590 100644 (file)
--- a/logrotate.d/aptitude
+++ b/logrotate.d/aptitude
@@ -1,9 +1,9 @@
 /var/log/aptitude {
-       rotate 6
-       monthly
-       compress
-       delaycompress   
-       missingok
+    rotate 6
+    monthly
+    compress
+    delaycompress
+    missingok
     notifempty
     size 1M
     dateext

diff --git a/logrotate.d/rsyslog b/logrotate.d/rsyslog
index 5102645f244a77358d2567893a27b7a1e40e31d3..5463612c8043a2520ad2796ac2ff0bef770eb4fb 100644 (file)
--- a/logrotate.d/rsyslog
+++ b/logrotate.d/rsyslog
@@ -1,19 +1,19 @@
 /var/log/syslog
 /var/log/messages
 {
-       rotate 7
-       daily
-       missingok
-       notifempty
-       delaycompress
-       compress
-       dateext
-       size 4M
-       olddir /var/log/.old
-       sharedscripts
-       postrotate
-               invoke-rc.d rsyslog rotate > /dev/null
-       endscript
+    rotate 7
+    daily
+    missingok
+    notifempty
+    delaycompress
+    compress
+    dateext
+    size 4M
+    olddir /var/log/.old
+    sharedscripts
+    postrotate
+        invoke-rc.d rsyslog rotate > /dev/null
+    endscript
 }
 
 /var/log/all.log
@@ -30,19 +30,19 @@
 /var/log/debug
 /var/log/debug.log
 {
-       rotate 4
-       weekly
-       missingok
-       notifempty
-       compress
-       delaycompress
-       dateext
-       size 4M
-       olddir /var/log/.old
-       sharedscripts
-       postrotate
-               invoke-rc.d rsyslog rotate > /dev/null
-       endscript
+    rotate 4
+    weekly
+    missingok
+    notifempty
+    compress
+    delaycompress
+    dateext
+    size 4M
+    olddir /var/log/.old
+    sharedscripts
+    postrotate
+        invoke-rc.d rsyslog rotate > /dev/null
+    endscript
 }
 
 /var/log/syslog.d/*.log {

diff --git a/logrotate.d/salt-common b/logrotate.d/salt-common
index dcfd268f1fd5685c810ddce12a6818028c80bf45..3ba97f70892dbb5fe17d5d8748624ae941f46bae 100644 (file)
--- a/logrotate.d/salt-common
+++ b/logrotate.d/salt-common
@@ -2,9 +2,15 @@
 /var/log/salt/minion
 /var/log/salt/*.log
 {
-       weekly
-       missingok
-       rotate 7
-       compress
-       notifempty
+    weekly
+    missingok
+    rotate 7
+    compress
+    notifempty
+    size +1M
+    sharedscripts
+    postrotate
+        invoke-rc.d salt-master restart > /dev/null
+    endscript
 }
+# vim: ts=4 filetype=conf et

diff --git a/motd b/motd
deleted file mode 100644 (file)
index bcf7602..0000000
--- a/motd
+++ /dev/null
@@ -1,14 +0,0 @@
-Linux lena 4.7.0-1-amd64 #1 SMP Debian 4.7.8-1 (2016-10-19) x86_64 GNU/Linux
-Debian GNU/Linux testing (stretch)
- _                     
-| |    ___ _ __   __ _ 
-| |   / _ \ '_ \ / _` |
-| |__|  __/ | | | (_| |
-|_____\___|_| |_|\__,_|
-                       
-
-Für das Können gibt es nur einen Beweis: das Tun.
-               -- Marie von Ebner-Eschenbach
-
-Today is Sweetmorn, the 14th day of The Aftermath in the YOLD 3182
-

diff --git a/salt/minion b/salt/minion
index 7270f0c73de473142bf3532802f7d9483018478f..d120d275dd9fb003c7fa67d041d3034f7a732eda 100644 (file)
--- a/salt/minion
+++ b/salt/minion
@@ -14,6 +14,7 @@
 # Set the location of the salt master server. If the master server cannot be
 # resolved, then the minion will fail to start.
 #master: salt
+master: salt.uhu-banane.de
 
 # Set http proxy information for the minion when doing requests
 #proxy_host:

diff --git a/salt/pki/minion/minion.pem b/salt/pki/minion/minion.pem
new file mode 100644 (file)
index 0000000..68bc389
--- /dev/null
+++ b/salt/pki/minion/minion.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAoOY5X7mI1sXML46E+hGsdT0SGa78pGmOAapepex5WXrnrfC4
+JftqmeXarQzUB4t95wEIj2l8l5e3sv1NiQDpgLBaqdk0KwrUVrJ8Ez8xfbmTUuWx
+t61KvNB19np352nhNKhdnv7wapNKh7OvIFwD3oAMuU/MOczuM6ceKvez9yhUb6ZH
+3kcLGDQ4DtMC5+2bL/N2Wq3XO/KFhNmNF6+cQw+Cxb9ybaLJTWqqN66xYzTbeUnd
+ULJPsOROgUZFN15mZtNjLU/Gi9SWCCL2BTvH43ew05ETPlnNXUwX/VlLYkZoWv32
+H4K+NBv4PJlYF15+vZnVJKDCvfiUVmP++TPBDwIDAQABAoIBAG53gh6hoDxsktJ3
+0/5okfHwGvQ9OsGaot+r282pPGtdwaCfa57QLZE5yVgUPaJsd+VYxUrJDrx5cqrV
+1Bzi3m33JlgEgxemGMDpS9xe/5ilB2vbvZcwx+Y4bTTrQlVEUVU43wYhXGifdYUT
+rYHXCuUBHzs/eSSZ+VTHQSQY6pseI1NNdr9HoxNww3mHEgcwYHnbeX0fwrkRjFiz
+Gtynaj75UxtSroR63j6R4T7NaZC6xngZp2BiMbziqEh/pYQdoUwwNBCxRw0F/bS7
+t6Myg9z96Jmi3T3c1bcvmy4jUma0DLc+OK43PvmSi0+h6kGue5rnhxA7YjBiHorK
+2sB6OmECgYEAwY5Rh9bqgpmrwZvFaNDZi6QkKt7mAH66d5j7l9xk8rTx3p/oEPBo
+dLyhKWwHzJNGgTG9ptsN6tfOHyz43M4d3BqQZL/78BC9de4bCyTZhicGqZCZRvBj
+MjjGBvqkUSEB5bXJ2fd2071varkah6pMimm+m5BM7HBft5OSq6f8BPECgYEA1M7Q
+F8v42FW6jcCGNIlSVxLOJ60LdavTFfWQqZ/7tCcKioBfyy63SQCBf2FxIC/wlma/
+kzRHFz4Syv/Y904IWSFNjs+FX0uGlDcKFUUE6gYH9OSJTXVOT/j8U6XPr9GdKAhH
+/svHriw5REV9W7gdzGEVb0F2d4LmhlT9l6+0Jf8CgYAghQvXudku1ijQX56cTLKw
+ToSxG0AjhydHHtHuot3nFVWp5M31wp6aNnMRZZAt4/StkjDeDuHYuidsf37UgmDr
+8R6ffs4SeI2MedPbXHabnoT1ClFmZM8VygojdAsVgmkyMgfW8kfprWNB2BXIA2nW
+u4uF0YnLE9pRGp9C7fde0QKBgGIb7qfp65GhBF6xsa2q2YE3ND/qcWwQiUKIcech
+0KMflKaBxKgho3JOf2VAgSz7rQlJ2Wx+H4BBp9xa06ZAHW0qA12horVqVmMidM2V
+gkx591UZv4ssV6xa98mAmh1OoAuCtd5sCGTuEoC9IKwWV/aPk5g1L+6tNKYdrMQv
+xvf1AoGADGKcj9siiT1abajb5coNh0/fN/FfcvwyYiH7/lCO/1XzFJ4GChjaNKkV
+VyLpTWgHqEmvJ5UlA2d1ltq5MQrpTqLLuxoEnMILwSoK16IHLszpqUx3ek0JMIlj
+pkpBt9LQtb32a45aFYBtX9bs8EZfG/6WneorWjBtQYQXYbjBdVk=
+-----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 (file)
index 0000000..6129939
--- /dev/null
+++ b/salt/pki/minion/minion.pub
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoOY5X7mI1sXML46E+hGs
+dT0SGa78pGmOAapepex5WXrnrfC4JftqmeXarQzUB4t95wEIj2l8l5e3sv1NiQDp
+gLBaqdk0KwrUVrJ8Ez8xfbmTUuWxt61KvNB19np352nhNKhdnv7wapNKh7OvIFwD
+3oAMuU/MOczuM6ceKvez9yhUb6ZH3kcLGDQ4DtMC5+2bL/N2Wq3XO/KFhNmNF6+c
+Qw+Cxb9ybaLJTWqqN66xYzTbeUndULJPsOROgUZFN15mZtNjLU/Gi9SWCCL2BTvH
+43ew05ETPlnNXUwX/VlLYkZoWv32H4K+NBv4PJlYF15+vZnVJKDCvfiUVmP++TPB
+DwIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file