Commit 4936102c authored by intrigeri's avatar intrigeri
Browse files

Migrate from apt::sources_list to apt::source (#15510)

parent 697a2947
class tails::apt::repository::torproject (
Enum['present', 'absent'] $ensure = 'present',
) {
apt::sources_list { 'torproject.list':
ensure => $ensure,
content => template('tails/apt/repository/torproject.list.erb'),
apt::source { 'torproject':
ensure => $ensure,
location => 'http://deb.torproject.org/torproject.org',
release => $::lsbdistcodename,
repos => 'main',
}
}
class tails::apt::repository::torproject::obfs4proxy (
Enum['present', 'absent'] $ensure = 'present',
) {
apt::sources_list { 'torproject-obfs4proxy.list':
ensure => $ensure,
content => "deb http://deb.torproject.org/torproject.org obfs4proxy main\n",
apt::source { 'torproject-obfs4proxy':
ensure => $ensure,
location => 'http://deb.torproject.org/torproject.org',
release => 'obfs4proxy',
repos => 'main',
}
}
......@@ -6,8 +6,10 @@ class tails::gitolite (
String $ssh_pubkey_name = 'gitolite@puppet-git.lizard',
) {
apt::sources_list { 'tails-gitolite2.list':
content => "deb http://deb.tails.boum.org/ gitolite2 main\n",
apt::source { 'tails-gitolite2':
location => 'http://deb.tails.boum.org/',
release => 'gitolite2',
repos => 'main',
}
apt::pin { 'gitolite':
package => 'gitolite',
......
......@@ -36,8 +36,10 @@ class tails::jenkins::master (
### Resources
apt::sources_list { 'tails-jenkins-master.list':
content => "deb http://deb.tails.boum.org/ jenkins-master main\n",
apt::source { 'tails-jenkins-master':
location => 'http://deb.tails.boum.org/',
release => 'jenkins-master',
repos => 'main',
}
[ 'jenkins', 'jenkins-common'].each |String $package| {
......@@ -45,7 +47,7 @@ class tails::jenkins::master (
packages => $package
origin => 'deb.tails.boum.org',
priority => 991,
require => Apt::Sources_list['tails-jenkins-master.list'],
require => Apt::Source['tails-jenkins-master'],
}
}
......
......@@ -14,8 +14,10 @@ class tails::jenkins::slave (
$unit_file = '/etc/systemd/system/jenkins-slave.service'
apt::sources_list { 'tails-jenkins-slave.list':
content => "deb http://deb.tails.boum.org/ jenkins-slave main\n",
apt::source { 'tails-jenkins-slave':
location => 'http://deb.tails.boum.org/',
release => 'jenkins-slave',
repos => 'main',
}
apt::pin { 'jenkins-slave':
......@@ -27,7 +29,7 @@ class tails::jenkins::slave (
package { 'jenkins-slave':
ensure => present,
require => [
Apt::Sources_list['tails-jenkins-slave.list'],
Apt::Source['tails-jenkins-slave'],
Apt::Pin['jenkins-slave'],
],
}
......
# Manage PuppetDB
class tails::puppetdb () {
apt::sources_list { 'unstable.list':
ensure => present,
content => "deb http://ftp.us.debian.org/debian/ unstable main\n",
apt::source { 'unstable':
ensure => present,
location => 'http://ftp.us.debian.org/debian/',
release => 'unstable',
repos => 'main',
}
apt::pin { 'clojure-libs':
......@@ -42,9 +44,11 @@ class tails::puppetdb () {
}
#15647, #16083
apt::sources_list { 'puppetdb.list':
ensure => present,
content => "deb http://deb.tails.boum.org/ puppetdb main\n",
apt::source { 'puppetdb':
ensure => present,
location => 'http://deb.tails.boum.org/',
release => 'puppetdb',
repos => 'main',
}
['jetty9', 'libjetty9-java', 'libjetty9-extra-java'].each |String $package| {
apt::pin { $package:
......
deb http://deb.torproject.org/torproject.org <%= scope.lookupvar('::lsbdistcodename') %> main
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment