saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index b92fe43a4012aab1250cb6217f65ba90932b3a35..d75000814ed901d9e6317ca670d77352e1cb1afc 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -5,7 +5,6 @@ mkdir -p './salt/pki/master/minions_autosign'
 mkdir -p './salt/pki/master/minions_denied'
 mkdir -p './salt/pki/master/minions_pre'
 mkdir -p './salt/pki/master/minions_rejected'
-mkdir -p './salt/pki/minion'
 mkdir -p './security/limits.d'
 mkdir -p './security/namespace.d'
 mkdir -p './skel/.ssh'
@@ -878,6 +877,7 @@ 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/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'
 maybe chmod 0644 'salt/pki/master/minions/ztest-pserver1.pb.local'
 maybe chmod 0644 'salt/pki/master/minions/ztest-pserver2.pb.local'
@@ -892,6 +892,9 @@ maybe chmod 0755 'salt/pki/master/minions_denied'
 maybe chmod 0770 'salt/pki/master/minions_pre'
 maybe chmod 0770 'salt/pki/master/minions_rejected'
 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 0644 'salt/roster'
 maybe chmod 0644 'sandbox.conf'

diff --git a/salt/minion b/salt/minion
index 2bcb6a53495d453ed1031f641f33cb1fb5df7ff9..48d310edc9a6710779a16cb81ce32d24b2e0cd50 100644 (file)
--- a/salt/minion
+++ b/salt/minion
@@ -13,7 +13,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: weimar.pb.local
 
 # If multiple masters are specified in the 'master' setting, the default behavior
 # is to always try to connect to them in the order they are listed. If random_master is

diff --git a/salt/pki/master/minions/weimar.pb.local b/salt/pki/master/minions/weimar.pb.local
new file mode 100644 (file)
index 0000000..74be363
--- /dev/null
+++ b/salt/pki/master/minions/weimar.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqOw4d3Zr0lEYdpyPld/a
+v6WXk3pcV2HnTh+5ZePRXJn+G9usXPG/LXNdrZu0aIsRWk7P80CtjMZGmN87/j/l
+zfOW3fRT3oSfVgq/i45v0HGjLVOmkAsKqpkPwAh1au+A2045PoxFAUu+7hNJDTOW
+BZmErEJdCfDDUboGdMyoNGQIwKXDWvb9KJqBTw3wbSTWFMz/tUq2kf3y7QyRJdwi
+j5O82eXAD5tmZ+HK2umSLYfYVVy3VmMKwvDnvqv5oTmzHl79bOI4wEo/dD89ThyK
+UvxVZrdOBQOnDttuAE14DCywaBzVqf4PcQwYxnVMcOyYuTwF5BSRnE6hwbIxaHRZ
+NwIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file

diff --git a/salt/pki/minion/minion.pem b/salt/pki/minion/minion.pem
new file mode 100644 (file)
index 0000000..6ad706f
--- /dev/null
+++ b/salt/pki/minion/minion.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAqOw4d3Zr0lEYdpyPld/av6WXk3pcV2HnTh+5ZePRXJn+G9us
+XPG/LXNdrZu0aIsRWk7P80CtjMZGmN87/j/lzfOW3fRT3oSfVgq/i45v0HGjLVOm
+kAsKqpkPwAh1au+A2045PoxFAUu+7hNJDTOWBZmErEJdCfDDUboGdMyoNGQIwKXD
+Wvb9KJqBTw3wbSTWFMz/tUq2kf3y7QyRJdwij5O82eXAD5tmZ+HK2umSLYfYVVy3
+VmMKwvDnvqv5oTmzHl79bOI4wEo/dD89ThyKUvxVZrdOBQOnDttuAE14DCywaBzV
+qf4PcQwYxnVMcOyYuTwF5BSRnE6hwbIxaHRZNwIDAQABAoIBAGdQiryuBgYNKWwq
+FzuwPScnzUwa821SaNkEWC00KDF90cgSFBqIlMfknm/3ImEqZUOZnmAFt9+4ySbo
+qdW4GQJcsHIx5DXdYWKLkll1lXekeQvY9K92wWBT2yk1QzNTJrl631IdEntXa4BK
+9UwIuAHWwillMWhKA/vxTc+T+HCJm831vUV5vV1yRz7qDSTdKlvrbSH8f35fKsUR
+fxo7UzcMkwO8TD2RVbnErY9OITTF47SpsDzYGOKby1zWt7AfDF8Y2nHYAraj+tn9
+JYug4JbhZvk/ersO3yk6Ktv7RDvQ16ZI0vtqtFAxmMPkAzS1dN64V0ZVmm3AJOBi
+gAWx0JkCgYEAy45T+N7nJ6lrpyBczseAdA+H5cRcPsQoXTood8JzsjlMXwIcD1Ct
+25nIjltrdLuRfz3xCjjgLUuLm+KJXEz2QY/SoEHjy8emw0wyAeZD/HJdtbaErNES
+/hthkEil5I2vOcwvJ7bTeB3ufC8ZkQsK4rXeDdUyUb77hOM87z1lABsCgYEA1HGi
+XVv5ifJgbZzjEAoQu45MiQEI7NrTvpXSvstF3U/MLbeAN6kLEPblAN8XabDW1tFF
+vvge/AdjD6eFSvd42lFWFf1VA31tbKZOD33nLbAreL5+q6KpzC+mXk6mNuK/rz1U
+z5zlbKLkosH6f+NWtmbQUt+VlZ+gAVUTompNdRUCgYEAon67IBfpFatUqfTWwadX
+Ls9bIBvRu7Vht5J+zaOoMmU1Rz7q4Xr5Xy3zgVkPff9iFd5/tjZTFzWQfF+qYcl6
+aDoE3TPcQkfeI1eHMCb+rN8rWa0bWs4ISFvZVZH5BGvqrswF9MEpLWFPiUkcMsJK
+7VJbslU4NzOrm5i/gwhSwXMCgYEAiJ6zTdqyNZZbkOJN26i9bgBrE8hIlxl7BpuP
+Nge/XD3PDq9tk13wse41A0R06BFDeE6IzfD+7BFMEWsn+zf+zld0RxvtqhrlXfPt
+S2UqYGVk73eCOpqXG6qhERD/L1jO8ME+Y22A1UZERq78i3YF87NW0ZTbu6c13OV7
+hP1b5qkCgYAgbSKHgKHGdgf7X2UxQ3YLBBYN/LKvtc0XZOsxSOQKGAUE0XH1NmKP
+ZrJV8r3xyWmUNorUb7MPZy4hdjFExTr7wy4R9ragYN+UUNLOqpjlY0yXfxtsH2V7
+0wavhLJs2QlcXCFub25slfZ9FHY4lpiiMxjh0qedfCSWRCTsHyGeIg==
+-----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..74be363
--- /dev/null
+++ b/salt/pki/minion/minion.pub
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqOw4d3Zr0lEYdpyPld/a
+v6WXk3pcV2HnTh+5ZePRXJn+G9usXPG/LXNdrZu0aIsRWk7P80CtjMZGmN87/j/l
+zfOW3fRT3oSfVgq/i45v0HGjLVOmkAsKqpkPwAh1au+A2045PoxFAUu+7hNJDTOW
+BZmErEJdCfDDUboGdMyoNGQIwKXDWvb9KJqBTw3wbSTWFMz/tUq2kf3y7QyRJdwi
+j5O82eXAD5tmZ+HK2umSLYfYVVy3VmMKwvDnvqv5oTmzHl79bOI4wEo/dD89ThyK
+UvxVZrdOBQOnDttuAE14DCywaBzVqf4PcQwYxnVMcOyYuTwF5BSRnE6hwbIxaHRZ
+NwIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file

diff --git a/salt/pki/minion/minion_master.pub b/salt/pki/minion/minion_master.pub
new file mode 100644 (file)
index 0000000..4bcdac2
--- /dev/null
+++ b/salt/pki/minion/minion_master.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4+Xye1IXOZEWzg/5jF4N
+R3NPIJ4T2ToQchcl5NTuCNMYXoX/24MF2yJLcHV7sdJ7QeVEcBDpJiz5oEOkMmEN
+lf2zWEFAU1cnaVGX+B65ih/UwYsHkD8kbh7DZ6yVAxcsJpwAxloG0irjZZQmPFiy
+IFTpSGVhn4OhD4W1ws8Z5z1OQmHeU8+Ei0ykAqb/pTy1+iJ0eG0tZP4WeLwZnu8o
+xIMM9SJKaF/GxzFnI4mejt29GCaZ+Nv5Y3hauMwnal6mKPvWcZwZMOGYmWr4IbKY
+CVBsGaufdUBOxMlbU3zmUuy/YTgqOm1eH5wPvRYbYA68iQDr2CSPZ0c7yyjCS+VY
+5eQwxwJrieFz40Exqt5+K0WWwNFC5cebkrwNXSOi8nHye43MUUuJNQinC03Etfmt
+gRxBUGrsSYrQF7lBvFtgPgEC8iJGVAHxIGa1g3ePyVS3KIZhx1Nt+nPWvjKubWlE
+LC6yKLZ93Msu4oTqfLKZmZVHEHyt1UqLaQpA11PUa1Ct715XWL5gvBKlGi9X25w2
+LUhzLTuh+R5A6LMf7kgU16wTDgZkxhmfBN7yyuTY+fgzWvA6MtCJINBVY9mSxCJQ
+eQ+yBLIFlK3LTADHoeHGSLzDmpqHEnql6KJyQoWEayvQSRxouSziscjV0zooKeOm
+em0B7qAoBXiZA2z37K4ypYsCAwEAAQ==
+-----END PUBLIC KEY-----