From 2b32b24ace5c20bb9f8fcb42edc2839a82c0ce30 Mon Sep 17 00:00:00 2001 From: amontero-referup Date: Thu, 13 Mar 2014 15:57:51 +0100 Subject: Add tor::repo class with apt::source from torproject.org . --- manifests/repo.pp | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 manifests/repo.pp diff --git a/manifests/repo.pp b/manifests/repo.pp new file mode 100644 index 0000000..860123b --- /dev/null +++ b/manifests/repo.pp @@ -0,0 +1,12 @@ +class tor::repo ( + $ensure = present, + $name = 'torproject.org', + $include_src = false, +) { + apt::source { $name: + ensure => $ensure, + location => 'https://deb.torproject.org/torproject.org/', + key => '886DDD89', + include_src => $include_src, + } +} -- cgit v1.2.3 From 2db50209bf5bb46fc4144550cfa1efe7e4eadb38 Mon Sep 17 00:00:00 2001 From: amontero-referup Date: Fri, 14 Mar 2014 13:40:33 +0100 Subject: Rename source name parameter. --- manifests/repo.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 860123b..cbe6106 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -1,9 +1,9 @@ class tor::repo ( $ensure = present, - $name = 'torproject.org', + $source_name = 'torproject.org', $include_src = false, ) { - apt::source { $name: + apt::source { $source_name: ensure => $ensure, location => 'https://deb.torproject.org/torproject.org/', key => '886DDD89', -- cgit v1.2.3 From 4cafc1d59433d216eec2a006a3fc793400aff90f Mon Sep 17 00:00:00 2001 From: amontero-referup Date: Mon, 17 Mar 2014 10:10:19 +0100 Subject: Improve tor::repo and add tor::repo::debian classes. --- manifests/repo.pp | 14 +++++++++----- manifests/repo/debian.pp | 9 +++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 manifests/repo/debian.pp diff --git a/manifests/repo.pp b/manifests/repo.pp index cbe6106..f625599 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -3,10 +3,14 @@ class tor::repo ( $source_name = 'torproject.org', $include_src = false, ) { - apt::source { $source_name: - ensure => $ensure, - location => 'https://deb.torproject.org/torproject.org/', - key => '886DDD89', - include_src => $include_src, + case $::osfamily { + 'Debian': { + $key = '886DDD89' + $location = 'https://deb.torproject.org/torproject.org/' + class { 'tor::repo::debian': } + } + default: { + fail("Unsupported managed repository for osfamily: ${::osfamily}, operatingsystem: ${::operatingsystem}, module ${module_name} currently only supports managing repos for osfamily Debian and Ubuntu") + } } } diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp new file mode 100644 index 0000000..174c331 --- /dev/null +++ b/manifests/repo/debian.pp @@ -0,0 +1,9 @@ +# PRIVATE CLASS: do not use directly +class tor::repo::debian inherits tor::repo { + apt::source { $source_name: + ensure => $::tor::repo::ensure, + location => $::tor::repo::location, + key => $::tor::repo::key, + include_src => $::tor::repo::include_src, + } +} -- cgit v1.2.3