summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-03-07 08:16:19 +0000
committerintrigeri <intrigeri@boum.org>2019-03-07 08:16:19 +0000
commit209e28953a3fb8b65432c8569cccc3c0db88e534 (patch)
tree58cc08d2f56e1d7d7e3184055ff1e5f57500adfb
parentb3d110c0e574945775e1fe5291c7071431e62002 (diff)
website: install ikiwiki from Buster (Closes: #6907)
The fix for #6907 made it upstream and eventually to Buster, so we can stop running a custom, patched package.
-rw-r--r--manifests/website/builder.pp12
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/website/builder.pp b/manifests/website/builder.pp
index 52a9b70..5f0f22c 100644
--- a/manifests/website/builder.pp
+++ b/manifests/website/builder.pp
@@ -12,16 +12,16 @@ class tails::website::builder (
### Resources
#6907
- apt::sources_list { 'ikiwiki.list':
- ensure => present,
- content => "deb http://deb.tails.boum.org/ ikiwiki main\n",
- }
apt::package { 'ikiwiki':
- pin => 'origin deb.tails.boum.org',
- # same as Stretch repos to prioritize security fixes over our fix for #6907
+ pin => 'release o=Debian,n=buster',
pin_priority => '990',
}
+ # XXX: remove once applied
+ apt::sources_list { 'ikiwiki.list':
+ ensure => absent,
+ }
+
$packages = [
'libyaml-perl',
'libyaml-libyaml-perl',