From 170306335763063c2cb18b64401c8510ce144a63 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 7 Aug 2017 11:14:32 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- cups/subscriptions.conf | 4 ++-- libvirt/qemu/Vera.xml | 4 ++++ libvirt/qemu/lena.xml | 4 ++++ portage/make.conf | 6 +++++- portage/package.accept_keywords/python | 5 +++++ postfix/main.cf | 1 + postfix/virtual | 21 +++++++++++++++++++++ postfix/virtual.db | Bin 0 -> 12288 bytes 8 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 portage/package.accept_keywords/python create mode 100644 postfix/virtual create mode 100644 postfix/virtual.db diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index a947605a..571409c4 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,5 +1,5 @@ # Subscription configuration file for CUPS v2.1.4 -# Written by cupsd on 2017-08-06 10:59 +# Written by cupsd on 2017-08-07 10:53 NextSubscriptionId 470 Events all @@ -7,6 +7,6 @@ Owner anonymous Recipient dbus:// LeaseDuration 86400 Interval 0 -ExpirationTime 1502096042 +ExpirationTime 1502182382 NextEventId 1 diff --git a/libvirt/qemu/Vera.xml b/libvirt/qemu/Vera.xml index 4ce49d84..442fd545 100644 --- a/libvirt/qemu/Vera.xml +++ b/libvirt/qemu/Vera.xml @@ -93,6 +93,10 @@ or other application using the libvirt API.
+ + +
+
diff --git a/libvirt/qemu/lena.xml b/libvirt/qemu/lena.xml index 409fa11b..bc5ccf6a 100644 --- a/libvirt/qemu/lena.xml +++ b/libvirt/qemu/lena.xml @@ -98,6 +98,10 @@ or other application using the libvirt API.
+ + +
+ diff --git a/portage/make.conf b/portage/make.conf index 1e858cce..906a7d63 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -135,8 +135,12 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \ #CURL_SSL="nss" PHP_TARGETS="php5-6 php7-0" -PYTHON_TARGETS="python2_7 python3_4" + +#USE_PYTHON='2.7 3.4 3.5' +#PYTHON_TARGETS="python2_7 python3_4" +#PYTHON_TARGETS="python2_7 python3_4 python3_5" PYTHON_SINGLE_TARGET="python3_4" + CURL_SSL="nss" # RUBY_TARGETS="ruby21 ruby22" diff --git a/portage/package.accept_keywords/python b/portage/package.accept_keywords/python new file mode 100644 index 00000000..fbc7daf8 --- /dev/null +++ b/portage/package.accept_keywords/python @@ -0,0 +1,5 @@ + +~dev-lang/python-3.5.3 + +~dev-python/setuptools-36.0.1 + diff --git a/postfix/main.cf b/postfix/main.cf index 7293b3bb..8b6c955d 100644 --- a/postfix/main.cf +++ b/postfix/main.cf @@ -717,3 +717,4 @@ smtp_tls_enforce_peername = no #debug_peer_list = 217.237.40.156 inet_protocols = all +virtual_alias_maps = hash:/etc/postfix/virtual diff --git a/postfix/virtual b/postfix/virtual new file mode 100644 index 00000000..39fb2b38 --- /dev/null +++ b/postfix/virtual @@ -0,0 +1,21 @@ +################################################################################ +# +# Virtual user mapping +# /etc/postfix/virtual +# +# See 'man -s 5 virtual' for a description of the format +# +# Note, that the target addresses must be valid e-mail-addresses +# +################################################################################ + +root@karla.home.brehm-online.com frank@brehm-online.com +@karla.home.brehm-online.com frank@brehm-online.com + +root@lena.home.brehm-online.com frank@brehm-online.com +@lena.home.brehm-online.com frank@brehm-online.com + +root@vera.home.brehm-online.com frank@brehm-online.com +@vera.home.brehm-online.com frank@brehm-online.com + +# vim: filetype=conf ts=8 list diff --git a/postfix/virtual.db b/postfix/virtual.db new file mode 100644 index 0000000000000000000000000000000000000000..25739ebd79fae482a75e99e0cea11767987567df GIT binary patch literal 12288 zcmeI&ze>YE9Ki8kw3Kv^Umbh{SMvl8Sp;`y3u!rtG|9nHeG9><&(O)mw`ixnf{uLy zr`{O^O&~N54)Q&?%kjH^@X2(4L_{K=L(0yEG76Qk&vB@T9Mzv6<@ISS$G&}6-n@QX z)lFfJuX#db=;zoz<&$Q-?oEjR0tg_000IagfB*srAbp z=&fF=kB|^R009ILKmY**5I_I{1Q7Vw0@0nzs(CtfCND2+Roqu5nb}ezXYC?=G%ibW zTbiWZp>tqis@?;CwOZP-QuuLU|Ns4-e<06(|No|IU8%3N(joW%;SB-z|1CNK2q1s} e0tg_000IagfB*srd