From 408da87e6e5944d7079b181eb14a48a560fc4784 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 21 Sep 2019 18:48:14 +0200 Subject: [PATCH] move hiera.yaml into repo root --- .gitignore | 1 - modules/puppetmaster/files/hiera.yaml => hiera.yaml | 0 modules/puppetmaster/manifests/init.pp | 3 --- 3 files changed, 4 deletions(-) rename modules/puppetmaster/files/hiera.yaml => hiera.yaml (100%) diff --git a/.gitignore b/.gitignore index 6e5214a3c..a5348d4fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ puppet.conf .config-version -hiera.yaml modules/hiera-puppet modules/exim/files/email-virtualdomains/ modules/roles/manifests/pubsub/params.pp diff --git a/modules/puppetmaster/files/hiera.yaml b/hiera.yaml similarity index 100% rename from modules/puppetmaster/files/hiera.yaml rename to hiera.yaml diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp index 9fed0247b..080bee57d 100644 --- a/modules/puppetmaster/manifests/init.pp +++ b/modules/puppetmaster/manifests/init.pp @@ -3,9 +3,6 @@ class puppetmaster { package { 'puppetmaster': ensure => installed, } - file { '/etc/puppet/hiera.yaml': - source => 'puppet:///modules/puppetmaster/hiera.yaml' - } file { '/etc/puppet/puppetdb.conf': source => 'puppet:///modules/puppetmaster/puppetdb.conf' } -- 2.20.1