changeset 307:ab3b392982df

Move puppet.conf out of version control now host names need to be correct Each host will need to copy and edit the file, e.g.: sudo cp puppet.conf.template puppet.conf sudo sed -i "s/localhost/$(hostname)/g" puppet.conf Note: We could do this in a one-liner, but it'd require tee and dev-null-ing output
author IBBoard <dev@ibboard.co.uk>
date Sat, 22 Feb 2020 17:07:15 +0000
parents 894390fdd6d7
children edd1e3b444e7
files .hgignore puppet.conf puppet.conf.template
diffstat 3 files changed, 33 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sat Feb 22 16:22:57 2020 +0000
+++ b/.hgignore	Sat Feb 22 17:07:15 2020 +0000
@@ -1,2 +1,3 @@
 ^private
 ^modules/python/.git
+puppet.conf
--- a/puppet.conf	Sat Feb 22 16:22:57 2020 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-[main]
-    # The Puppet log directory.
-    # The default value is '$vardir/log'.
-    logdir = /var/log/puppet
-
-    # Where Puppet PID files are kept.
-    # The default value is '$vardir/run'.
-    rundir = /var/run/puppet
-
-    # Where SSL certificates are kept.
-    # The default value is '$confdir/ssl'.
-    ssldir = $vardir/ssl
-
-    server = localhost
-    certname = localhost
-
-[agent]
-    # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
-    # the separate ``puppet`` executable using the ``--loadclasses``
-    # option.
-    # The default value is '$confdir/classes.txt'.
-    classfile = $vardir/classes.txt
-
-    # Where puppetd caches the local configuration.  An
-    # extension indicating the cache format is added automatically.
-    # The default value is '$confdir/localconfig'.
-    localconfig = $vardir/localconfig
-
-[master]
-
-bindaddress = 127.0.0.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/puppet.conf.template	Sat Feb 22 17:07:15 2020 +0000
@@ -0,0 +1,32 @@
+[main]
+    # The Puppet log directory.
+    # The default value is '$vardir/log'.
+    logdir = /var/log/puppet
+
+    # Where Puppet PID files are kept.
+    # The default value is '$vardir/run'.
+    rundir = /var/run/puppet
+
+    # Where SSL certificates are kept.
+    # The default value is '$confdir/ssl'.
+    ssldir = $vardir/ssl
+
+    server = localhost
+    certname = localhost
+
+[agent]
+    # The file in which puppetd stores a list of the classes
+    # associated with the retrieved configuratiion.  Can be loaded in
+    # the separate ``puppet`` executable using the ``--loadclasses``
+    # option.
+    # The default value is '$confdir/classes.txt'.
+    classfile = $vardir/classes.txt
+
+    # Where puppetd caches the local configuration.  An
+    # extension indicating the cache format is added automatically.
+    # The default value is '$confdir/localconfig'.
+    localconfig = $vardir/localconfig
+
+[master]
+
+bindaddress = 127.0.0.1