From fbba656857e028b1e299ff3dae7fbcf952fce8ce Mon Sep 17 00:00:00 2001 From: frank Date: Tue, 28 Feb 2012 15:09:49 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 9 +++++++++ salt/master | 2 +- salt/pki/master.pem | 33 +++++++++++++++++++++++++++++++++ salt/pki/master.pub | 14 ++++++++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 salt/pki/master.pem create mode 100644 salt/pki/master.pub diff --git a/.etckeeper b/.etckeeper index e96f70d..a3d7db6 100755 --- a/.etckeeper +++ b/.etckeeper @@ -7,6 +7,9 @@ mkdir -p './foomatic/direct' mkdir -p './gconf/schemas' mkdir -p './php/embed-php5.3/ext' mkdir -p './php/embed-php5.3/ext-active' +mkdir -p './salt/pki/minions' +mkdir -p './salt/pki/minions_pre' +mkdir -p './salt/pki/minions_rejected' mkdir -p './security/limits.d' mkdir -p './security/namespace.d' mkdir -p './sensors.d' @@ -1099,6 +1102,12 @@ maybe chmod 0755 './salt' maybe chmod 0644 './salt/master' maybe chmod 0644 './salt/master.template' maybe chmod 0644 './salt/minion.template' +maybe chmod 0700 './salt/pki' +maybe chmod 0400 './salt/pki/master.pem' +maybe chmod 0644 './salt/pki/master.pub' +maybe chmod 0700 './salt/pki/minions' +maybe chmod 0700 './salt/pki/minions_pre' +maybe chmod 0700 './salt/pki/minions_rejected' maybe chmod 0755 './samba' maybe chmod 0644 './samba/lmhosts' maybe chmod 0644 './samba/smb.conf.default' diff --git a/salt/master b/salt/master index c6e9869..bfaf887 100644 --- a/salt/master +++ b/salt/master @@ -3,7 +3,7 @@ ########################################## # The address of the interface to bind to #interface: 0.0.0.0 -interface: 46.16.73.175 +interface: 10.12.150.11 # The port used by the publisher #publish_port: 4505 diff --git a/salt/pki/master.pem b/salt/pki/master.pem new file mode 100644 index 0000000..fdf6e05 --- /dev/null +++ b/salt/pki/master.pem @@ -0,0 +1,33 @@ +-----BEGIN RSA PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: AES-128-CBC,35F38B271E4AC10180AE564AE6148CDB + +mW44CAZL/QfdFXbOmWjmPschNrpEX/A8nCwupua50GK/EnOGhhBTCKfYbus/Po96 +0mo4VdJS2HXmIdCSJ6HNXsDfdqTWCfysBBKGPQOnh22U9U+tqX1vXETXzP0iOdxf +S6ObpZvIDH3T+J14l72h9dYcEI4CJ9mj8Lj9diGyRasO7np6F30gMf5W5iWQ8gb9 +bL6M+4LqW89za5jLv4ScGTZo6jFDsIVuETUzGpOwoWOoLNF5dfPyKy7d9ry7kORS +CVI17jDcDGyhQzjjhX2yRVeXavrkLbKAq1FfTK3/uirdzDSizwrUL4w172ksgf/F +wTyL2Q8JnXhbJNHJgn4MKU/oe8HE79fliVildqAQQ8HgrWQdwxIFjn7x9fdWHR1+ +nSSjfJHFBWTOSlMx0o/Far+ZKnMpE3AON8JkloOm1s7EPLPjBXzqfpr6IoA9GPc8 +D9Vu93lqnkRAIcdqWV8IcoFu/yZx2SW9LqAozht1pRN1JZGxr6ku20kazQB9XL7t +uty91jS3x6QO8lSLoyVMHvfhc9RZC5MysC0qq8ZvgwG+J+gWgGeCniIARkZi4YZ5 +9Qiy7O29XXk383T8UlCPkNJcx6n0poQHh/rKfJJ8cTEZV8eoE5+ybUfFvMOgnI0R +rFmTb7NbytcmLYrc/BUYFNXfvjDGsfaN9b5H1+GnR9xznw7eRgaB2FPxeVz8lQMQ +I1jfMkGG7htYusFygJKYnr2ymA8tvsTTU2UhwAXXEIUWb1SmzLeaDJkZMSy66fcN +tARRV0JT/2sAOqULvLl85j6hy7qyef4vqXZheMZLk7Kvh03yeaqvPnRf3qJ7LbtD +mS7cEhRhIrDkrmaJJiA8TMwNSW5aUSPouXPRD0Vly0E0xkPAsgzCV7Cwn2RyXyi4 +v7CUX7K8BBbloZEnlkCQjK5vEIGs9GsOjF7VI/CcyYqd6h4dXbXqe2PV8UNglUMy +Unglf1Vf1dXrGQsECPeZnfF0FgtVWKWw+vl63FevZmsY7H0v9evBnPlo3WaNvK9J +MDtwmvpK3a36xEdNNRxkZjYpJT3U5Zi0jLJOpMQlQMbTsNsFUoOLMWN8k/Ggo8w4 +h3COt3qM0FSTW4CePLA2tvJ7BRC7WUJv83wC4FcZEGryBJs21cI2ih9D/C/ERLop +JT3UatwUzqSnImzJFtkSz5AOn+tPiC3Lrh2fAefn+ErEBlogSV4hI54QLDzQ/Wg/ +ICktgfdlwrLdvxk0J792airzkiNOxOeCP8GG+6+W6K0pdw2piAMT73plTyeXzTCY +mNZ7gL2USWTtyuMcycOwOSNDX/1MX/khN2v1PJt28olKBoxcIYqhNJTl0oOX3tdi +qVIEAR6GcjcMHEWzamhIC7zqDmwa+vkZo6Hww2JniTXjWDSVNJSeg8UNt6Zfmjpr +QN3LV8w5RYmCQwSOs9ifBEE1AmuD/XnYgbIM8UAGdYrj4XFGidBd8UVvr5G6UOyW +vXOvlR5Yxv0qDolNYPS7tXWEDNkg90tO4fQG2GEMlSn5wTXtB1JuNmUBmGOIN5EX +hx9+UcT/vedDvtg/ZkohvUM/OX5YufWs3VBZd4Rb9Ceu2+U69eHSy+3vDrnTGaA5 +UX+cFEqq6p1LEL/rw75M6nt4wL+kqjFvV3WkASBrheqVjDvI7pevrucScg+nOmMM +qp20cKC6BIWNgsI6SLT0ntp49raKJ19tKGA3UyHS2qS5sxRjxd3K6yhkwAI5qjz4 +WPZSPkAgUbKNm6sdiMD8EP/gUFhXUXYxjHl2jc/9Yos= +-----END RSA PRIVATE KEY----- diff --git a/salt/pki/master.pub b/salt/pki/master.pub new file mode 100644 index 0000000..dffeabc --- /dev/null +++ b/salt/pki/master.pub @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIDANBgkqhkiG9w0BAQEFAAOCAg0AMIICCAKCAgEA0e9N6n0nLFGPg4imnNGk +IiGwjaL87SB2rkQjlNfIUX1I60p85S5+k7K2IJkV3yL8Je2G0RELMIbv6PUnu1UE +PZYA6+r9SMEddrJ+LnfjpyYGbOhFv4WdXPv+NuVHFImT/adTT28X1G+isZXH14yH +MkCMse9M8DsehltyGP6+FFSUZxr+ZUq24w0maxnn+f0umz/iRW4r2/ObBivAZ73v +89cxPJpDdV/UepB5tJixyEG1Oq+T0C4Gf/Fk+0/e1v1HzXk5qmmOoY4P13juLf05 +CgBr8TN5tD4ggvE/dkZ+OciQ+ijw/gbndMnWMginVOyuaQ5u6ZYyGQU19V9jgX4v +ikhsvCHw7/rNI0aqsjqqcq8p9zNGnM6WvJz0dLgpoyBFybnQ8EkmYa5V12JVVQPf ++ydubkiYpm0A6YErhBKBN/S5rCzSfi8v48Yr7yp2UulW/5bYQcHvHVdLs5GQItuv +515/17fTuULcO18t3iAK8q/Bp1plIGuk+gFNgO7ZP6yoDjFJxewwokN3wYquyzj4 +zXx2qg9IukmUb0AQSLUmcgYPob4qe7h51hMpAVUJynQ0EF98Ffv+zib9RueSYj1G +6mo2uNeAkcEKKu7OT8GBif93bhElpySnrl7eU8T64rVA1jg0ypfG6QzAEngr1sS0 +TWuQkM5RjD3/2cg/IAkuHyMCAQE= +-----END PUBLIC KEY----- -- 2.39.5