saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index d9cdecf405cf7d16a485ce3c2f935917d6da0e42..27c451bafaec3746fd128a6dfea2ab3c26d646ed 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -182,6 +182,8 @@ maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/default_vhost.include.dist
 maybe chmod 0755 'config-archive/etc/conf.d'
 maybe chmod 0644 'config-archive/etc/conf.d/apache2'
 maybe chmod 0644 'config-archive/etc/conf.d/apache2.dist.new'
+maybe chmod 0644 'config-archive/etc/conf.d/puppetmaster'
+maybe chmod 0644 'config-archive/etc/conf.d/puppetmaster.dist.new'
 maybe chmod 0644 'config-archive/etc/dispatch-conf.conf'
 maybe chmod 0644 'config-archive/etc/dispatch-conf.conf.dist.new'
 maybe chmod 0644 'config-archive/etc/genkernel.conf'

diff --git a/config-archive/etc/conf.d/puppetmaster b/config-archive/etc/conf.d/puppetmaster
new file mode 100644 (file)
index 0000000..ecb4fe2
--- /dev/null
+++ b/config-archive/etc/conf.d/puppetmaster
@@ -0,0 +1,18 @@
+# Location of PID files
+PUPPETMASTER_PID_DIR="/var/run/puppet"
+
+# Where to log general messages to.
+# Specify syslog to send log messages to the system log.
+PUPPETMASTER_LOG="syslog"
+
+# You may specify other parameters to the puppetmaster here
+#PUPPETMASTER_EXTRA_OPTS="--noca"
+
+# You may specify an alternate port on which puppetmaster should listen.
+# Default is: 8140
+#PUPPETMASTER_PORT="8140"
+
+# To start multiple servers:
+# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141
+# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141
+# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT)

diff --git a/config-archive/etc/conf.d/puppetmaster.dist.new b/config-archive/etc/conf.d/puppetmaster.dist.new
new file mode 100644 (file)
index 0000000..afecf47
--- /dev/null
+++ b/config-archive/etc/conf.d/puppetmaster.dist.new
@@ -0,0 +1,18 @@
+# Location of PID files
+PUPPETMASTER_PID_DIR="/var/run/puppet"
+
+# Where to log general messages to.
+# Specify syslog to send log messages to the system log.
+#PUPPETMASTER_LOG="syslog"
+
+# You may specify other parameters to the puppetmaster here
+#PUPPETMASTER_EXTRA_OPTS="--noca"
+
+# You may specify an alternate port on which puppetmaster should listen.
+# Default is: 8140
+#PUPPETMASTER_PORT="8140"
+
+# To start multiple servers:
+# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141
+# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141
+# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT)