postgresql instances move and rename defines (7/x)

manifests/server/config.pp

@@ -1,6 +1,6 @@
 # @api private
 class postgresql::server::config {
-  postgresql::server::instance_config { 'main':
+  postgresql::server::instance::config { 'main':
     ip_mask_deny_postgres_user   => $postgresql::server::ip_mask_deny_postgres_user,
     ip_mask_allow_all_users      => $postgresql::server::ip_mask_allow_all_users,
     listen_addresses             => $postgresql::server::listen_addresses,

manifests/server/initdb.pp

@@ -1,6 +1,6 @@
 # @api private
 class postgresql::server::initdb {
-  postgresql::server::instance_initdb { 'main':
+  postgresql::server::instance::initdb { 'main':
     needs_initdb   => $postgresql::server::needs_initdb,
     initdb_path    => $postgresql::server::initdb_path,
     datadir        => $postgresql::server::datadir,

manifests/server/instance_config.pp → manifests/server/instance/config.pp

@@ -33,7 +33,7 @@
 # @param timezone Set timezone for the PostgreSQL instance
 # @param extra_systemd_config Adds extra config to systemd config file, can for instance be used to add extra openfiles. This can be a multi line string
 # lint:endignore:140chars
-define postgresql::server::instance_config (
+define postgresql::server::instance::config (
   $ip_mask_deny_postgres_user                      = $postgresql::server::ip_mask_deny_postgres_user,
   $ip_mask_allow_all_users                         = $postgresql::server::ip_mask_allow_all_users,
   $listen_addresses                                = $postgresql::server::listen_addresses,

manifests/server/instance_initdb.pp → manifests/server/instance/initdb.pp

@@ -18,7 +18,7 @@
 # @param group Overrides the default postgres user group to be used for related files in the file system.
 # @param module_workdir Working directory for the PostgreSQL module
 # lint:endignore:140chars
-define postgresql::server::instance_initdb (
+define postgresql::server::instance::initdb (
   Boolean $needs_initdb             = $postgresql::server::needs_initdb,
   $initdb_path                      = $postgresql::server::initdb_path,
   $datadir                          = $postgresql::server::datadir,

manifests/server/instance_late_initdb.pp → manifests/server/instance/late_initdb.pp

@@ -7,7 +7,7 @@
 # @param port Specifies the port for the PostgreSQL server to listen on. Note: The same port number is used for all IP addresses the server listens on. Also, for Red Hat systems and early Debian systems, changing the port causes the server to come to a full stop before being able to make the change.
 # @param module_workdir Working directory for the PostgreSQL module
 # lint:endignore:140chars
-define postgresql::server::instance_late_initdb (
+define postgresql::server::instance::late_initdb (
   $encoding       = $postgresql::server::encoding,
   $user           = $postgresql::server::user,
   $group          = $postgresql::server::group,

manifests/server/instance_passwd.pp → manifests/server/instance/passwd.pp

@@ -8,7 +8,7 @@
 # @param module_workdir Working directory for the PostgreSQL module
 # @param postgres_password Sets the password for the postgres user to your specified value. By default, this setting uses the superuser account in the Postgres database, with a user called postgres and no password.
 # lint:endignore:140chars
-define postgresql::server::instance_passwd (
+define postgresql::server::instance::passwd (
   $user                                           = $postgresql::server::user,
   $group                                          = $postgresql::server::group,
   $psql_path                                      = $postgresql::server::psql_path,

manifests/server/instance_reload.pp → manifests/server/instance/reload.pp

@@ -1,6 +1,6 @@
 # @param service_reload Overrides the default reload command for your PostgreSQL service.
 # @param service_status Overrides the default status check command for your PostgreSQL service.
-define postgresql::server::instance_reload (
+define postgresql::server::instance::reload (
   $service_status = $postgresql::server::service_status,
   $service_reload = $postgresql::server::service_reload,
 ) {

manifests/server/instance_service.pp → manifests/server/instance/service.pp

@@ -12,7 +12,7 @@
 # @param psql_path Specifies the path to the psql command.
 # @param default_connect_settings Specifies a hash of environment variables used when connecting to a remote server. Becomes the default for other defined types, such as postgresql::server::role.
 # lint:endignore:140chars
-define postgresql::server::instance_service (
+define postgresql::server::instance::service (
   $service_ensure   = $postgresql::server::service_ensure,
   $service_enable   = $postgresql::server::service_enable,
   $service_manage   = $postgresql::server::service_manage,

manifests/server/late_initdb.pp

@@ -4,7 +4,7 @@
 class postgresql::server::late_initdb {
   assert_private()
 
-  postgresql::server::instance_late_initdb { 'main':
+  postgresql::server::instance::late_initdb { 'main':
     encoding       => $postgresql::server::encoding,
     user           => $postgresql::server::user,
     group          => $postgresql::server::group,

manifests/server/passwd.pp

@@ -1,6 +1,6 @@
 # @api private
 class postgresql::server::passwd {
-  postgresql::server::instance_passwd { 'main':
+  postgresql::server::instance::passwd { 'main':
     user              => $postgresql::server::user,
     group             => $postgresql::server::group,
     psql_path         => $postgresql::server::psql_path,

manifests/server/reload.pp

@@ -1,6 +1,6 @@
 # @api private
 class postgresql::server::reload {
-  postgresql::server::instance_reload { 'main':
+  postgresql::server::instance::reload { 'main':
     service_status => $postgresql::server::service_status,
     service_reload => $postgresql::server::service_reload,
   }

manifests/server/service.pp

@@ -1,6 +1,6 @@
 # @api private
 class postgresql::server::service {
-  postgresql::server::instance_service { 'main':
+  postgresql::server::instance::service { 'main':
     service_ensure   => $postgresql::server::service_ensure,
     service_enable   => $postgresql::server::service_enable,
     service_manage   => $postgresql::server::service_manage,

spec/defines/server/instance_config.rb → spec/defines/server/instance/config.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_config' do
+describe 'postgresql::server::instance::config' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|

spec/defines/server/instance_initdb.rb → spec/defines/server/instance/initdb.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_initdb' do
+describe 'postgresql::server::instance::initdb' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|

spec/defines/server/instance_late_initdb.rb → spec/defines/server/instance/late_initdb.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_late_initdb' do
+describe 'postgresql::server::instance::late_initdb' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|

spec/defines/server/instance_passwd.rb → spec/defines/server/instance/passwd.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_passwd' do
+describe 'postgresql::server::instance::passwd' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|

spec/defines/server/instance_reload.rb → spec/defines/server/instance/reload.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_reload' do
+describe 'postgresql::server::instance::reload' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|

spec/defines/server/instance_service.rb → spec/defines/server/instance/service.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_service' do
+describe 'postgresql::server::instance::service' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|