Page MenuHomeSoftware Heritage
Files F9123188

No OneTemporary
Actions

View Options

diff --git a/.fixtures.yml b/.fixtures.yml
index 44121bb..1c3e753 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,10 +1,10 @@
fixtures:
repositories:
- apt:
+ apt:
repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
- branch: "1.8.x"
+ branch: "2.0.0"
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
concat: "https://github.com/puppetlabs/puppetlabs-concat.git"
symlinks:
postgresql: "#{source_dir}"
diff --git a/manifests/repo/apt_postgresql_org.pp b/manifests/repo/apt_postgresql_org.pp
index 71f76d5..8815811 100644
--- a/manifests/repo/apt_postgresql_org.pp
+++ b/manifests/repo/apt_postgresql_org.pp
@@ -1,28 +1,32 @@
# PRIVATE CLASS: do not use directly
class postgresql::repo::apt_postgresql_org inherits postgresql::repo {
include ::apt
# Here we have tried to replicate the instructions on the PostgreSQL site:
#
# http://www.postgresql.org/download/linux/debian/
#
$default_baseurl = 'http://apt.postgresql.org/pub/repos/apt/'
$_baseurl = pick($postgresql::repo::baseurl, $default_baseurl)
apt::pin { 'apt_postgresql_org':
originator => 'apt.postgresql.org',
priority => 500,
}->
apt::source { 'apt.postgresql.org':
- location => $_baseurl,
- release => "${::lsbdistcodename}-pgdg",
- repos => "main ${postgresql::repo::version}",
- key => 'B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8',
- key_source => 'https://www.postgresql.org/media/keys/ACCC4CF8.asc',
- include_src => false,
+ location => $_baseurl,
+ release => "${::lsbdistcodename}-pgdg",
+ repos => "main ${postgresql::repo::version}",
+ key => {
+ id => 'B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8',
+ source => 'https://www.postgresql.org/media/keys/ACCC4CF8.asc',
+ },
+ include => {
+ src => false,
+ },
}
Apt::Source['apt.postgresql.org']->Package<|tag == 'postgresql'|>
Class['Apt::Update'] -> Package<|tag == 'postgresql'|>
}
diff --git a/metadata.json b/metadata.json
index 2a59dc9..976d2bc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,73 +1,73 @@
{
"name": "puppetlabs-postgresql",
"version": "4.8.0",
"author": "Inkling/Puppet Labs",
"summary": "Offers support for basic management of PostgreSQL databases.",
"license": "Apache-2.0",
"source": "git://github.com/puppetlabs/puppetlabs-postgresql.git",
"project_page": "https://github.com/puppetlabs/puppetlabs-postgresql",
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
"dependencies": [
{"name":"puppetlabs/stdlib","version_requirement":"4.x"},
- {"name":"puppetlabs/apt","version_requirement":">=1.8.0 <3.0.0"},
+ {"name":"puppetlabs/apt","version_requirement":">=2.0.0 <3.0.0"},
{"name":"puppetlabs/concat","version_requirement":">= 1.1.0 <3.0.0"}
],
"data_provider": null,
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"5",
"6",
"7"
]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"5",
"6",
"7"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"5",
"6",
"7"
]
},
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"5",
"6",
"7"
]
},
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"6",
"7",
"8"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"10.04",
"12.04",
"14.04",
"16.04"
]
}
],
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 3.0.0 < 5.0.0"
}
]
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jun 21, 5:09 PM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3356010

Event Timeline

About · Developer information · Legal