Current state

diff --git a/.etckeeper b/.etckeeper
index 99698dcf5ddabd4491cd870703bd320f4367c47e..778afb66490b10da7fa614019edf1dafe6cb10cc 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -160,6 +160,9 @@ maybe chmod 0755 'config-archive/etc/eselect/postgresql/slots'
 maybe chmod 0755 'config-archive/etc/eselect/postgresql/slots/9.1'
 maybe chmod 0644 'config-archive/etc/eselect/postgresql/slots/9.1/base'
 maybe chmod 0644 'config-archive/etc/eselect/postgresql/slots/9.1/base.dist'
+maybe chmod 0755 'config-archive/etc/etckeeper'
+maybe chmod 0644 'config-archive/etc/etckeeper/etckeeper.conf'
+maybe chmod 0644 'config-archive/etc/etckeeper/etckeeper.conf.dist'
 maybe chmod 0644 'config-archive/etc/host.conf'
 maybe chmod 0644 'config-archive/etc/host.conf.dist'
 maybe chmod 0644 'config-archive/etc/hosts'

diff --git a/config-archive/etc/etckeeper/etckeeper.conf b/config-archive/etc/etckeeper/etckeeper.conf
new file mode 100644 (file)
index 0000000..aad69f4
--- /dev/null
+++ b/config-archive/etc/etckeeper/etckeeper.conf
@@ -0,0 +1,45 @@
+# The VCS to use.
+#VCS="hg"
+VCS="git"
+#VCS="bzr"
+#VCS="darcs"
+
+# Options passed to git commit when run by etckeeper.
+#GIT_COMMIT_OPTIONS="--author 'Frank Brehm <frank.brehm@profitbricks.com>'"
+GIT_COMMIT_OPTIONS=""
+
+# Options passed to hg commit when run by etckeeper.
+HG_COMMIT_OPTIONS=""
+
+# Options passed to bzr commit when run by etckeeper.
+BZR_COMMIT_OPTIONS=""
+
+# Options passed to darcs record when run by etckeeper.
+DARCS_COMMIT_OPTIONS="-a"
+
+# Uncomment to avoid etckeeper committing existing changes
+# to /etc automatically once per day.
+#AVOID_DAILY_AUTOCOMMITS=1
+
+# Uncomment the following to avoid special file warning
+# (the option is enabled automatically by cronjob regardless).
+#AVOID_SPECIAL_FILE_WARNING=1
+
+# Uncomment to avoid etckeeper committing existing changes to 
+# /etc before installation. It will cancel the installation,
+# so you can commit the changes by hand.
+#AVOID_COMMIT_BEFORE_INSTALL=1
+
+# The high-level package manager that's being used.
+# (apt, pacman-g2, yum, zypper etc)
+# For gentoo this is emerge
+HIGHLEVEL_PACKAGE_MANAGER=emerge
+
+# The low-level package manager that's being used.
+# (dpkg, rpm, pacman, pacman-g2, etc)
+# For gentoo this is qlist
+LOWLEVEL_PACKAGE_MANAGER=qlist
+
+# To push each commit to a remote, put the name of the remote here.
+# (eg, "origin" for git).
+PUSH_REMOTE=""

diff --git a/config-archive/etc/etckeeper/etckeeper.conf.dist b/config-archive/etc/etckeeper/etckeeper.conf.dist
new file mode 100644 (file)
index 0000000..0a9c88b
--- /dev/null
+++ b/config-archive/etc/etckeeper/etckeeper.conf.dist
@@ -0,0 +1,53 @@
+# The VCS to use.
+#VCS="hg"
+VCS="git"
+#VCS="bzr"
+#VCS="darcs"
+
+# Options passed to git commit when run by etckeeper.
+GIT_COMMIT_OPTIONS=""
+
+# Options passed to hg commit when run by etckeeper.
+HG_COMMIT_OPTIONS=""
+
+# Options passed to bzr commit when run by etckeeper.
+BZR_COMMIT_OPTIONS=""
+
+# Options passed to darcs record when run by etckeeper.
+DARCS_COMMIT_OPTIONS="-a"
+
+# Uncomment to avoid etckeeper committing existing changes
+# to /etc automatically once per day.
+#AVOID_DAILY_AUTOCOMMITS=1
+
+# Uncomment the following to avoid special file warning
+# (the option is enabled automatically by cronjob regardless).
+#AVOID_SPECIAL_FILE_WARNING=1
+
+# Uncomment to avoid etckeeper committing existing changes to 
+# /etc before installation. It will cancel the installation,
+# so you can commit the changes by hand.
+#AVOID_COMMIT_BEFORE_INSTALL=1
+
+# The high-level package manager that's being used.
+# (apt, pacman-g2, yum, dnf, zypper etc)
+#HIGHLEVEL_PACKAGE_MANAGER=apt
+
+# Gentoo specific:
+# For portage this is emerge
+# For paludis this is cave
+HIGHLEVEL_PACKAGE_MANAGER=emerge
+
+# The low-level package manager that's being used.
+# (dpkg, rpm, pacman, pacman-g2, etc)
+#LOWLEVEL_PACKAGE_MANAGER=dpkg
+
+# Gentoo specific:
+# For portage this is qlist
+# For paludis this is cave
+LOWLEVEL_PACKAGE_MANAGER=qlist
+
+# To push each commit to a remote, put the name of the remote here.
+# (eg, "origin" for git). Space-separated lists of multiple remotes
+# also work (eg, "origin gitlab github" for git).
+PUSH_REMOTE=""

diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf
index aad69f422ee97ae39ca6b8cd260280c0272d68ae..0a9c88ba7936b9b0f5673003759221eb3e860187 100644 (file)
--- a/etckeeper/etckeeper.conf
+++ b/etckeeper/etckeeper.conf
@@ -5,7 +5,6 @@ VCS="git"
 #VCS="darcs"
 
 # Options passed to git commit when run by etckeeper.
-#GIT_COMMIT_OPTIONS="--author 'Frank Brehm <frank.brehm@profitbricks.com>'"
 GIT_COMMIT_OPTIONS=""
 
 # Options passed to hg commit when run by etckeeper.
@@ -31,15 +30,24 @@ DARCS_COMMIT_OPTIONS="-a"
 #AVOID_COMMIT_BEFORE_INSTALL=1
 
 # The high-level package manager that's being used.
-# (apt, pacman-g2, yum, zypper etc)
-# For gentoo this is emerge
+# (apt, pacman-g2, yum, dnf, zypper etc)
+#HIGHLEVEL_PACKAGE_MANAGER=apt
+
+# Gentoo specific:
+# For portage this is emerge
+# For paludis this is cave
 HIGHLEVEL_PACKAGE_MANAGER=emerge
 
 # The low-level package manager that's being used.
 # (dpkg, rpm, pacman, pacman-g2, etc)
-# For gentoo this is qlist
+#LOWLEVEL_PACKAGE_MANAGER=dpkg
+
+# Gentoo specific:
+# For portage this is qlist
+# For paludis this is cave
 LOWLEVEL_PACKAGE_MANAGER=qlist
 
 # To push each commit to a remote, put the name of the remote here.
-# (eg, "origin" for git).
+# (eg, "origin" for git). Space-separated lists of multiple remotes
+# also work (eg, "origin gitlab github" for git).
 PUSH_REMOTE=""