summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérôme Charaoui <jcharaoui@cmaisonneuve.qc.ca>2016-06-29 20:06:20 +0200
committerJérôme Charaoui <jcharaoui@cmaisonneuve.qc.ca>2016-06-29 20:55:59 +0200
commite876cd25b56b208b3a3b1bc1ce317338213cf45f (patch)
tree04e4e0c79eb983a0917ead4db61e49c75a6e444e
parentbc73809d7b33541b50ba9f38cb3bf1dd2237b98f (diff)
Remove redundant symlinks for the Debian listchanges template, fixes #2
-rw-r--r--manifests/listchanges.pp2
-rw-r--r--templates/Debian/listchanges.erb (renamed from templates/Debian/listchanges_lenny.erb)0
l---------templates/Debian/listchanges_jessie.erb1
l---------templates/Debian/listchanges_sid.erb1
l---------templates/Debian/listchanges_squeeze.erb1
l---------templates/Debian/listchanges_wheezy.erb1
6 files changed, 1 insertions, 5 deletions
diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp
index e64bb1b..ecbbe6d 100644
--- a/manifests/listchanges.pp
+++ b/manifests/listchanges.pp
@@ -1,6 +1,6 @@
class apt::listchanges(
$ensure_version = 'installed',
- $config = "apt/${::operatingsystem}/listchanges_${::debian_codename}.erb",
+ $config = "apt/${::operatingsystem}/listchanges.erb",
$frontend = 'mail',
$email = 'root',
$confirm = '0',
diff --git a/templates/Debian/listchanges_lenny.erb b/templates/Debian/listchanges.erb
index 1025dd0..1025dd0 100644
--- a/templates/Debian/listchanges_lenny.erb
+++ b/templates/Debian/listchanges.erb
diff --git a/templates/Debian/listchanges_jessie.erb b/templates/Debian/listchanges_jessie.erb
deleted file mode 120000
index 74ab496..0000000
--- a/templates/Debian/listchanges_jessie.erb
+++ /dev/null
@@ -1 +0,0 @@
-listchanges_lenny.erb \ No newline at end of file
diff --git a/templates/Debian/listchanges_sid.erb b/templates/Debian/listchanges_sid.erb
deleted file mode 120000
index 74ab496..0000000
--- a/templates/Debian/listchanges_sid.erb
+++ /dev/null
@@ -1 +0,0 @@
-listchanges_lenny.erb \ No newline at end of file
diff --git a/templates/Debian/listchanges_squeeze.erb b/templates/Debian/listchanges_squeeze.erb
deleted file mode 120000
index 74ab496..0000000
--- a/templates/Debian/listchanges_squeeze.erb
+++ /dev/null
@@ -1 +0,0 @@
-listchanges_lenny.erb \ No newline at end of file
diff --git a/templates/Debian/listchanges_wheezy.erb b/templates/Debian/listchanges_wheezy.erb
deleted file mode 120000
index 74ab496..0000000
--- a/templates/Debian/listchanges_wheezy.erb
+++ /dev/null
@@ -1 +0,0 @@
-listchanges_lenny.erb \ No newline at end of file