summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-08-17 13:07:08 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-08-17 13:07:08 -0300
commitf77b2e8a2950345f04cb139831a800965b6bd29b (patch)
treed27f58cf662ee518be8f57959767b53f06d97790
parent3e438b927c091187971e78a9c6dc151f76f2c4ed (diff)
downloadpuppet-apache-f77b2e8a2950345f04cb139831a800965b6bd29b.tar.gz
puppet-apache-f77b2e8a2950345f04cb139831a800965b6bd29b.tar.bz2
Fix template names
-rw-r--r--manifests/init.pp2
-rw-r--r--templates/apache2.conf.jessie.erb (renamed from templates/apache2.conf.erb.jessie)0
-rw-r--r--templates/apache2.conf.wheezy.erb (renamed from templates/apache2.conf.erb.wheezy)0
3 files changed, 1 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index b144191..f63103c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -114,7 +114,7 @@ class apache(
# apache mod_macro configuration
file { "${conf}":
ensure => present,
- content => template("apache/apache2.conf.erb.${::lsbdistcodename}"),
+ content => template("apache/apache2.conf.${::lsbdistcodename}.erb"),
owner => root,
group => root,
mode => 0644,
diff --git a/templates/apache2.conf.erb.jessie b/templates/apache2.conf.jessie.erb
index 0fc143b..0fc143b 100644
--- a/templates/apache2.conf.erb.jessie
+++ b/templates/apache2.conf.jessie.erb
diff --git a/templates/apache2.conf.erb.wheezy b/templates/apache2.conf.wheezy.erb
index 886b305..886b305 100644
--- a/templates/apache2.conf.erb.wheezy
+++ b/templates/apache2.conf.wheezy.erb