saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 540338dd7fdcb351da26d2beb1877b2c84a8f688..c495057ed7a647ce167235ff5f8b4b27a5237fb5 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -12,7 +12,7 @@ mkdir -p './php/embed-php5.6/ext'
 mkdir -p './php/embed-php5.6/ext-active'
 mkdir -p './php/fpm-php5.6/ext'
 mkdir -p './php/fpm-php5.6/ext-active'
-mkdir -p './puppetlabs/code'
+mkdir -p './puppetlabs/code/environments'
 mkdir -p './puppetlabs/puppet/ssl/ca/requests'
 mkdir -p './puppetlabs/puppet/ssl/certificate_requests'
 mkdir -p './puppetlabs/puppet/ssl/private'
@@ -692,8 +692,10 @@ maybe chmod 0644 'protocols'
 maybe chgrp 'puppet' 'puppetlabs'
 maybe chmod 0750 'puppetlabs'
 maybe chmod 0755 'puppetlabs/code'
+maybe chmod 0755 'puppetlabs/code/environments'
 maybe chgrp 'puppet' 'puppetlabs/puppet'
 maybe chmod 0750 'puppetlabs/puppet'
+maybe chmod 0644 'puppetlabs/puppet/hiera.yaml'
 maybe chown 'puppet' 'puppetlabs/puppet/ssl'
 maybe chgrp 'puppet' 'puppetlabs/puppet/ssl'
 maybe chmod 0771 'puppetlabs/puppet/ssl'

diff --git a/portage/package.keywords b/portage/package.keywords
index 6c402c04f847c7240f05a84aa1fb4054dbeb3416..3847ebcbacab724920d25a63efcda1ca668d84e6 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -3,6 +3,8 @@
 
 app-misc/ddate
 
+~dev-java/leiningen-bin-2.7.1
+
 ~dev-ruby/hiera-3.2.2
 ~dev-ruby/hiera-eyaml-2.1.0
 ~dev-ruby/hiera-eyaml-plaintext-0.6

diff --git a/portage/package.use b/portage/package.use
index dd5625e530d8c65805e817df21a85a10991f9e1a..82bb22a96e9d81d23f21a2292c98d24a261615fa 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -101,4 +101,7 @@ www-client/elinks               gc xml
 www-servers/apache              sni suexec -threads
 www-servers/uwsgi               yaml
 
+#x11-libs/cairo                        X
+#x11-libs/gdk-pixbuf           X
+
 # vim: ts=8

diff --git a/puppetlabs/puppet/hiera.yaml b/puppetlabs/puppet/hiera.yaml
new file mode 100644 (file)
index 0000000..f243149
--- /dev/null
+++ b/puppetlabs/puppet/hiera.yaml
@@ -0,0 +1,15 @@
+---
+:backends:
+  - yaml
+  - json
+:yaml:
+  :datadir: "/etc/puppetlabs/code/environments/%{::environment}/hieradata"
+:json:
+  :datadir: "/etc/puppetlabs/code/environments/%{::environment}/hieradata"
+:hierarchy:
+  - "nodes/%{::trusted.certname}"
+  - "virtual/%{::virtual}"
+  - "common"
+# :merge_behavior: deeper
+# :deep_merge_options:
+#   :knockout_prefix: '--'

diff --git a/vim/vimrc.local b/vim/vimrc.local
index 63d2eccfbb62a3f4070db11bfb5e9491cc1d2d1f..55deeb61c72bc59ca8abb9caf25b81de2612eb3d 100644 (file)
--- a/vim/vimrc.local
+++ b/vim/vimrc.local
@@ -11,6 +11,7 @@ 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
 autocmd FileType fstab set tabstop=8 noexpandtab shiftwidth=8 softtabstop=8 list
+autocmd FileType yaml set tabstop=2 expandtab shiftwidth=2 softtabstop=2 list
 
 set listchars=tab:»·,trail:·
 "set list