diff --git a/manifests/client.pp b/manifests/client.pp index 7bb31a8..3cb26ce 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -1,35 +1,35 @@ # @summary Installs PostgreSQL client software. Set the following parameters if you have a custom version you would like to install. # # @note # Make sure to add any necessary yum or apt repositories if specifying a custom version. # # @param file_ensure # Ensure the connection validation script is present # @param validcon_script_path # Optional. Absolute path for the postgresql connection validation script. # @param package_name # Sets the name of the PostgreSQL client package. # @param package_ensure # Ensure the client package is installed class postgresql::client ( Enum['file', 'absent'] $file_ensure = 'file', Stdlib::Absolutepath $validcon_script_path = $postgresql::params::validcon_script_path, String[1] $package_name = $postgresql::params::client_package_name, String[1] $package_ensure = 'present' ) inherits postgresql::params { if $package_name != 'UNSET' { package { 'postgresql-client': ensure => $package_ensure, name => $package_name, tag => 'puppetlabs-postgresql', } } file { $validcon_script_path: - ensure => $file_ensure, - source => 'puppet:///modules/postgresql/validate_postgresql_connection.sh', - owner => 0, - group => 0, - mode => '0755', + ensure => $file_ensure, + content => file('postgresql/validate_postgresql_connection.sh'), + owner => 0, + group => 0, + mode => '0755', } } diff --git a/manifests/repo/yum_postgresql_org.pp b/manifests/repo/yum_postgresql_org.pp index 319751d..be7e268 100644 --- a/manifests/repo/yum_postgresql_org.pp +++ b/manifests/repo/yum_postgresql_org.pp @@ -1,47 +1,47 @@ # @api private class postgresql::repo::yum_postgresql_org inherits postgresql::repo { $version_parts = split($postgresql::repo::version, '[.]') $package_version = "${version_parts[0]}${version_parts[1]}" $gpg_key_path = "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}" file { $gpg_key_path: - source => 'puppet:///modules/postgresql/RPM-GPG-KEY-PGDG', - owner => 'root', - group => 'root', - mode => '0644', - before => Yumrepo['yum.postgresql.org'], + content => file('postgresql/RPM-GPG-KEY-PGDG'), + owner => 'root', + group => 'root', + mode => '0644', + before => Yumrepo['yum.postgresql.org'], } if($facts['os']['name'] == 'Fedora') { $label1 = 'fedora' $label2 = $label1 } else { $label1 = 'redhat' $label2 = 'rhel' } $default_baseurl = "https://download.postgresql.org/pub/repos/yum/${postgresql::repo::version}/${label1}/${label2}-\$releasever-\$basearch" $default_commonurl = "https://download.postgresql.org/pub/repos/yum/common/${label1}/${label2}-\$releasever-\$basearch" $_baseurl = pick($postgresql::repo::baseurl, $default_baseurl) $_commonurl = pick($postgresql::repo::commonurl, $default_commonurl) yumrepo { 'yum.postgresql.org': descr => "PostgreSQL ${postgresql::repo::version} \$releasever - \$basearch", baseurl => $_baseurl, enabled => 1, gpgcheck => 1, gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}", proxy => $postgresql::repo::proxy, } yumrepo { 'pgdg-common': descr => "PostgreSQL common RPMs \$releasever - \$basearch", baseurl => $_commonurl, enabled => 1, gpgcheck => 1, gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}", proxy => $postgresql::repo::proxy, } Yumrepo['yum.postgresql.org'] -> Package<|tag == 'puppetlabs-postgresql'|> }