diff options
author | Thomas Backlund <tmb@mageia.org> | 2015-10-20 11:18:01 +0300 |
---|---|---|
committer | Thomas Backlund <tmb@mageia.org> | 2015-10-20 11:18:01 +0300 |
commit | 095760e1f1e4b51d2ec4233263578bf3561e7ffe (patch) | |
tree | ea58a3bbca8ce3366dd2e6a4e1f67f94ac2811e8 /modules/puppet/templates | |
parent | 1428ce45c5c1c0a880a08dfc692463a3538afaf8 (diff) | |
download | puppet-095760e1f1e4b51d2ec4233263578bf3561e7ffe.tar puppet-095760e1f1e4b51d2ec4233263578bf3561e7ffe.tar.gz puppet-095760e1f1e4b51d2ec4233263578bf3561e7ffe.tar.bz2 puppet-095760e1f1e4b51d2ec4233263578bf3561e7ffe.tar.xz puppet-095760e1f1e4b51d2ec4233263578bf3561e7ffe.zip |
lint fixes for puppet
Diffstat (limited to 'modules/puppet/templates')
-rw-r--r-- | modules/puppet/templates/apache_proxy_vhost.conf | 1 | ||||
-rw-r--r-- | modules/puppet/templates/hiera.yaml | 1 | ||||
-rw-r--r-- | modules/puppet/templates/puppet.conf | 4 |
3 files changed, 1 insertions, 5 deletions
diff --git a/modules/puppet/templates/apache_proxy_vhost.conf b/modules/puppet/templates/apache_proxy_vhost.conf index d1e797e2..607998c4 100644 --- a/modules/puppet/templates/apache_proxy_vhost.conf +++ b/modules/puppet/templates/apache_proxy_vhost.conf @@ -40,4 +40,3 @@ ProxyRequests Off ProxyPreserveHost on </VirtualHost> - diff --git a/modules/puppet/templates/hiera.yaml b/modules/puppet/templates/hiera.yaml index 84e75607..8b5fcf73 100644 --- a/modules/puppet/templates/hiera.yaml +++ b/modules/puppet/templates/hiera.yaml @@ -7,4 +7,3 @@ - common :yaml: :datadir: /etc/puppet/hieradata - diff --git a/modules/puppet/templates/puppet.conf b/modules/puppet/templates/puppet.conf index fdda64ab..2411acd9 100644 --- a/modules/puppet/templates/puppet.conf +++ b/modules/puppet/templates/puppet.conf @@ -11,10 +11,8 @@ # Where SSL certificates are kept. # The default value is '$confdir/ssl'. ssldir = $vardir/ssl - + modulepath = $confdir/modules:$confdir/deployment:$confdir/external:/usr/share/puppet/modules queue_type = stomp queue_source = stomp://localhost:61613 <%= db_config %> - - |