From: root Date: Thu, 10 Dec 2015 16:49:20 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=e47eb2f410a36f0daf0eedb1fbf74a80ec5b9480;p=config%2Fweimar%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index 893e085..7887d4c 100755 --- a/.etckeeper +++ b/.etckeeper @@ -865,6 +865,7 @@ maybe chmod 0770 'salt/pki/master/minions' maybe chmod 0644 'salt/pki/master/minions/fra-ftp-test.dc3.de.profitbricks.net' maybe chmod 0644 'salt/pki/master/minions/pserver1502.dc2.us.profitbricks.net' maybe chmod 0644 'salt/pki/master/minions/storage11-qa.stage.pb.local' +maybe chmod 0644 'salt/pki/master/minions/storage11.stage.pb.local' maybe chmod 0644 'salt/pki/master/minions/storage1501.dc2.us.profitbricks.net' maybe chmod 0644 'salt/pki/master/minions/storage1601.dc2.us.profitbricks.net' maybe chmod 0644 'salt/pki/master/minions/storage1604.dc2.us.profitbricks.net' diff --git a/salt/pki/master/minions/storage11.stage.pb.local b/salt/pki/master/minions/storage11.stage.pb.local new file mode 100644 index 0000000..5f765f0 --- /dev/null +++ b/salt/pki/master/minions/storage11.stage.pb.local @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA6Y/F/71DhIGFyUpTzI+v +F7eD09YU4MC6Nm7Ngngqlp7rImOiYMLCdhObb8Cx8+tZChDeWqj9JPIGumKTdQLX +w+HCBZ/yrGYH7l2knAzdONnb7/DXf69Mbx/vByMzU7WkFU27MewWhl5h6MoHeakO +/b7zQZu6I+ilytNUZQ/bfv/DpbXFcsQB+giiUwxJhHfZgLFDv7i+JeJvEbQcRvQm +eJnUK/A5LNQnVCAD57fRGxpxcvFy2mq1YtqfVXIh2GVu2JFce3cGAqGWVJf5V7Hb +i2sCAgOmWSt1jC0w/ZFe1Yj06Rk4hjNLk792RrRZjdJgfHWwFou2GFk0A9qtoS7K +8b+e5iCz9DdgOXFujKzMyIZKT9nFjFX4S7K5eiviezgTSm6WSkqTGLrs89eLYKSi +4kogPYqsPpS+Y1kwXhex4Wz3K2cqYmgNNdB1cjXpO+tzoNsmHPacWVuE76AMjTGX +SjznHnumyZzlmkOFxA/2qTgDQNYpL/TjWzslzGNgz7gmSPJx56+TMovYVWnH2TFA +YBUiWhUrZlDijydLuGFH2Y0YyNrvlsDLqifd56TupGJB4W+mnnbnoP4zP+mK7Tqq +yA7ZqysCtqNiJ86kpIDGEucWkpCjrL6w/j3bZLCMxO4McZpm+FmxefgDBWjHlsoS +vXAH/rcGQTS7vSdpA3+W8EcCAwEAAQ== +-----END PUBLIC KEY----- diff --git a/vim/vimrc.local b/vim/vimrc.local index db7d340..87023b6 100644 --- a/vim/vimrc.local +++ b/vim/vimrc.local @@ -7,12 +7,10 @@ set showmatch set ignorecase "autocmd BufRead,BufNewFile *.sls set filetype=yaml -"autocmd BufRead,BufNewFile *.sls set tabstop=2 expandtab shiftwidth=2 softtabstop=2 autocmd FileType sls set tabstop=2 expandtab shiftwidth=2 softtabstop=2 -"autocmd BufRead,BufNewFile *.py set tabstop=4 expandtab shiftwidth=4 softtabstop=4 -autocmd FileType python set tabstop=4 expandtab shiftwidth=4 softtabstop=4 +autocmd FileType python set tabstop=4 expandtab shiftwidth=4 softtabstop=4 list autocmd FileType sh set tabstop=4 expandtab shiftwidth=4 softtabstop=4 - +autocmd FileType perl set tabstop=4 noexpandtab shiftwidth=4 set listchars=tab:»·,trail:· " set list