From e37c65103032d9808d7bf14d665d71ca8d641cb6 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 8 Aug 2016 15:46:58 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 1 + portage/make.conf | 2 +- salt/master | 20 ++++++++++--------- .../master/minions/pserver19.stage.pb.local | 9 +++++++++ 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 salt/pki/master/minions/pserver19.stage.pb.local diff --git a/.etckeeper b/.etckeeper index ca36227..f7fac60 100755 --- a/.etckeeper +++ b/.etckeeper @@ -934,6 +934,7 @@ maybe chmod 0644 'salt/pki/master/master.pub' 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/pserver19.stage.pb.local' maybe chmod 0644 'salt/pki/master/minions/pserver22.stage.pb.local' maybe chmod 0644 'salt/pki/master/minions/pserver5.stage.pb.local' maybe chmod 0644 'salt/pki/master/minions/storage1.stage.pb.local' diff --git a/portage/make.conf b/portage/make.conf index 552260b..f3a883e 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -54,7 +54,7 @@ DISTDIR="/var/lib/distfiles" # These are the USE flags that were used in addition to what is provided by the # profile used for building. USE="acpi -alsa bash-completion bzip2 cvs -cups dane -development geoip git -gnome gpm -kde idn ipv6 jpeg json -ldap \ - lzma md5sum mercurial mmx mmxext mysql postgres python python2 python3 sctp smtp sse sse2 ssse3 static-libs \ + lz4 lzma md5sum mercurial mmx mmxext mysql postgres python python2 python3 sctp smtp sse sse2 ssse3 static-libs \ subversion tiff vim-syntax -X xattr unicode" #GENTOO_MIRRORS="http://mirror.opteamax.de/gentoo/ http://mirror.netcologne.de/gentoo/" diff --git a/salt/master b/salt/master index 4b6c53d..bc2d3b6 100644 --- a/salt/master +++ b/salt/master @@ -478,7 +478,7 @@ file_roots: # being merged together and instead to only use the top file from the # requested environment, set this value to 'same'. #top_file_merging_strategy: merge -top_file_merging_strategy: same +#top_file_merging_strategy: same # To specify the order in which environments are merged, set the ordering # in the env_order option. Given a conflict, the last matching value will @@ -535,9 +535,9 @@ top_file_merging_strategy: same # - roots # # To use multiple backends list them in the order they are searched: -fileserver_backend: - - git - - roots +#fileserver_backend: +# - git +# - roots # Uncomment the line below if you do not want the file_server to follow # symlinks when walking the filesystem tree. This is set to True @@ -608,8 +608,8 @@ fileserver_backend: #gitfs_remotes: # - git://github.com/saltstack/salt-states.git # - file:///var/git/saltmaster -gitfs_remotes: - - https://gitlab.pb.local/noc/noc-salt-states.git +#gitfs_remotes: +# - https://gitlab.pb.local/noc/noc-salt-states.git # # The gitfs_ssl_verify option specifies whether to ignore ssl certificate @@ -642,14 +642,15 @@ pillar_roots: #ext_pillar: # - hiera: /etc/hiera.yaml # - cmd_yaml: cat /etc/salt/yaml -ext_pillar: - - git: - - noc git@gitlab.pb.local:noc/noc-salt-pillar.git +#ext_pillar: +# - git: +# - noc git@gitlab.pb.local:noc/noc-salt-pillar.git # The ext_pillar_first option allows for external pillar sources to populate # before file system pillar. This allows for targeting file system pillar from # ext_pillar. #ext_pillar_first: False +ext_pillar_first: True # The pillar_gitfs_ssl_verify option specifies whether to ignore ssl certificate # errors when contacting the pillar gitfs backend. You might want to set this to @@ -681,6 +682,7 @@ ext_pillar: # Recursively merge lists by aggregating them instead of replacing them. #pillar_merge_lists: False +pillar_merge_lists: True # Git External Pillar (git_pillar) Configuration Options # diff --git a/salt/pki/master/minions/pserver19.stage.pb.local b/salt/pki/master/minions/pserver19.stage.pb.local new file mode 100644 index 0000000..22ce088 --- /dev/null +++ b/salt/pki/master/minions/pserver19.stage.pb.local @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA03n385N/N2sAac/lUkhh +xaRwSERKOWIQABPw6SHUfDTnZPeUBegd53iWxPAKhrHKPGAb9OnUEGMI3DPSw3qU +2co2pCoxCe1AoYUEQsRlKUysLTwQQi3Tq0dRTLV2b20dFTqcLzRIi6zBp6/BvNel +RJvelHfq10Ya7dO7e364mzpecA26LdMWK8ek10P1Ki/kTlAJfaJqpZhn9KNUt75g +LK0qOO4rUZ2n++GyYl/jltnBPWORc9BIS4oW4DQrWY+wYK3xNYqA8+pobUAVTbv/ +5ASZSQ2UgYS8ODKj4Sq/1cfcF44ZOfT4kzCkskqh4h2GABHqA75Q1frS7YItNYRU +hQIDAQAB +-----END PUBLIC KEY----- \ No newline at end of file -- 2.39.5