Removed repo class.
This commit is contained in:
parent
2a108abe8b
commit
ca701b303c
4 changed files with 0 additions and 44 deletions
|
@ -21,8 +21,6 @@ class postgresql::devel(
|
||||||
|
|
||||||
$package_name_real = $package_name ? { undef => $postgresql::packages::devel_package_name, default => $package_name }
|
$package_name_real = $package_name ? { undef => $postgresql::packages::devel_package_name, default => $package_name }
|
||||||
|
|
||||||
Class['postgresql::repo'] -> Package['postgresql_devel']
|
|
||||||
|
|
||||||
package { 'postgresql_devel':
|
package { 'postgresql_devel':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $package_name_real,
|
name => $package_name_real,
|
||||||
|
|
|
@ -21,17 +21,13 @@ class postgresql (
|
||||||
version => $version
|
version => $version
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
include postgresql::repo
|
|
||||||
include postgresql::packages
|
include postgresql::packages
|
||||||
|
|
||||||
$package_name_real = $package_name ? { undef => $postgresql::packages::client_package_name, default => $package_name }
|
$package_name_real = $package_name ? { undef => $postgresql::packages::client_package_name, default => $package_name }
|
||||||
|
|
||||||
Class['postgresql::repo'] -> Package['postgresql_client']
|
|
||||||
|
|
||||||
package { 'postgresql_client':
|
package { 'postgresql_client':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $package_name_real,
|
name => $package_name_real,
|
||||||
require => Class['postgresql::repo'],
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,35 +0,0 @@
|
||||||
# ==Class: postgresql::repo
|
|
||||||
#
|
|
||||||
# A class to add repositories (yum, apt, etc) needed to
|
|
||||||
# install non-default versions of Postgressql.
|
|
||||||
#
|
|
||||||
# === Variables
|
|
||||||
# [*postgresql::version::version*] contains the version number.
|
|
||||||
#
|
|
||||||
# === Authors
|
|
||||||
#
|
|
||||||
# Etienne Pelletier <epelletier@maestrodev.com>
|
|
||||||
#
|
|
||||||
class postgresql::repo($version = $postgresql::version::version) {
|
|
||||||
include postgresql::version
|
|
||||||
|
|
||||||
if $version != $::postgres_default_version {
|
|
||||||
|
|
||||||
case $::osfamily {
|
|
||||||
'RedHat': {
|
|
||||||
$repo_name = "postgresql${version}"
|
|
||||||
yumrepo { 'postgresql-repo':
|
|
||||||
name => $repo_name,
|
|
||||||
baseurl => "http://yum.postgresql.org/${version}/redhat/rhel-\$releasever-\$basearch",
|
|
||||||
descr => "Postgresql ${version} Yum Repo",
|
|
||||||
enabled => 1,
|
|
||||||
gpgcheck => 0,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
# TODO add Debian apt repos.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -35,12 +35,9 @@ class postgresql::server (
|
||||||
$package_name_real = $package_name ? { undef => $postgresql::packages::server_package_name, default => $package_name }
|
$package_name_real = $package_name ? { undef => $postgresql::packages::server_package_name, default => $package_name }
|
||||||
|
|
||||||
|
|
||||||
class { 'postgresql::repo': }
|
|
||||||
|
|
||||||
package { 'postgresql-server':
|
package { 'postgresql-server':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $package_name_real,
|
name => $package_name_real,
|
||||||
require => Class['postgresql::repo']
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$config_class = {}
|
$config_class = {}
|
||||||
|
|
Loading…
Reference in a new issue