Current state

diff --git a/.etckeeper b/.etckeeper
index 62ae4183e390eefd34c4dec71e5658c8da114fe7..901a49ccc79ecd470a01591c6a5dc9f0a25ef179 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -945,6 +945,7 @@ maybe chmod 0644 'salt/pki/master/minions/storage1604.dc2.us.profitbricks.net'
 maybe chmod 0644 'salt/pki/master/minions/storage2.stage.pb.local'
 maybe chmod 0644 'salt/pki/master/minions/storage3.stage.pb.local'
 maybe chmod 0644 'salt/pki/master/minions/storage4.stage.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/storage6.stage.pb.local'
 maybe chmod 0644 'salt/pki/master/minions/storage7.stage.pb.local.pub'
 maybe chmod 0644 'salt/pki/master/minions/weimar.pb.local'
 maybe chmod 0644 'salt/pki/master/minions/ztest-ftp.pb.local'

diff --git a/cron.daily/logrotate b/cron.daily/logrotate
index c6d50d4a7e87dc2744440bd9b7a07199a0a6224b..c39ad8989d377b94ea264445d26e3a5b287064fa 100755 (executable)
--- a/cron.daily/logrotate
+++ b/cron.daily/logrotate
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-/usr/sbin/logrotate /etc/logrotate.conf
+/usr/sbin/logrotate -v /etc/logrotate.conf | tee -a /var/log/logrotate.log
 EXITVALUE=$?
 if [ $EXITVALUE != 0 ]; then
     /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"

diff --git a/runlevels/default/salt-master b/runlevels/default/salt-master
new file mode 120000 (symlink)
index 0000000..1edd4cd
--- /dev/null
+++ b/runlevels/default/salt-master
@@ -0,0 +1 @@
+/etc/init.d/salt-master
\ No newline at end of file

diff --git a/salt/pki/master/minions/storage3.stage.pb.local b/salt/pki/master/minions/storage3.stage.pb.local
index fa74ca6f83072edb80ab39d0ff8691f2e6bb5c1a..c40569fa2477f873a497061f102b09f74ffaa9b8 100644 (file)
--- a/salt/pki/master/minions/storage3.stage.pb.local
+++ b/salt/pki/master/minions/storage3.stage.pb.local
@@ -1,14 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwEieIGOkv/YX3z/MwtMa
-EpBRXMWWmrRewww4eWgcwUtY0ZCEBn9VsJcI8j4wQT5SDkTWlM/m+tLSG2bbWb1A
-uVGHmsQvA0kYKVCecyryKLdG8Ad34r5UW54Mqeynxhtr19KVvGBPoWKXhGU/9iGQ
-Om8yMsgsdumQj09PD/QUsnpV77eAIQr2kquhaWmPiQb7C2rQg3HSm9iKDcfxYi+1
-W2/KOsbVxsu3aIIIL70VrF83ykzHFk6erpQDD10z3BRQ2NwrmS6Q/hFTQr3PqVfC
-FpJ4dQI3DYcsK4uFuh1BU6Yn+KHcr4BOYwekII/5xI3lrRHZ9htlCQa8ukJN+Ubq
-HgsN8l2lONgjLn2P5Fo+TH2dglYtL8pMCi360gX55PwqYayVIrFy5QhmcukMMeXI
-odTGqtPOEtrtrMW0Cewm73hE02g1LhGkzkq6Oc5l3sb+M5ySf09qx3IqNMT8ad1q
-6jr1IU0rT0BYh47efNo/gAv5vkxExUthI4BqO8FkaCJXhHGKJ8G6VTh0jccY5uRY
-9lvU4nnR3psMVAGGA70yoJNscy15legpV+co62AQRZrnF0QoS605cyCd3PqFlxnK
-sLlWhzjcXB0+QR163da4tjl9Qveu8hyTYy3WyVej53r7kTXuEogvBWrvSUofI9PF
-fy+Qm1Rv6quUO6ly+oTlOe0CAwEAAQ==
------END PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2qAYTNXasN74Je0gch86
+m3qTZ0jOywVXQUszj0Iu/uD81Wz8U4zf9DIkb5/Z5usxx+PsBxiK+0RsyeR3sYNG
+COzAyDZ+VyvMPLco/+ITEKGBOh0y6hvwbyIW6F+mevP9l2I8kC+PBPYUANV8vcQ6
+owbIX5wGtSileKt+OhEOUEWEfWESbH2XI/7oSwnT1U8hDnTTMVueH3HsBzF2WVdl
+1lYazhNuVqmWurtgGq+clyUeQfZRjbBxbIG0cCQlYV5linieqNPxP9C49qQqnm8P
+yqNrgCB5slq1A7uIDiDfcUKz/BAfz1HKx24a0okxiZhjUI4rmd+7796G3DtsaUev
+qwIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file

diff --git a/salt/pki/master/minions/storage6.stage.pb.local b/salt/pki/master/minions/storage6.stage.pb.local
new file mode 100644 (file)
index 0000000..3068c8d
--- /dev/null
+++ b/salt/pki/master/minions/storage6.stage.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjcgqWaDdbF6alAR6bs9S
+xJsxm98ka0ayNKc5FgLDSEMD1VPmPLB2fJhW72LkyZ14xeosxCidiNMqSi2fTPHb
+jyHTp42F0ERtljJxQc8x8lvUV7+wNIT1gF2dOhpQdg/3BYUVs4caK4wrhn6d+PPq
+L2hkWYgdv/vhYXzZG5u8SVOENMY+OLlLInaGI1NKQahh8ScPnaeNWBu6xPVs3PA2
+XZenN/QcpdNwyBCZOCv8e6XbCoNZMkXxxBMG/OmN4UawDFle77GOtdZNbmFjlqgn
+NN48FLjNz6ADE0nmTRvY5P8Ns9kiZXBzzaavwVmkpC+2X6m4B/LShgzx5dJK8vQ5
+hwIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file