From: Frank Brehm Date: Wed, 21 Dec 2016 14:57:58 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=e35e5ff9cc30f2e9d828f0c12b516b4f1978075a;p=config%2Fberta%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index 2e5c77a..5d7c2b1 100755 --- a/.etckeeper +++ b/.etckeeper @@ -139,12 +139,26 @@ maybe chmod 0644 'conf.d/udev' maybe chmod 0644 'conf.d/urandom' maybe chmod 0700 'config-archive' maybe chmod 0755 'config-archive/etc' +maybe chmod 0644 'config-archive/etc/genkernel.conf' +maybe chmod 0644 'config-archive/etc/genkernel.conf.dist.new' maybe chmod 0755 'config-archive/etc/layman' maybe chmod 0644 'config-archive/etc/layman/layman.cfg' maybe chmod 0644 'config-archive/etc/layman/layman.cfg.dist.new' +maybe chmod 0644 'config-archive/etc/locale.gen' +maybe chmod 0644 'config-archive/etc/locale.gen.dist.new' +maybe chmod 0755 'config-archive/etc/logrotate.d' +maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog' +maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog.dist.new' +maybe chmod 0644 'config-archive/etc/rsyslog.conf' +maybe chmod 0644 'config-archive/etc/rsyslog.conf.dist.new' maybe chmod 0755 'config-archive/etc/rsyslog.d' maybe chmod 0644 'config-archive/etc/rsyslog.d/50-default.conf' maybe chmod 0644 'config-archive/etc/rsyslog.d/50-default.conf.dist.new' +maybe chmod 0755 'config-archive/etc/systemd' +maybe chmod 0644 'config-archive/etc/systemd/journald.conf' +maybe chmod 0644 'config-archive/etc/systemd/journald.conf.dist.new' +maybe chmod 0644 'config-archive/etc/systemd/resolved.conf' +maybe chmod 0644 'config-archive/etc/systemd/resolved.conf.dist.new' maybe chmod 0755 'cron.d' maybe chmod 0644 'cron.d/.keep_sys-process_cronie-0' maybe chmod 0755 'cron.daily' diff --git a/config-archive/etc/genkernel.conf b/config-archive/etc/genkernel.conf new file mode 100644 index 0000000..e61484e --- /dev/null +++ b/config-archive/etc/genkernel.conf @@ -0,0 +1,295 @@ +# Configuration file for genkernel + +# This file is sourced by genkernel at startup and determines which options +# we will be using to compile our kernel. The order of precidence is simple, +# with the internal settings being least important, configuration file +# settings next, and command line options being most important. + +# =========Common Command Line Option Defaults========= + +# Should we install to $BOOTDIR? Default is "no" because genkernel is used in +# catalyst and stage building. +#INSTALL="yes" + +# Run 'make oldconfig' before compiling this kernel? +OLDCONFIG="yes" + +# Run 'make menuconfig' before compiling this kernel? +MENUCONFIG="no" + +# Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel? +NCONFIG="no" + +# Note, that two previous lines are mutual exclusive (logically), while +# MENUCONFIG has a higher priority if both them is enabled. + +# Run 'make clean' before compilation? +# If set to NO, implies MRPROPER WILL NOT be run +# Also, if clean is NO, it won't copy over any configuration +# file, it will use what's there. +CLEAN="yes" + +# Run 'make mrproper' before configuration/compilation? +MRPROPER="yes" + +# Override the arch detection? +#ARCH_OVERRIDE="x86" + +# Mount BOOTDIR automatically if it isn't mounted? +MOUNTBOOT="yes" + +# Make symlinks in BOOTDIR automatically? +#SYMLINK="no" + +# Save the new configuration in /etc/kernels upon +# successfull compilation +SAVE_CONFIG="yes" + +# Use Color output in Genkernel? +USECOLOR="yes" + +# Clear build cache dir +#CLEAR_CACHE_DIR="yes" + +# Clear all tmp files and caches after genkernel has run +#POSTCLEAR="1" + +# Genkernel uses an independent configuration for MAKEOPTS, and does not source +# /etc/make.conf . You can override the default setting by uncommenting and +# tweaking the following line. Default setting is set up by +# ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j +# argument is: *+1 +#MAKEOPTS="-j2" + +# Add in LVM support from static binaries if they exist on the system, or +# compile static LVM binaries if static ones do not exist. +#LVM="no" +LVM="yes" + +# Add in Luks support. Needs sys-fs/cryptsetup with -dynamic installed. +#LUKS="no" + +# Add in GnuPG support +#GPG="no" + +# Add DMRAID support. +#DMRAID="no" + +# Include (or suppresses the inclusion of) busybox in the initrd or initramfs. +# If included, busybox is rebuilt if the cached copy is out of date. +#BUSYBOX="yes" + +# Use udev instead of mdev as the default device manager for the initramfs. +# If you use systemd and perhaps lvm, you _must_ keep this turned on. +UDEV="yes" + +# Includes mdadm/mdmon binaries in initramfs. +# Without sys-fs/mdadm[static] installed, this will build a static mdadm. +#MDADM="no" + +# Specify a custom mdadm.conf. +# By default the ramdisk will be built *without* an mdadm.conf and will auto-detect +# arrays during bootup. Usually, this should not be needed. +#MDADM_CONFIG="/etc/mdadm.conf" + +# Add Multipath support. +#MULTIPATH="no" + +# Add iSCSI support. +#ISCSI="no" + +# Add e2fsprogs support. +#E2FSPROGS="no" +E2FSPROGS="yes" + +# Enable copying of firmware into initramfs +#FIRMWARE="no" +# Specify directory to pull from +#FIRMWARE_DIR="/lib/firmware" +# Specify specific firmware files to include. This overrides FIRMWARE_DIR +#FIRMWARE_FILES="" + +# Add new kernel to grub? +#BOOTLOADER="grub" + +# Enable splashutils in early space (initrd). Default is "no". +#SPLASH="yes" + +# Use this splash theme. If commented out - the "default" name theme is used. +# Also, SPLASH="yes" needs to be enabled for this one to one work. +# This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space). +#SPLASH_THEME="gentoo" + +# Installs, or not, plymouth into the initramfs. If "splash" will be +# passed at boot, plymouth will be activated. +# PLYMOUTH="yes" + +# Embeds the given plymouth theme into the initramfs. +# PLYMOUTH_THEME="text" + +# =========Keymap Settings========= +# +# Force keymap selection at boot +#DOKEYMAPAUTO="yes" + + +# Disables keymap selection support +#KEYMAP="0" + + +# =========Low Level Compile Settings========= +# +# GNU Make to use for kernel. See also the --kernel-make command line option. +#KERNEL_MAKE="make" + +# Compiler to use for the kernel (e.g. distcc). See also the --kernel-cc +# command line option. +#KERNEL_CC="gcc" + +# Assembler to use for the kernel. See also the --kernel-as command line +# option. +#KERNEL_AS="as" + +# Linker to use for the kernel. See also the --kernel-ld command line option. +#KERNEL_LD="ld" + +# GNU Make to use for the utilities. See also the --utils-make command line +# option. +#UTILS_MAKE="make" + +# Compiler to use for the utilities (e.g. distcc). See also the --utils-cc +# command line option. +#UTILS_CC="gcc" + +# Assembler to use for the utilities. See also the --utils-as command line +# option. +#UTILS_AS="as" + +# Linker to use for the utilities. See also the --utils-ld command line +# option. +#UTILS_LD="ld" + +# =========GENKERNEL LOCATION CONFIGURATION============ +# Variables: +# %%ARCH%% - Final determined architecture +# %%CACHE%% - Final determined cache location + +# Set genkernel's temporary work directory. Default is /var/tmp/genkernel +#TMPDIR="/var/tmp/genkernel" + +# Set the boot directory, default is /boot +#BOOTDIR="/boot" + +# Default share directory location +GK_SHARE="${GK_SHARE:-/usr/share/genkernel}" + +# Location of the default cache +CACHE_DIR="/var/cache/genkernel" +# Location of DISTDIR, where our source tarballs are stored +DISTDIR="/var/lib/genkernel/src" +# Log output file +LOGFILE="/var/log/genkernel.log" +# Debug Level +LOGLEVEL=1 + +# =========COMPILED UTILS CONFIGURATION============ +# +# Default location of kernel source +DEFAULT_KERNEL_SOURCE="/usr/src/linux" +# Default kernel config (only use to override using +# arch/%%ARCH%%/kernel-config-${VER}.${PAT} !) +#DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config" + +# Specifies a user created busybox config +#BUSYBOX_CONFIG="/path/to/file" +#BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat" + +# NOTE: Since genkernel 3.4.41 the version of +# busybox, lvm, mdadm, .. have been moved to +# /usr/share/genkernel/defaults/software.sh in order to +# reduce the merging you have to do during etc-update. +# You can still override these settings in here. + + +# =========MISC KERNEL CONFIGURATION============ +# +# Tag the kernel and ramdisk with a name: +# If not defined the option defaults to +# 'genkernel' +#KNAME="genkernel" + + +# This option is only valid if kerncache is +# defined. If there is a valid kerncache no checks +# will be made against a kernel source tree +#KERNEL_SOURCES="0" + + +# Build a static (monolithic kernel) +#BUILD_STATIC="1" + + +# Make and install kernelz image (PowerPC) +#GENZIMAGE="1" + + +# File to output a .tar.bz2'd kernel contents +# of /lib/modules/ and the kernel config +# NOTE: This is created before the callbacks +# are run! +#KERNCACHE="/path/to/file" + + +# Prefix to kernel module destination, modules +# will be installed in /lib/modules +# (.conf equivalent of --module-prefix=) +#INSTALL_MOD_PATH="" + + +# =========MISC INITRD CONFIGURATION============ +# +# Copy all kernel modules to the ramdisk +#ALLRAMDISKMODULES="1" + + +# Don't copy any modules to the ramdisk +#RAMDISKMODULES="0" + + +# File to output a .tar.bz2'd kernel and ramdisk: +# No modules outside of the ramdisk will be +# included... +#MINKERNPACKAGE="/path/to/file.bz2" + + +# File to output a .tar.bz2'd modules after the +# callbacks have run +#MODULESPACKAGE="/path/to/file.bz2" + + +# Directory structure to include in the initramfs, +# only available on >=2.6 kernels +#INITRAMFS_OVERLAY="" + + +# Build the generated initramfs into the kernel instead of +# keeping it as a separate file +#INTEGRATED_INITRAMFS="1" + + +# Compress generated initramfs +#COMPRESS_INITRD="yes" +# Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest +# "best" selects the best available compression method +# "fastest" selects the fastest available compression method +#COMPRESS_INITRD_TYPE="best" + + +# Create a self-contained env in the initramfs +#NETBOOT="1" + + +# =========MISC BOOT CONFIGURATION============ +# +# Specify a default for real_root= +#REAL_ROOT="/dev/one/two/gentoo" diff --git a/config-archive/etc/genkernel.conf.dist.new b/config-archive/etc/genkernel.conf.dist.new new file mode 100644 index 0000000..898f4f9 --- /dev/null +++ b/config-archive/etc/genkernel.conf.dist.new @@ -0,0 +1,293 @@ +# Configuration file for genkernel + +# This file is sourced by genkernel at startup and determines which options +# we will be using to compile our kernel. The order of precidence is simple, +# with the internal settings being least important, configuration file +# settings next, and command line options being most important. + +# =========Common Command Line Option Defaults========= + +# Should we install to $BOOTDIR? Default is "no" because genkernel is used in +# catalyst and stage building. +#INSTALL="yes" + +# Run 'make oldconfig' before compiling this kernel? +OLDCONFIG="yes" + +# Run 'make menuconfig' before compiling this kernel? +MENUCONFIG="no" + +# Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel? +NCONFIG="no" + +# Note, that two previous lines are mutual exclusive (logically), while +# MENUCONFIG has a higher priority if both them is enabled. + +# Run 'make clean' before compilation? +# If set to NO, implies MRPROPER WILL NOT be run +# Also, if clean is NO, it won't copy over any configuration +# file, it will use what's there. +CLEAN="yes" + +# Run 'make mrproper' before configuration/compilation? +MRPROPER="yes" + +# Override the arch detection? +#ARCH_OVERRIDE="x86" + +# Mount BOOTDIR automatically if it isn't mounted? +MOUNTBOOT="yes" + +# Make symlinks in BOOTDIR automatically? +#SYMLINK="no" + +# Save the new configuration in /etc/kernels upon +# successfull compilation +SAVE_CONFIG="yes" + +# Use Color output in Genkernel? +USECOLOR="yes" + +# Clear build cache dir +#CLEAR_CACHE_DIR="yes" + +# Clear all tmp files and caches after genkernel has run +#POSTCLEAR="1" + +# Genkernel uses an independent configuration for MAKEOPTS, and does not source +# /etc/make.conf . You can override the default setting by uncommenting and +# tweaking the following line. Default setting is set up by +# ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j +# argument is: *+1 +#MAKEOPTS="-j2" + +# Add in LVM support from static binaries if they exist on the system, or +# compile static LVM binaries if static ones do not exist. +#LVM="no" + +# Add in Luks support. Needs sys-fs/cryptsetup with -dynamic installed. +#LUKS="no" + +# Add in GnuPG support +#GPG="no" + +# Add DMRAID support. +#DMRAID="no" + +# Include (or suppresses the inclusion of) busybox in the initrd or initramfs. +# If included, busybox is rebuilt if the cached copy is out of date. +#BUSYBOX="yes" + +# Use udev instead of mdev as the default device manager for the initramfs. +# If you use systemd and perhaps lvm, you _must_ keep this turned on. +#UDEV="yes" + +# Includes mdadm/mdmon binaries in initramfs. +# Without sys-fs/mdadm[static] installed, this will build a static mdadm. +#MDADM="no" + +# Specify a custom mdadm.conf. +# By default the ramdisk will be built *without* an mdadm.conf and will auto-detect +# arrays during bootup. Usually, this should not be needed. +#MDADM_CONFIG="/etc/mdadm.conf" + +# Add Multipath support. +#MULTIPATH="no" + +# Add iSCSI support. +#ISCSI="no" + +# Add e2fsprogs support. +#E2FSPROGS="no" + +# Enable copying of firmware into initramfs +#FIRMWARE="no" +# Specify directory to pull from +#FIRMWARE_DIR="/lib/firmware" +# Specify specific firmware files to include. This overrides FIRMWARE_DIR +#FIRMWARE_FILES="" + +# Add new kernel to grub? +#BOOTLOADER="grub" + +# Enable splashutils in early space (initrd). Default is "no". +#SPLASH="yes" + +# Use this splash theme. If commented out - the "default" name theme is used. +# Also, SPLASH="yes" needs to be enabled for this one to one work. +# This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space). +#SPLASH_THEME="gentoo" + +# Installs, or not, plymouth into the initramfs. If "splash" will be +# passed at boot, plymouth will be activated. +# PLYMOUTH="yes" + +# Embeds the given plymouth theme into the initramfs. +# PLYMOUTH_THEME="text" + +# =========Keymap Settings========= +# +# Force keymap selection at boot +#DOKEYMAPAUTO="yes" + + +# Disables keymap selection support +#KEYMAP="0" + + +# =========Low Level Compile Settings========= +# +# GNU Make to use for kernel. See also the --kernel-make command line option. +#KERNEL_MAKE="make" + +# Compiler to use for the kernel (e.g. distcc). See also the --kernel-cc +# command line option. +#KERNEL_CC="gcc" + +# Assembler to use for the kernel. See also the --kernel-as command line +# option. +#KERNEL_AS="as" + +# Linker to use for the kernel. See also the --kernel-ld command line option. +#KERNEL_LD="ld" + +# GNU Make to use for the utilities. See also the --utils-make command line +# option. +#UTILS_MAKE="make" + +# Compiler to use for the utilities (e.g. distcc). See also the --utils-cc +# command line option. +#UTILS_CC="gcc" + +# Assembler to use for the utilities. See also the --utils-as command line +# option. +#UTILS_AS="as" + +# Linker to use for the utilities. See also the --utils-ld command line +# option. +#UTILS_LD="ld" + +# =========GENKERNEL LOCATION CONFIGURATION============ +# Variables: +# %%ARCH%% - Final determined architecture +# %%CACHE%% - Final determined cache location + +# Set genkernel's temporary work directory. Default is /var/tmp/genkernel +#TMPDIR="/var/tmp/genkernel" + +# Set the boot directory, default is /boot +#BOOTDIR="/boot" + +# Default share directory location +GK_SHARE="${GK_SHARE:-/usr/share/genkernel}" + +# Location of the default cache +CACHE_DIR="/var/cache/genkernel" +# Location of DISTDIR, where our source tarballs are stored +DISTDIR="/var/lib/genkernel/src" +# Log output file +LOGFILE="/var/log/genkernel.log" +# Debug Level +LOGLEVEL=1 + +# =========COMPILED UTILS CONFIGURATION============ +# +# Default location of kernel source +DEFAULT_KERNEL_SOURCE="/usr/src/linux" +# Default kernel config (only use to override using +# arch/%%ARCH%%/kernel-config-${VER}.${PAT} !) +#DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config" + +# Specifies a user created busybox config +#BUSYBOX_CONFIG="/path/to/file" +#BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat" + +# NOTE: Since genkernel 3.4.41 the version of +# busybox, lvm, mdadm, .. have been moved to +# /usr/share/genkernel/defaults/software.sh in order to +# reduce the merging you have to do during etc-update. +# You can still override these settings in here. + + +# =========MISC KERNEL CONFIGURATION============ +# +# Tag the kernel and ramdisk with a name: +# If not defined the option defaults to +# 'genkernel' +#KNAME="genkernel" + + +# This option is only valid if kerncache is +# defined. If there is a valid kerncache no checks +# will be made against a kernel source tree +#KERNEL_SOURCES="0" + + +# Build a static (monolithic kernel) +#BUILD_STATIC="1" + + +# Make and install kernelz image (PowerPC) +#GENZIMAGE="1" + + +# File to output a .tar.bz2'd kernel contents +# of /lib/modules/ and the kernel config +# NOTE: This is created before the callbacks +# are run! +#KERNCACHE="/path/to/file" + + +# Prefix to kernel module destination, modules +# will be installed in /lib/modules +# (.conf equivalent of --module-prefix=) +#INSTALL_MOD_PATH="" + + +# =========MISC INITRD CONFIGURATION============ +# +# Copy all kernel modules to the ramdisk +#ALLRAMDISKMODULES="1" + + +# Don't copy any modules to the ramdisk +#RAMDISKMODULES="0" + + +# File to output a .tar.bz2'd kernel and ramdisk: +# No modules outside of the ramdisk will be +# included... +#MINKERNPACKAGE="/path/to/file.bz2" + + +# File to output a .tar.bz2'd modules after the +# callbacks have run +#MODULESPACKAGE="/path/to/file.bz2" + + +# Directory structure to include in the initramfs, +# only available on >=2.6 kernels +#INITRAMFS_OVERLAY="" + + +# Build the generated initramfs into the kernel instead of +# keeping it as a separate file +#INTEGRATED_INITRAMFS="1" + + +# Compress generated initramfs +#COMPRESS_INITRD="yes" +# Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest +# "best" selects the best available compression method +# "fastest" selects the fastest available compression method +#COMPRESS_INITRD_TYPE="best" + + +# Create a self-contained env in the initramfs +#NETBOOT="1" + + +# =========MISC BOOT CONFIGURATION============ +# +# Specify a default for real_root= +#REAL_ROOT="/dev/one/two/gentoo" diff --git a/config-archive/etc/locale.gen b/config-archive/etc/locale.gen new file mode 100644 index 0000000..7b6cb27 --- /dev/null +++ b/config-archive/etc/locale.gen @@ -0,0 +1,54 @@ +# /etc/locale.gen: list all of the locales you want to have on your system. +# See the locale.gen(5) man page for more details. +# +# The format of each line: +# +# +# Where starts with a name as found in /usr/share/i18n/locales/. +# It must be unique in the file as it is used as the key to locale variables. +# For non-default encodings, the is typically appended. +# +# Where is a charset located in /usr/share/i18n/charmaps/ (sans any +# suffix like ".gz"). +# +# All blank lines and lines starting with # are ignored. +# +# For the default list of supported combinations, see the file: +# /usr/share/i18n/SUPPORTED +# +# Whenever glibc is emerged, the locales listed here will be automatically +# rebuilt for you. After updating this file, you can simply run `locale-gen` +# yourself instead of re-emerging glibc. + +#en_US ISO-8859-1 +#en_US.UTF-8 UTF-8 +#ja_JP.EUC-JP EUC-JP +#ja_JP.UTF-8 UTF-8 +#ja_JP EUC-JP +#en_HK ISO-8859-1 +#en_PH ISO-8859-1 +#de_DE ISO-8859-1 +#de_DE@euro ISO-8859-15 +#es_MX ISO-8859-1 +#fa_IR UTF-8 +#fr_FR ISO-8859-1 +#fr_FR@euro ISO-8859-15 +#it_IT ISO-8859-1 + +en_AU.UTF-8 UTF-8 +en_GB.UTF-8 UTF-8 +en_IE.UTF-8 UTF-8 +en_IN UTF-8 +en_NZ.UTF-8 UTF-8 +en_US.UTF-8 UTF-8 +en_US ISO-8859-1 +en_ZA.UTF-8 UTF-8 + +de_AT.UTF-8 UTF-8 +de_BE.UTF-8 UTF-8 +de_CH.UTF-8 UTF-8 +de_DE.UTF-8 UTF-8 +de_DE ISO-8859-1 +de_DE@euro ISO-8859-15 +de_LU.UTF-8 UTF-8 + diff --git a/config-archive/etc/locale.gen.dist.new b/config-archive/etc/locale.gen.dist.new new file mode 100644 index 0000000..0786f17 --- /dev/null +++ b/config-archive/etc/locale.gen.dist.new @@ -0,0 +1,36 @@ +# /etc/locale.gen: list all of the locales you want to have on your system. +# See the locale.gen(5) man page for more details. +# +# The format of each line: +# +# +# Where starts with a name as found in /usr/share/i18n/locales/. +# It must be unique in the file as it is used as the key to locale variables. +# For non-default encodings, the is typically appended. +# +# Where is a charset located in /usr/share/i18n/charmaps/ (sans any +# suffix like ".gz"). +# +# All blank lines and lines starting with # are ignored. +# +# For the default list of supported combinations, see the file: +# /usr/share/i18n/SUPPORTED +# +# Whenever glibc is emerged, the locales listed here will be automatically +# rebuilt for you. After updating this file, you can simply run `locale-gen` +# yourself instead of re-emerging glibc. + +#en_US ISO-8859-1 +#en_US.UTF-8 UTF-8 +#ja_JP.EUC-JP EUC-JP +#ja_JP.UTF-8 UTF-8 +#ja_JP EUC-JP +#en_HK ISO-8859-1 +#en_PH ISO-8859-1 +#de_DE ISO-8859-1 +#de_DE@euro ISO-8859-15 +#es_MX ISO-8859-1 +#fa_IR UTF-8 +#fr_FR ISO-8859-1 +#fr_FR@euro ISO-8859-15 +#it_IT ISO-8859-1 diff --git a/config-archive/etc/logrotate.d/rsyslog b/config-archive/etc/logrotate.d/rsyslog new file mode 100644 index 0000000..ba5c777 --- /dev/null +++ b/config-archive/etc/logrotate.d/rsyslog @@ -0,0 +1,74 @@ +# Uncomment the following directive if you have re-enabled +# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf" +#/var/log/syslog +#{ +# rotate 7 +# daily +# missingok +# notifempty +# delaycompress +# compress +# postrotate +# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null +# endscript +#} + +/var/log/syslog /var/log/messages { + rotate 7 + daily + missingok + notifempty + compress + delaycompress + dateext + size 4M + olddir /var/log/.old + sharedscripts + postrotate + test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null + endscript +} + +/var/log/all.log +/var/log/auth.log +/var/log/cron.log +/var/log/daemon.log +/var/log/debug.log +/var/log/kern.log +/var/log/lpr.log +/var/log/mail.log +/var/log/news.log +/var/log/user.log +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + dateext + size 4M + olddir /var/log/.old + sharedscripts + postrotate + test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null + endscript +} + +/var/log/syslog.d/*.log { + rotate 10 + weekly + missingok + notifempty + size 4M + delaycompress + dateext + compress + olddir /var/log/syslog.d/.old + sharedscripts + postrotate + test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null + endscript +} + +# vim: ts=4 filetype=conf et diff --git a/config-archive/etc/logrotate.d/rsyslog.dist.new b/config-archive/etc/logrotate.d/rsyslog.dist.new new file mode 100644 index 0000000..1eae30e --- /dev/null +++ b/config-archive/etc/logrotate.d/rsyslog.dist.new @@ -0,0 +1,37 @@ +# Uncomment the following directive if you have re-enabled +# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf" +#/var/log/syslog +#{ +# rotate 7 +# daily +# missingok +# notifempty +# delaycompress +# compress +# postrotate +# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null +# endscript +#} + +/var/log/auth.log +/var/log/cron.log +/var/log/daemon.log +/var/log/kern.log +/var/log/lpr.log +/var/log/mail.log +/var/log/news.log +/var/log/user.log +/var/log/debug.log +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null + endscript +} diff --git a/config-archive/etc/rsyslog.conf b/config-archive/etc/rsyslog.conf new file mode 100644 index 0000000..4de4ccb --- /dev/null +++ b/config-archive/etc/rsyslog.conf @@ -0,0 +1,72 @@ +# /etc/rsyslog.conf +# +# This configuration is based on RainerScript, the new recommended syntax +# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further +# details. +# +# But if you don't want to learn something new at moment, don't worry: The +# legacy syntax is still supported. +# +# You may want to use the new RSYSLOG configuration builder to create your +# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/ + +# Check config syntax on startup and abort if unclean (default: off) +$AbortOnUncleanConfig on + + +############### +### MODULES ### +############### + +# Read syslog messages from default Unix socket /dev/log (e.g. via logger command) +module(load="imuxsock") + +# Read messages from the kernel log and submits them to the syslog engine +module(load="imklog") + +# Inject "--MARK--" messages every $Interval (seconds) +module(load="immark" Interval="3600") + +# Read syslog messages from UDP +#module(load="imudp") +#input(type="imudp" port="514") + +# Read syslog messages from TCP +#module(load="imtcp") +#input(type="imtcp" port="514") + +module(load="impstats" + interval="43200" + severity="7" + log.syslog="off" + /* need to turn log stream logging off! */ + log.file="/var/log/syslog.d/stats.log") + + +######################### +### GLOBAL DIRECTIVES ### +######################### + +# Where to place spool and state files +$WorkDirectory /var/spool/rsyslog + +# Reduce repeating messages (default: off) +#$RepeatedMsgReduction on + +# Set defaults for every output file +$Umask 0022 + +module( + load="builtin:omfile" + Template="RSYSLOG_FileFormat" + FileCreateMode="0644" + DirCreateMode="0755" + fileOwnerNum="0" + fileGroupNum="0" + dirOwnerNum="0" + dirGroupNum="0" +) + + +# Include all conf files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/config-archive/etc/rsyslog.conf.dist.new b/config-archive/etc/rsyslog.conf.dist.new new file mode 100644 index 0000000..da48459 --- /dev/null +++ b/config-archive/etc/rsyslog.conf.dist.new @@ -0,0 +1,61 @@ +# /etc/rsyslog.conf +# +# This configuration is based on RainerScript, the new recommended syntax +# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further +# details. +# +# But if you don't want to learn something new at moment, don't worry: The +# legacy syntax is still supported. +# +# You may want to use the new RSYSLOG configuration builder to create your +# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/ + +# Check config syntax on startup and abort if unclean (default: off) +#$AbortOnUncleanConfig on + + +############### +### MODULES ### +############### + +# Read syslog messages from default Unix socket /dev/log (e.g. via logger command) +module(load="imuxsock") + +# Read messages from the kernel log and submits them to the syslog engine +module(load="imklog") + +# Inject "--MARK--" messages every $Interval (seconds) +#module(load="immark" Interval="600") + +# Read syslog messages from UDP +#module(load="imudp") +#input(type="imudp" port="514") + +# Read syslog messages from TCP +#module(load="imtcp") +#input(type="imtcp" port="514") + + +######################### +### GLOBAL DIRECTIVES ### +######################### + +# Where to place spool and state files +$WorkDirectory /var/spool/rsyslog + +# Reduce repeating messages (default: off) +#$RepeatedMsgReduction on + +# Set defaults for every output file +$Umask 0022 + +module( + load="builtin:omfile" + Template="RSYSLOG_TraditionalFileFormat" + FileCreateMode="0644" + DirCreateMode="0755" +) + + +# Include all conf files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/config-archive/etc/systemd/journald.conf b/config-archive/etc/systemd/journald.conf new file mode 100644 index 0000000..2e34451 --- /dev/null +++ b/config-archive/etc/systemd/journald.conf @@ -0,0 +1,40 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See journald.conf(5) for details. + +[Journal] +#Storage=auto +#Compress=yes +#Seal=yes +#SplitMode=uid +#SyncIntervalSec=5m +#RateLimitInterval=30s +#RateLimitBurst=1000 +#SystemMaxUse= +#SystemKeepFree= +#SystemMaxFileSize= +#RuntimeMaxUse= +#RuntimeKeepFree= +#RuntimeMaxFileSize= +#MaxRetentionSec= +#MaxFileSec=1month +#ForwardToSyslog=no +ForwardToSyslog=yes +#ForwardToKMsg=no +#ForwardToConsole=no +#ForwardToWall=yes +#TTYPath=/dev/console +#MaxLevelStore=debug +#MaxLevelSyslog=debug +#MaxLevelKMsg=notice +#MaxLevelConsole=info +#MaxLevelWall=emerg diff --git a/config-archive/etc/systemd/journald.conf.dist.new b/config-archive/etc/systemd/journald.conf.dist.new new file mode 100644 index 0000000..47eefe9 --- /dev/null +++ b/config-archive/etc/systemd/journald.conf.dist.new @@ -0,0 +1,39 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See journald.conf(5) for details. + +[Journal] +#Storage=auto +#Compress=yes +#Seal=yes +#SplitMode=uid +#SyncIntervalSec=5m +#RateLimitInterval=30s +#RateLimitBurst=1000 +#SystemMaxUse= +#SystemKeepFree= +#SystemMaxFileSize= +#RuntimeMaxUse= +#RuntimeKeepFree= +#RuntimeMaxFileSize= +#MaxRetentionSec= +#MaxFileSec=1month +#ForwardToSyslog=no +#ForwardToKMsg=no +#ForwardToConsole=no +#ForwardToWall=yes +#TTYPath=/dev/console +#MaxLevelStore=debug +#MaxLevelSyslog=debug +#MaxLevelKMsg=notice +#MaxLevelConsole=info +#MaxLevelWall=emerg diff --git a/config-archive/etc/systemd/resolved.conf b/config-archive/etc/systemd/resolved.conf new file mode 100644 index 0000000..3c923ef --- /dev/null +++ b/config-archive/etc/systemd/resolved.conf @@ -0,0 +1,20 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See resolved.conf(5) for details + +[Resolve] +#DNS= +#FallbackDNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844 +#LLMNR=yes +DNS=217.66.52.10 212.91.225.75 +#Domains=pixelpark.com brehm-online.com uhu-banane.de uhu-banane.net + diff --git a/config-archive/etc/systemd/resolved.conf.dist.new b/config-archive/etc/systemd/resolved.conf.dist.new new file mode 100644 index 0000000..bb40bc9 --- /dev/null +++ b/config-archive/etc/systemd/resolved.conf.dist.new @@ -0,0 +1,17 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See resolved.conf(5) for details + +[Resolve] +#DNS= +#FallbackDNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844 +#LLMNR=yes diff --git a/portage/package.keywords b/portage/package.keywords index a8808b2..9ca3048 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -1,4 +1,6 @@ +~app-admin/puppet-4.8.1 + app-misc/ddate ~net-nds/phpldapadmin-1.2.3